From ec4a91722ccaf27fa8c4fbaeef4ea32830805c51 Mon Sep 17 00:00:00 2001 From: Sofia Date: Wed, 22 Jul 2026 22:30:09 +0300 Subject: [PATCH] Update game to make ready for diner --- godot/maps/diner/diner.tscn | 15 +++++++++++++-- rust/src/game_manager.rs | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/godot/maps/diner/diner.tscn b/godot/maps/diner/diner.tscn index 0958e27..492dce7 100644 --- a/godot/maps/diner/diner.tscn +++ b/godot/maps/diner/diner.tscn @@ -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://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="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/misc/goal.tscn" id="10_wffmg"] [sub_resource type="ArrayMesh" id="ArrayMesh_o17ro"] 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"] size = Vector3(1000, 10, 1000) -[node name="diner" type="Map" unique_id=1971127396 node_paths=PackedStringArray("spawner", "ball_spawner")] -spawner = NodePath("spawner") +[node name="diner" type="Map" unique_id=1971127396 node_paths=PackedStringArray("spawners", "ball_spawner")] +spawners = [NodePath("spawner"), NodePath("spawner2")] ball_spawner = NodePath("ball_spawner") local_player = ExtResource("1_wffmg") remote_player = ExtResource("2_msi5w") @@ -1057,6 +1058,9 @@ shadow_enabled = true [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) +[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] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -18.08466, 0) collision_layer = 7 @@ -1068,3 +1072,10 @@ shape = SubResource("BoxShape3D_1cgct") [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) + +[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) diff --git a/rust/src/game_manager.rs b/rust/src/game_manager.rs index f4cbc07..0232414 100644 --- a/rust/src/game_manager.rs +++ b/rust/src/game_manager.rs @@ -111,7 +111,7 @@ impl Default for GameOptions { opts.insert(GameOption::AllowAnyMap, GameOptionValue::Boolean(false)); opts.insert(GameOption::AllowAnyTeam, GameOptionValue::Boolean(false)); opts.insert(GameOption::FriendlyFire, GameOptionValue::Boolean(true)); - opts.insert(GameOption::GoalsNeededToWin, GameOptionValue::Number(1.)); + opts.insert(GameOption::GoalsNeededToWin, GameOptionValue::Number(10.)); Self { values: opts } } }