diff --git a/authoring/greyboxing/city.blend b/authoring/greyboxing/city.blend index 0bf5465a..a47bd35c 100644 Binary files a/authoring/greyboxing/city.blend and b/authoring/greyboxing/city.blend differ diff --git a/authoring/greyboxing/city.blend1 b/authoring/greyboxing/city.blend1 index 8034362c..0bf5465a 100644 Binary files a/authoring/greyboxing/city.blend1 and b/authoring/greyboxing/city.blend1 differ diff --git a/maps/city.tscn b/maps/city.tscn index eaede950..aac67ebe 100644 --- a/maps/city.tscn +++ b/maps/city.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3 uid="uid://dmkw8cmalm5k"] +[gd_scene load_steps=20 format=3 uid="uid://dmkw8cmalm5k"] [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"] [ext_resource type="Texture2D" uid="uid://ca4kkq3w8cd4n" path="res://assets/sky/sky_15_2k.png" id="2_ruo5i"] @@ -14,6 +14,7 @@ [ext_resource type="PackedScene" uid="uid://c066hc7yu36wx" path="res://assets/water/water.tscn" id="12_i2xii"] [ext_resource type="PackedScene" uid="uid://gir68sk3762e" path="res://assets/lift/lift.tscn" id="13_eca4n"] [ext_resource type="CylinderMesh" uid="uid://bhkbwvuft1bpg" path="res://systems/weapon/weapon_tuto.tres" id="14_0ari0"] +[ext_resource type="Script" uid="uid://v4nnql2laqdn" path="res://systems/weapon/placed_tutorial_weapon.gd" id="15_165wb"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_feb1n"] panorama = ExtResource("2_ruo5i") @@ -46,7 +47,7 @@ size = Vector3(11.5, 9, 4.5) [node name="Main" type="Node3D"] [node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")] -transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -15.285732, -78.24933, 121.65933) +transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -1.2857323, -132.74933, 116.15933) collision_layer = 17 TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget") @@ -95,6 +96,7 @@ lift_time = 15.0 [node name="PlacedTutorialWeapon" type="MeshInstance3D" parent="."] transform = Transform3D(-2, 3.019916e-07, 0, -3.019916e-07, -2, 0, 0, 0, 2, -17.904, -79.265, 145.317) mesh = ExtResource("14_0ari0") +script = ExtResource("15_165wb") [node name="SpotLight3D" type="SpotLight3D" parent="PlacedTutorialWeapon"] transform = Transform3D(1, -1.509958e-07, 6.600236e-15, 0, -4.371139e-08, -1, 1.509958e-07, 1, -4.371139e-08, 0, -2.3931274, 0) @@ -113,4 +115,14 @@ collision_mask = 16 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695) shape = SubResource("BoxShape3D_0ari0") +[node name="WeaponRetrieved" type="Area3D" parent="."] +transform = Transform3D(0.9961947, 0, -0.08715574, 0, 1, 0, 0.08715574, 0, 0.9961947, -18, -79, 145) +collision_layer = 0 +collision_mask = 16 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="WeaponRetrieved"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695) +shape = SubResource("BoxShape3D_0ari0") + [connection signal="body_entered" from="TutorialDoneArea" to="Player" method="OnTutorialDone"] +[connection signal="body_entered" from="WeaponRetrieved" to="PlacedTutorialWeapon" method="_on_weapon_retrieved_body_entered"] diff --git a/systems/weapon/placed_tutorial_weapon.gd b/systems/weapon/placed_tutorial_weapon.gd new file mode 100644 index 00000000..baf537c4 --- /dev/null +++ b/systems/weapon/placed_tutorial_weapon.gd @@ -0,0 +1,5 @@ +extends MeshInstance3D + + +func _on_weapon_retrieved_body_entered(body: Node3D) -> void: + visible = false diff --git a/systems/weapon/placed_tutorial_weapon.gd.uid b/systems/weapon/placed_tutorial_weapon.gd.uid new file mode 100644 index 00000000..28e8abb0 --- /dev/null +++ b/systems/weapon/placed_tutorial_weapon.gd.uid @@ -0,0 +1 @@ +uid://v4nnql2laqdn