teascade/skullball
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update game to make ready for diner

Browse Source
This commit is contained in:
Sofia 2026-07-22 22:30:09 +03:00
parent 8c44050846
commit ec4a91722c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
godot/maps/diner/diner.tscn
View File

@ -9,6 +9,7 @@
[ext_resource type="Material" uid="uid://f4ne0rn5g5wh" path="res://maps/materials/green_ceiling_light.tres" id="7_8hfm3"] [ext_resource type="Material" uid="uid://f4ne0rn5g5wh" path="res://maps/materials/green_ceiling_light.tres" id="7_8hfm3"]
[ext_resource type="Material" uid="uid://1ine08aphdv7" path="res://maps/materials/orange_accent.tres" id="7_ap2uw"] [ext_resource type="Material" uid="uid://1ine08aphdv7" path="res://maps/materials/orange_accent.tres" id="7_ap2uw"]
[ext_resource type="LightmapGIData" uid="uid://hqspy3qsl5jd" path="res://maps/diner/diner.lmbake" id="9_g8xwm"] [ext_resource type="LightmapGIData" uid="uid://hqspy3qsl5jd" path="res://maps/diner/diner.lmbake" id="9_g8xwm"]
[ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/misc/goal.tscn" id="10_wffmg"]
[sub_resource type="ArrayMesh" id="ArrayMesh_o17ro"] [sub_resource type="ArrayMesh" id="ArrayMesh_o17ro"]
lightmap_size_hint = Vector2i(354, 354) lightmap_size_hint = Vector2i(354, 354)
@ -540,8 +541,8 @@ indices = PackedInt32Array(0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10,
[sub_resource type="BoxShape3D" id="BoxShape3D_1cgct"] [sub_resource type="BoxShape3D" id="BoxShape3D_1cgct"]
size = Vector3(1000, 10, 1000) size = Vector3(1000, 10, 1000)
[node name="diner" type="Map" unique_id=1971127396 node_paths=PackedStringArray("spawner", "ball_spawner")] [node name="diner" type="Map" unique_id=1971127396 node_paths=PackedStringArray("spawners", "ball_spawner")]
spawner = NodePath("spawner") spawners = [NodePath("spawner"), NodePath("spawner2")]
ball_spawner = NodePath("ball_spawner") ball_spawner = NodePath("ball_spawner")
local_player = ExtResource("1_wffmg") local_player = ExtResource("1_wffmg")
remote_player = ExtResource("2_msi5w") remote_player = ExtResource("2_msi5w")
@ -1057,6 +1058,9 @@ shadow_enabled = true
[node name="spawner" type="Node3D" parent="." unique_id=2117785064] [node name="spawner" type="Node3D" parent="." unique_id=2117785064]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.922944, 0.50108063, -0.19082117) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.922944, 0.50108063, -0.19082117)
[node name="spawner2" type="Node3D" parent="." unique_id=1061070767]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.774757, 0.50108063, -14.130155)
[node name="killbox" type="Killbox" parent="." unique_id=1750431583] [node name="killbox" type="Killbox" parent="." unique_id=1750431583]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -18.08466, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -18.08466, 0)
collision_layer = 7 collision_layer = 7
@ -1068,3 +1072,10 @@ shape = SubResource("BoxShape3D_1cgct")
[node name="ball_spawner" type="Node3D" parent="." unique_id=1771283598] [node name="ball_spawner" type="Node3D" parent="." unique_id=1771283598]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.6695356, 3.831614, 0.6756325) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.6695356, 3.831614, 0.6756325)
[node name="goal2" parent="." unique_id=177528504 instance=ExtResource("10_wffmg")]
team = 1
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.790253, -2.3841858e-07, -13.729624)
[node name="goal" parent="." unique_id=1795145790 instance=ExtResource("10_wffmg")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.09099, 0, -1.3568912)

2
rust/src/game_manager.rs
View File

@ -111,7 +111,7 @@ impl Default for GameOptions {
opts.insert(GameOption::AllowAnyMap, GameOptionValue::Boolean(false)); opts.insert(GameOption::AllowAnyMap, GameOptionValue::Boolean(false));
opts.insert(GameOption::AllowAnyTeam, GameOptionValue::Boolean(false)); opts.insert(GameOption::AllowAnyTeam, GameOptionValue::Boolean(false));
opts.insert(GameOption::FriendlyFire, GameOptionValue::Boolean(true)); opts.insert(GameOption::FriendlyFire, GameOptionValue::Boolean(true));
opts.insert(GameOption::GoalsNeededToWin, GameOptionValue::Number(1.)); opts.insert(GameOption::GoalsNeededToWin, GameOptionValue::Number(10.));
Self { values: opts } Self { values: opts }
} }
} }