From 4317aa5956fc24994852aa0559112737b25df37d Mon Sep 17 00:00:00 2001 From: SyntaX Date: Sun, 24 Nov 2019 11:21:44 +0100 Subject: [PATCH 1/2] moved hud stuff into HUD scene --- WikiJam/Player/Player.tscn | 75 ++------------------------------------ WikiJam/Player/UI/HUD.tscn | 71 +++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 72 deletions(-) diff --git a/WikiJam/Player/Player.tscn b/WikiJam/Player/Player.tscn index 129ac5c..356ef40 100644 --- a/WikiJam/Player/Player.tscn +++ b/WikiJam/Player/Player.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://Player/Player.gd" type="Script" id=1] [ext_resource path="res://Player/Footsteps.gd" type="Script" id=2] [ext_resource path="res://Resources/Audio/Step.wav" type="AudioStream" id=3] [ext_resource path="res://Player/UI/HUD.tscn" type="PackedScene" id=4] -[ext_resource path="res://Player/UI/HUD.gd" type="Script" id=5] -[ext_resource path="res://Sounds/dino-eat.wav" type="AudioStream" id=6] +[ext_resource path="res://Sounds/dino-eat.wav" type="AudioStream" id=5] [sub_resource type="CylinderShape" id=1] height = 2.5 @@ -80,79 +79,13 @@ unit_db = -10.0 pitch_scale = 1.5 [node name="HUD" parent="." instance=ExtResource( 4 )] -script = ExtResource( 5 ) -label_nodepath = NodePath("LabelScore") -popup_nodepath = NodePath("PopupWon") -gameover_sound_path = NodePath("../GameOverSound") - -[node name="LabelScore" type="Label" parent="HUD"] -margin_left = 15.0 -margin_top = 15.0 -margin_right = 115.0 -margin_bottom = 30.0 -text = "Score: 0" - -[node name="PopupWon" type="Popup" parent="HUD"] -visible = true -margin_left = 383.0 -margin_top = 187.0 -margin_right = 530.0 -margin_bottom = 289.0 - -[node name="PanelFail" type="Panel" parent="HUD/PopupWon"] -modulate = Color( 0.996078, 0, 0, 1 ) -margin_left = -383.0 -margin_top = -187.36 -margin_right = 641.0 -margin_bottom = 412.64 - -[node name="PanelWon" type="Panel" parent="HUD/PopupWon"] -modulate = Color( 0.0313726, 0, 0.996078, 1 ) -margin_left = -383.0 -margin_top = -187.36 -margin_right = 641.0 -margin_bottom = 412.64 - -[node name="LabelWon" type="Label" parent="HUD/PopupWon"] -margin_left = 87.064 -margin_top = 24.4867 -margin_right = 169.064 -margin_bottom = 72.4867 -text = "Gratulations! - - You Won!" - -[node name="LabelFail" type="Label" parent="HUD/PopupWon"] -margin_left = 88.9828 -margin_top = 28.0094 -margin_right = 168.983 -margin_bottom = 76.0094 -text = " You died! - -Game over" - -[node name="Button" type="Button" parent="HUD/PopupWon"] -margin_left = 86.5054 -margin_top = 144.902 -margin_right = 179.505 -margin_bottom = 181.902 -text = "play again" - -[node name="ProgressBar" type="ProgressBar" parent="HUD"] -margin_left = 410.651 -margin_top = 560.551 -margin_right = 614.651 -margin_bottom = 582.551 -step = 1.0 -value = 100.0 [node name="GameOverSound" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 6 ) +stream = ExtResource( 5 ) [node name="InteractArea" type="Area" parent="."] gravity = 0.0 [node name="CollisionShape" type="CollisionShape" parent="InteractArea"] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 2, 0 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 2, 0 ) shape = SubResource( 3 ) -[connection signal="pressed" from="HUD/PopupWon/Button" to="HUD" method="_on_Button_pressed"] diff --git a/WikiJam/Player/UI/HUD.tscn b/WikiJam/Player/UI/HUD.tscn index 9878b86..d69ac8b 100644 --- a/WikiJam/Player/UI/HUD.tscn +++ b/WikiJam/Player/UI/HUD.tscn @@ -1,5 +1,74 @@ -[gd_scene format=2] +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Player/UI/HUD.gd" type="Script" id=1] [node name="HUD" type="Control"] margin_right = 40.0 margin_bottom = 40.0 +script = ExtResource( 1 ) +label_nodepath = NodePath("../HUD/LabelScore") +popup_nodepath = NodePath("../HUD/Popup") +gameover_sound_path = NodePath("../GameOverSound") + +[node name="LabelScore" type="Label" parent="."] +margin_left = 15.0 +margin_top = 15.0 +margin_right = 115.0 +margin_bottom = 30.0 +text = "Score: 0" + +[node name="Popup" type="Popup" parent="."] +editor/display_folded = true +visible = true +margin_left = 383.0 +margin_top = 187.0 +margin_right = 530.0 +margin_bottom = 289.0 + +[node name="PanelFail" type="Panel" parent="Popup"] +modulate = Color( 0.996078, 0, 0, 1 ) +margin_left = -383.0 +margin_top = -187.36 +margin_right = 641.0 +margin_bottom = 412.64 + +[node name="PanelWon" type="Panel" parent="Popup"] +modulate = Color( 0.0313726, 0, 0.996078, 1 ) +margin_left = -383.0 +margin_top = -187.36 +margin_right = 641.0 +margin_bottom = 412.64 + +[node name="LabelWon" type="Label" parent="Popup"] +margin_left = 87.064 +margin_top = 24.4867 +margin_right = 169.064 +margin_bottom = 72.4867 +text = "Gratulations! + + You Won!" + +[node name="LabelFail" type="Label" parent="Popup"] +margin_left = 88.9828 +margin_top = 28.0094 +margin_right = 168.983 +margin_bottom = 76.0094 +text = " You died! + +Game over" + +[node name="Button" type="Button" parent="Popup"] +margin_left = 86.5054 +margin_top = 144.902 +margin_right = 179.505 +margin_bottom = 181.902 +text = "play again" + +[node name="ProgressBar" type="ProgressBar" parent="."] +margin_left = 410.651 +margin_top = 560.551 +margin_right = 614.651 +margin_bottom = 582.551 +step = 1.0 +value = 100.0 +[connection signal="pressed" from="Popup/Button" to="." method="_on_Button_pressed"] From 1177d35e1b2df313bbfa405f292270afbcc49b5b Mon Sep 17 00:00:00 2001 From: SyntaX Date: Sun, 24 Nov 2019 11:30:49 +0100 Subject: [PATCH 2/2] controller input --- WikiJam/Level/Fortaleza.tscn | 221 ++++++++++++++++++----------------- WikiJam/project.godot | 21 ++++ 2 files changed, 132 insertions(+), 110 deletions(-) diff --git a/WikiJam/Level/Fortaleza.tscn b/WikiJam/Level/Fortaleza.tscn index 4ad5cba..c20dec0 100644 --- a/WikiJam/Level/Fortaleza.tscn +++ b/WikiJam/Level/Fortaleza.tscn @@ -44,6 +44,7 @@ glow_enabled = true [node name="Fortaleza" type="Spatial"] [node name="Navigation" type="Navigation" parent="."] +editor/display_folded = true [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="Navigation"] navmesh = SubResource( 1 ) @@ -118,16 +119,16 @@ transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, 58, 0, -62 ) [node name="Wall91" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -5.96046e-08, 0, 1, 0, 1, 0, -1, 0, -5.96046e-08, 66, 0, -65 ) +transform = Transform( -5.96046e-008, 0, 1, 0, 1, 0, -1, 0, -5.96046e-008, 66, 0, -65 ) [node name="Wall92" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -5.96046e-08, 0, 1, 0, 1, 0, -1, 0, -5.96046e-08, 76, 0, -65 ) +transform = Transform( -5.96046e-008, 0, 1, 0, 1, 0, -1, 0, -5.96046e-008, 76, 0, -65 ) [node name="Wall93" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -5.96046e-08, 0, 1, 0, 1, 0, -1, 0, -5.96046e-08, 86, 0, -65 ) +transform = Transform( -5.96046e-008, 0, 1, 0, 1, 0, -1, 0, -5.96046e-008, 86, 0, -65 ) [node name="Wall94" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -5.96046e-08, 0, 1, 0, 1, 0, -1, 0, -5.96046e-08, 96, 0, -65 ) +transform = Transform( -5.96046e-008, 0, 1, 0, 1, 0, -1, 0, -5.96046e-008, 96, 0, -65 ) [node name="Wall95" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( 0.573576, 0, 0.819152, 0, 1, 0, -0.819152, 0, 0.573576, 105, 0, -62 ) @@ -145,109 +146,109 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 35, 0, 30 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 35, 0, 40 ) [node name="Wall61" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -10.8466, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -10.8466, 0, 160.637 ) [node name="Wall62" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.8466, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.8466, 0, 160.637 ) [node name="Wall63" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 9.1534, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 9.1534, 0, 160.637 ) [node name="Wall64" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 19.1534, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 19.1534, 0, 160.637 ) [node name="Wall65" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 29.1534, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 29.1534, 0, 160.637 ) [node name="Wall66" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 39.1534, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 39.1534, 0, 160.637 ) [node name="Wall67" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 49.1534, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 49.1534, 0, 160.637 ) [node name="Wall68" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 59.1534, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 59.1534, 0, 160.637 ) [node name="Wall98" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 114.153, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 114.153, 0, 160.637 ) [node name="Wall100" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 134.153, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 134.153, 0, 160.637 ) [node name="Wall99" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 124.153, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 124.153, 0, 160.637 ) [node name="Wall101" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 144.153, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 144.153, 0, 160.637 ) [node name="Wall102" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 154.153, 0, 160.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 154.153, 0, 160.637 ) [node name="Wall103" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 156.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 156.637 ) [node name="Wall106" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 130.153, 0, 134.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 130.153, 0, 134.637 ) [node name="Wall108" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 130.153, 0, 154.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 130.153, 0, 154.637 ) [node name="Wall107" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 130.153, 0, 124.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 130.153, 0, 124.637 ) [node name="Wall104" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 146.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 146.637 ) [node name="Wall105" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 136.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 136.637 ) [node name="Wall111" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 126.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 126.637 ) [node name="Wall116" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 116.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 116.637 ) [node name="Wall124" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 66.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 66.637 ) [node name="Wall132" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 17.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 17.637 ) [node name="Wall117" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 106.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 106.637 ) [node name="Wall127" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 56.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 56.637 ) [node name="Wall131" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 7.63701 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 7.63701 ) [node name="Wall118" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 96.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 96.637 ) [node name="Wall125" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 46.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 46.637 ) [node name="Wall130" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, -2.36299 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, -2.36299 ) [node name="Wall119" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 86.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 86.637 ) [node name="Wall128" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 36.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 36.637 ) [node name="Wall133" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, -12.363 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, -12.363 ) [node name="Wall120" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 76.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 76.637 ) [node name="Wall126" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, 26.637 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, 26.637 ) [node name="Wall129" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 158.153, 0, -22.363 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 158.153, 0, -22.363 ) [node name="Wall135" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( -0.819152, 0, -0.573577, 0, 1, 0, 0.573577, 0, -0.819152, 155.153, 0, -31.363 ) @@ -256,10 +257,10 @@ transform = Transform( -0.819152, 0, -0.573577, 0, 1, 0, 0.573577, 0, -0.819152, transform = Transform( -0.819152, 0, -0.573577, 0, 1, 0, 0.573577, 0, -0.819152, 149.153, 0, -39.363 ) [node name="Wall109" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 152.153, 0, 130.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 152.153, 0, 130.637 ) [node name="Wall110" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 136.153, 0, 130.637 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 136.153, 0, 130.637 ) [node name="Wall85" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( -0.422618, 0, 0.906308, 0, 1, 0, -0.906308, 0, -0.422618, 68.1534, 0, 158.637 ) @@ -301,10 +302,10 @@ transform = Transform( 0.422618, 0, -0.906308, 0, 1, 0, 0.906308, 0, 0.422618, - transform = Transform( 0.422618, 0, -0.906308, 0, 1, 0, 0.906308, 0, 0.422618, -50.2944, 0, 105.6 ) [node name="Wall113" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -2.38419e-07, 0, -1, 0, 1, 0, 1, 0, -2.38419e-07, -23.2944, 0, 95.5998 ) +transform = Transform( -2.38419e-007, 0, -1, 0, 1, 0, 1, 0, -2.38419e-007, -23.2944, 0, 95.5998 ) [node name="Wall165" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -2.38419e-07, 0, -1, 0, 1, 0, 1, 0, -2.38419e-07, -13.2944, 0, 95.5998 ) +transform = Transform( -2.38419e-007, 0, -1, 0, 1, 0, 1, 0, -2.38419e-007, -13.2944, 0, 95.5998 ) [node name="Wall141" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( 0.34202, 0, -0.939693, 0, 1, 0, 0.939693, 0, 0.34202, -28.8614, 0, 106.928 ) @@ -373,88 +374,88 @@ transform = Transform( -0.819152, 0, -0.573576, 0, 1, 0, 0.573576, 0, -0.819152, transform = Transform( 0.906308, 0, -0.422618, 0, 1, 0, 0.422618, 0, 0.906308, -52.1376, 0, -28.8826 ) [node name="Wall21" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -45.9054, 0.00019455, 55.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -45.9054, 0.00019455, 55.2835 ) [node name="Wall24" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -45.9054, 0.00019455, 65.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -45.9054, 0.00019455, 65.2835 ) [node name="Wall138" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -45.9054, 0.00019455, 75.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -45.9054, 0.00019455, 75.2835 ) [node name="Wall143" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -32.9054, 0.00019455, 113.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -32.9054, 0.00019455, 113.284 ) [node name="Wall144" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -32.9054, 0.00019455, 123.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -32.9054, 0.00019455, 123.284 ) [node name="Wall145" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -32.9054, 0.00019455, 133.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -32.9054, 0.00019455, 133.284 ) [node name="Wall146" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -32.9054, 0.00019455, 143.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -32.9054, 0.00019455, 143.284 ) [node name="Wall147" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -20.9054, 0.00019455, 160.284 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -20.9054, 0.00019455, 160.284 ) [node name="Wall148" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -30.9054, 0.00019455, 160.284 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -30.9054, 0.00019455, 160.284 ) [node name="Wall149" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -40.9054, 0.00019455, 160.284 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -40.9054, 0.00019455, 160.284 ) [node name="Wall150" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -50.9054, 0.00019455, 160.284 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -50.9054, 0.00019455, 160.284 ) [node name="Wall151" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -60.9054, 0.00019455, 160.284 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -60.9054, 0.00019455, 160.284 ) [node name="Wall152" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 154.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 154.284 ) [node name="Wall153" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 144.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 144.284 ) [node name="Wall154" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 134.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 134.284 ) [node name="Wall155" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 124.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 124.284 ) [node name="Wall156" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 114.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 114.284 ) [node name="Wall161" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 94.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 94.2835 ) [node name="Wall163" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 74.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 74.2835 ) [node name="Wall157" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 104.284 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 104.284 ) [node name="Wall160" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 84.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 84.2835 ) [node name="Wall162" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 64.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 64.2835 ) [node name="Wall164" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 54.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 54.2835 ) [node name="Wall168" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( 1, 0, 1.06581e-14, 0, 1, 0, -1.06581e-14, 0, 1, -65.9054, 0.00019455, 44.2835 ) +transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, -65.9054, 0.00019455, 44.2835 ) [node name="Wall12" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -24.8466, 0, 44.213 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -24.8466, 0, 44.213 ) [node name="Wall139" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -34.8466, 0, 44.213 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -34.8466, 0, 44.213 ) [node name="Wall140" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, -42.8466, 0, 47.213 ) [node name="Wall15" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 31.1534, 0, 44.213 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 31.1534, 0, 44.213 ) [node name="Wall13" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, -15.8466, 0, 46.213 ) @@ -463,19 +464,19 @@ transform = Transform( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, -15.8466, 0 transform = Transform( -0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, -0.5, 22.1534, 0, 46.213 ) [node name="Wall" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 41, 0, 60 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 60 ) [node name="Wall38" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 71, 0, 60 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 71, 0, 60 ) [node name="Wall51" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 66.8739, 0, 64.157 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 66.8739, 0, 64.157 ) [node name="Wall52" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 66.8739, 0, 74.157 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 66.8739, 0, 74.157 ) [node name="Wall53" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 66.8739, 0, 84.157 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 66.8739, 0, 84.157 ) [node name="Wall54" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, 63.8739, 0, 92.157 ) @@ -487,22 +488,22 @@ transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, 63.8739, 0, 92.157 ) [node name="Wall39" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 81, 0, 60 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 81, 0, 60 ) [node name="Wall96" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 91, 0, 60 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 91, 0, 60 ) [node name="Wall122" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 101, 0, 60 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 101, 0, 60 ) [node name="Wall123" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 105.298, 0, 64.4557 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 105.298, 0, 64.4557 ) [node name="Wall114" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 125, 0, 81 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 125, 0, 81 ) [node name="Wall115" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 135, 0, 81 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 135, 0, 81 ) [node name="Wall112" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( -0.5, 0, -0.866025, 0, 1, 0, 0.866025, 0, -0.5, 102, 0, 68 ) @@ -511,10 +512,10 @@ transform = Transform( -0.5, 0, -0.866025, 0, 1, 0, 0.866025, 0, -0.5, 102, 0, 6 transform = Transform( -0.5, 0, -0.866025, 0, 1, 0, 0.866025, 0, -0.5, 94, 0, 63 ) [node name="Wall43" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 85.1578, 0, 64.4073 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 85.1578, 0, 64.4073 ) [node name="Wall50" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 85.1578, 0, 84.4073 ) +transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 85.1578, 0, 84.4073 ) [node name="Wall45" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, 54.1578, 0, 119.407 ) @@ -532,28 +533,28 @@ transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, 82.1578, 0, 91.4073 ) [node name="Wall74" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 29, 0, -65 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 29, 0, -65 ) [node name="Wall75" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 19, 0, -65 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 19, 0, -65 ) [node name="Wall76" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 9, 0, -65 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 9, 0, -65 ) [node name="Wall77" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1, 0, -65 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -1, 0, -65 ) [node name="Wall78" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -11, 0, -65 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -11, 0, -65 ) [node name="Wall79" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -21, 0, -65 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -21, 0, -65 ) [node name="Wall80" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -31, 0, -65 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -31, 0, -65 ) [node name="Wall84" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -41, 0, -65 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -41, 0, -65 ) [node name="LongBuilding" parent="Navigation/NavigationMeshInstance" instance=ExtResource( 4 )] @@ -590,10 +591,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 76, 0, -2 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 76, 0, -20 ) [node name="Wall" parent="Navigation/NavigationMeshInstance/HouseRow" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 71, 0, -29 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 71, 0, -29 ) [node name="Wall2" parent="Navigation/NavigationMeshInstance/HouseRow" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 81, 0, -29 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 81, 0, -29 ) [node name="HouseRow2" type="Spatial" parent="Navigation/NavigationMeshInstance"] editor/display_folded = true @@ -612,10 +613,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 76, 0, -2 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 76, 0, -20 ) [node name="Wall" parent="Navigation/NavigationMeshInstance/HouseRow2" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 71, 0, -29 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 71, 0, -29 ) [node name="Wall2" parent="Navigation/NavigationMeshInstance/HouseRow2" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 81, 0, -29 ) +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 81, 0, -29 ) [node name="BigTower3" parent="Navigation/NavigationMeshInstance" instance=ExtResource( 6 )] transform = Transform( 0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 137, 0, -53 ) @@ -635,46 +636,46 @@ shadow_enabled = true [node name="Player" parent="." instance=ExtResource( 9 )] [node name="Crystal" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 2, 23 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 2, 23 ) [node name="Crystal2" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -62, 2, -1 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, -62, 2, -1 ) [node name="Crystal3" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -56, 2, -55 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, -56, 2, -55 ) [node name="Crystal4" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 40, 2, -18 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 40, 2, -18 ) [node name="Crystal5" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 137, 2, -53 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 137, 2, -53 ) [node name="Crystal6" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 112, 2, -16 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 112, 2, -16 ) [node name="Crystal7" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 102, 2, 12 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 102, 2, 12 ) [node name="Crystal8" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 80, 2, 2 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 80, 2, 2 ) [node name="Crystal9" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 134, 2, 94 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 134, 2, 94 ) [node name="Crystal10" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 151, 2, 153 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 151, 2, 153 ) [node name="Crystal11" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 103, 2, 149 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 103, 2, 149 ) [node name="Crystal12" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 43, 2, 130 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 43, 2, 130 ) [node name="Crystal13" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -27, 2, 114 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, -27, 2, 114 ) [node name="Crystal14" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -40, 2, 51 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, -40, 2, 51 ) [node name="Crystal15" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, -28, 2, 54 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, -28, 2, 54 ) diff --git a/WikiJam/project.godot b/WikiJam/project.godot index 025125d..74e392f 100644 --- a/WikiJam/project.godot +++ b/WikiJam/project.godot @@ -70,31 +70,52 @@ Collector="*res://Util/Collector.gd" move_fwrd={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":12,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null) ] } move_back={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":13,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null) ] } move_left={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":14,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null) ] } move_right={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":15,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null) ] } move_jump={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } move_sprint={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":7,"pressure":0.0,"pressed":false,"script":null) + ] +} +cam_move_left={ +"deadzone": 0.5, +"events": [ Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":-1.0,"script":null) + ] +} +cam_move_right={ +"deadzone": 0.5, +"events": [ Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":1.0,"script":null) ] }