From 497521127aae72b29c8aa83cdaa46d8e7378af3a Mon Sep 17 00:00:00 2001 From: SyntaX Date: Sat, 23 Nov 2019 14:35:50 +0100 Subject: [PATCH] fixed namings --- WikiJam/Level/Fortaleza.tscn | 26 +++++++++++++++----------- WikiJam/Player/Player.tscn | 2 +- WikiJam/project.godot | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/WikiJam/Level/Fortaleza.tscn b/WikiJam/Level/Fortaleza.tscn index b56c9ed..8db721e 100644 --- a/WikiJam/Level/Fortaleza.tscn +++ b/WikiJam/Level/Fortaleza.tscn @@ -11,14 +11,14 @@ size = Vector2( 500, 500 ) [sub_resource type="SpatialMaterial" id=2] albedo_color = Color( 0.537255, 0.741176, 0.517647, 1 ) -[sub_resource type="ConcavePolygonShape" id=5] +[sub_resource type="ConcavePolygonShape" id=3] data = PoolVector3Array( 250, 0, 250, -250, 0, 250, 250, 0, -250, -250, 0, 250, -250, 0, -250, 250, 0, -250 ) -[sub_resource type="ProceduralSky" id=3] +[sub_resource type="ProceduralSky" id=4] -[sub_resource type="Environment" id=4] +[sub_resource type="Environment" id=5] background_mode = 2 -background_sky = SubResource( 3 ) +background_sky = SubResource( 4 ) [node name="Fortaleza" type="Spatial"] @@ -33,7 +33,7 @@ material/0 = SubResource( 2 ) [node name="StaticBody" type="StaticBody" parent="Navigation/NavigationMeshInstance/Ground"] [node name="CollisionShape" type="CollisionShape" parent="Navigation/NavigationMeshInstance/Ground/StaticBody"] -shape = SubResource( 5 ) +shape = SubResource( 3 ) [node name="Walls" type="Spatial" parent="Navigation/NavigationMeshInstance"] editor/display_folded = true @@ -66,7 +66,7 @@ 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="Wall10" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 1 )] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -44.8466, 0, 44.213 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -44.8466, 0, 44.213 ) [node name="Wall16" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -49.1376, 0, 40.1174 ) @@ -132,13 +132,13 @@ 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, -30.8826 ) [node name="Wall11" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 1 )] -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="Wall12" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 1 )] -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="Wall15" parent="Navigation/NavigationMeshInstance/Walls" instance=ExtResource( 1 )] -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( 1 )] transform = Transform( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, -15.8466, 0, 46.213 ) @@ -154,11 +154,15 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 0, 74 ) [node name="SmallBuilding" parent="Navigation/NavigationMeshInstance" instance=ExtResource( 3 )] [node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource( 4 ) +environment = SubResource( 5 ) [node name="DirectionalLight" type="DirectionalLight" parent="WorldEnvironment"] transform = Transform( 0.965926, 0.212012, -0.148453, 0, 0.573576, 0.819152, 0.258819, -0.79124, 0.554032, 0, 0, 0 ) shadow_enabled = true -[node name="Spatial" parent="." instance=ExtResource( 4 )] +[node name="Player" parent="." instance=ExtResource( 4 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) +body_nodepath = NodePath("Body") +animation_nodepath = NodePath("WalkAnimationPlayer") +ui_nodepath = NodePath("HUD") +camera_nodepath = NodePath("Camera") diff --git a/WikiJam/Player/Player.tscn b/WikiJam/Player/Player.tscn index 31d2bd8..7f8f429 100644 --- a/WikiJam/Player/Player.tscn +++ b/WikiJam/Player/Player.tscn @@ -42,7 +42,7 @@ tracks/1/keys = { } ] } -[node name="Spatial" type="KinematicBody"] +[node name="Player" type="KinematicBody"] script = ExtResource( 1 ) body_nodepath = NodePath("Body") animation_nodepath = NodePath("WalkAnimationPlayer") diff --git a/WikiJam/project.godot b/WikiJam/project.godot index c624f29..025125d 100644 --- a/WikiJam/project.godot +++ b/WikiJam/project.godot @@ -57,7 +57,7 @@ _global_script_class_icons={ [application] config/name="WikiJam" -run/main_scene="res://Level/Level.tscn" +run/main_scene="res://Level/Fortaleza.tscn" config/icon="res://icon.png" [autoload]