diff --git a/Characters/Player/Player.tscn b/Characters/Player/Player.tscn index 8992c9b..eb9b011 100644 --- a/Characters/Player/Player.tscn +++ b/Characters/Player/Player.tscn @@ -268,6 +268,14 @@ pitch_scale = 1.5 [node name="HUD" parent="." instance=ExtResource( 9 )] +[node name="DayTimeVisual" parent="HUD" index="6"] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -90.0 +margin_top = -90.0 +margin_right = 90.0 +margin_bottom = 90.0 + [node name="PillTaker" type="Spatial" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) script = ExtResource( 10 ) diff --git a/Characters/Player/UI/UI.gd b/Characters/Player/UI/UI.gd index ddba595..842480f 100644 --- a/Characters/Player/UI/UI.gd +++ b/Characters/Player/UI/UI.gd @@ -45,5 +45,5 @@ func _process(_delta): _labelDayTime.text = "dayTime: " + String(val) + " - %02d:%02d" % [val/60%24, val%60] _dayTime.value = Daytime.get_time() - #_dayTimeVisual.rect_rotation = (val/_dayTime.max_value) * 360 #pivot offset x=67, y = 7 - _dayTimeVisual.rect_rotation = (val/_dayTime.max_value) * 180 \ No newline at end of file + _dayTimeVisual.rect_rotation = (val/_dayTime.max_value) * 360 + \ No newline at end of file diff --git a/Characters/Player/UI/UI.tscn b/Characters/Player/UI/UI.tscn index af8b230..bb19791 100644 --- a/Characters/Player/UI/UI.tscn +++ b/Characters/Player/UI/UI.tscn @@ -64,10 +64,12 @@ margin_bottom = 44.7722 rect_pivot_offset = Vector2( 67.8153, 7.2278 ) [node name="DayTimeVisual" type="TextureRect" parent="."] -margin_left = 466.0 -margin_top = -82.0 -margin_right = 646.0 -margin_bottom = 98.0 +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -90.0 +margin_top = -90.0 +margin_right = 90.0 +margin_bottom = 90.0 rect_rotation = 180.0 rect_pivot_offset = Vector2( 90, 90 ) texture = ExtResource( 4 ) diff --git a/Level/World.tscn b/Level/World.tscn index 73f6603..a850e91 100644 --- a/Level/World.tscn +++ b/Level/World.tscn @@ -1,19 +1,18 @@ -[gd_scene load_steps=22 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=1] -[ext_resource path="res://Characters/Meldewesen/Meldewesen.tscn" type="PackedScene" id=2] -[ext_resource path="res://Level/Interactables/Keycard/Keycard.tscn" type="PackedScene" id=3] -[ext_resource path="res://Level/Interactables/Key/Key.tscn" type="PackedScene" id=4] -[ext_resource path="res://Level/WorkerSpawner.gd" type="Script" id=5] -[ext_resource path="res://Level/Interactables/Lever/Lever.tscn" type="PackedScene" id=6] -[ext_resource path="res://Level/Buildings/PlayerHouse.tscn" type="PackedScene" id=7] -[ext_resource path="res://Level/Buildings/BuildingBlock.tscn" type="PackedScene" id=8] -[ext_resource path="res://Level/Buildings/MeldewesenHome.tscn" type="PackedScene" id=9] -[ext_resource path="res://Level/Buildings/Factory.tscn" type="PackedScene" id=10] -[ext_resource path="res://Level/Buildings/DoorWall.tscn" type="PackedScene" id=11] -[ext_resource path="res://Util/NodeGroupNotifier.tscn" type="PackedScene" id=12] -[ext_resource path="res://Characters/Util/PathNavigatorForNPC.tscn" type="PackedScene" id=13] -[ext_resource path="res://Util/AmbiencePlayer.tscn" type="PackedScene" id=14] +[ext_resource path="res://Level/Interactables/Keycard/Keycard.tscn" type="PackedScene" id=2] +[ext_resource path="res://Level/Interactables/Key/Key.tscn" type="PackedScene" id=3] +[ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=4] +[ext_resource path="res://Level/Interactables/Lever/Lever.tscn" type="PackedScene" id=5] +[ext_resource path="res://Level/Buildings/PlayerHouse.tscn" type="PackedScene" id=6] +[ext_resource path="res://Level/Buildings/BuildingBlock.tscn" type="PackedScene" id=7] +[ext_resource path="res://Level/Buildings/MeldewesenHome.tscn" type="PackedScene" id=8] +[ext_resource path="res://Level/Buildings/Factory.tscn" type="PackedScene" id=9] +[ext_resource path="res://Util/NodeGroupNotifier.tscn" type="PackedScene" id=10] +[ext_resource path="res://Characters/Util/PathNavigatorForNPC.tscn" type="PackedScene" id=11] +[ext_resource path="res://Characters/Meldewesen/Meldewesen.tscn" type="PackedScene" id=12] +[ext_resource path="res://Util/AmbiencePlayer.tscn" type="PackedScene" id=13] [sub_resource type="BoxShape" id=1] @@ -45,34 +44,19 @@ _data = { [node name="Player" parent="." instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 7 ) -[node name="Enemies" type="Node" parent="."] - -[node name="Meldewesen2" parent="Enemies" instance=ExtResource( 2 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -3.88156, 0, 14.5424 ) -_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") - -[node name="Meldewesen3" parent="Enemies" instance=ExtResource( 2 )] -transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 58.4396, 0, -200.412 ) -_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") - -[node name="Meldewesen4" parent="Enemies" instance=ExtResource( 2 )] -transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13.0581, 0, -67.0506 ) -_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") - [node name="Collectibles" type="Spatial" parent="."] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 ) [node name="Keycard" parent="Collectibles" groups=[ "Collectibles", -] instance=ExtResource( 3 )] +] instance=ExtResource( 2 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 203.861, -0.63203, 110.591 ) card_lvl = 1 [node name="Key" parent="Collectibles" groups=[ "Collectibles", -] instance=ExtResource( 4 )] -editor/display_folded = true -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -77.5603, 0, -1.90735e-006 ) +] instance=ExtResource( 3 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75.0183, 0, -2.86102e-006 ) key_id = 1 [node name="Area" type="Area" parent="Collectibles/Key" groups=[ @@ -83,208 +67,181 @@ key_id = 1 transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, 0, 0, 0 ) shape = SubResource( 1 ) -[node name="WorkerSpawner" type="Node" parent="."] +[node name="Touchables" type="Spatial" parent="."] editor/display_folded = true -[node name="WorkerSpawner" type="Spatial" parent="WorkerSpawner"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.20278, 0, -43.032 ) -script = ExtResource( 5 ) +[node name="Door" parent="Touchables" instance=ExtResource( 4 )] +transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 73.152, 2, -191.228 ) +door_lvl = 1 -[node name="WorkerSpawner2" type="Spatial" parent="WorkerSpawner"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.36571, 0, -102.743 ) -script = ExtResource( 5 ) - -[node name="WorkerSpawner3" type="Spatial" parent="WorkerSpawner"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.36571, 0, 52.7015 ) -script = ExtResource( 5 ) - -[node name="WorkerSpawner4" type="Spatial" parent="WorkerSpawner"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 69.6766, 0, -136.624 ) -script = ExtResource( 5 ) - -[node name="WorkerSpawner5" type="Spatial" parent="WorkerSpawner"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -15.3518, 0, -202.564 ) -script = ExtResource( 5 ) - -[node name="Touchables" type="Spatial" parent="."] - -[node name="Lever" parent="Touchables" instance=ExtResource( 6 )] +[node name="Lever" parent="Touchables" instance=ExtResource( 5 )] transform = Transform( 1.19249e-008, 0, -1, 0, 1, 0, 1, 0, 1.19249e-008, 5.94476, 2, 11.731 ) [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] navmesh = SubResource( 2 ) -[node name="PlayerHouse" parent="NavigationMeshInstance" instance=ExtResource( 7 )] +[node name="PlayerHouse" parent="NavigationMeshInstance" instance=ExtResource( 6 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, 14 ) -[node name="MeldewesenHouse" parent="NavigationMeshInstance" instance=ExtResource( 7 )] -transform = Transform( 0.8, 0, 0, 0, 1, 0, 0, 0, 1, 14.9197, 0, 89.983 ) - [node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"] editor/display_folded = true -[node name="BuildingBlock" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -13 ) -[node name="BuildingBlock2" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock2" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, -13 ) -[node name="BuildingBlock11" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock11" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, 41 ) -[node name="BuildingBlock12" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock12" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 14 ) -[node name="BuildingBlock13" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock13" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 41 ) -[node name="BuildingBlock14" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock14" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 34, 0, 47 ) -[node name="BuildingBlock15" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock15" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 95 ) -[node name="BuildingBlock21" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock21" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 41, 0, 68 ) -[node name="BuildingBlock16" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock16" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13, 0, 68 ) -[node name="BuildingBlock20" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock20" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13, 0, 95 ) -[node name="BuildingBlock17" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock17" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 8, 0, 116 ) -[node name="BuildingBlock18" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock18" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, 35, 0, 116 ) -[node name="BuildingBlock3" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock3" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, -40 ) -[node name="BuildingBlock4" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock4" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -40 ) -[node name="BuildingBlock5" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock5" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, -88 ) -[node name="BuildingBlock10" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock10" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -34, 0, -46 ) -[node name="BuildingBlock9" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock9" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -94 ) -[node name="BuildingBlock24" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock24" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -121 ) -[node name="BuildingBlock25" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock25" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -127 ) -[node name="BuildingBlock26" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock26" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 35, 0, -127 ) -[node name="BuildingBlock31" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock31" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 35, 0, -169 ) -[node name="BuildingBlock37" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock37" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 100, 0, -169 ) -[node name="BuildingBlock38" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock38" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 127, 0, -169 ) -[node name="BuildingBlock40" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock40" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 127, 0, -211 ) -[node name="BuildingBlock41" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock41" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 100, 0, -211 ) -[node name="BuildingBlock42" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock42" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 73, 0, -211 ) -[node name="BuildingBlock53" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 79, 0, -201.078 ) - -[node name="BuildingBlock54" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 0.6, 0, -1, 0, -4.37114e-008, 79, 4.83048, -181.541 ) - -[node name="BuildingBlock43" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock43" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 46, 0, -211 ) -[node name="BuildingBlock44" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock44" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 19, 0, -211 ) -[node name="BuildingBlock45" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock45" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0, -211 ) -[node name="BuildingBlock46" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock46" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35, 0, -211 ) -[node name="BuildingBlock47" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock47" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -56, 0, -217 ) -[node name="BuildingBlock48" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock48" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -71, 0, -217 ) -[node name="BuildingBlock50" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock50" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -71, 0, -244 ) -[node name="BuildingBlock51" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock51" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -1, 0, 8.74228e-008, 0, 1, 0, -8.74228e-008, 0, -1, -92, 0, -250 ) -[node name="BuildingBlock52" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock52" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1.31134e-007, 0, 1, 0, 1, 0, -1, 0, 1.31134e-007, -113, 0, -256 ) -[node name="BuildingBlock32" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock32" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -169 ) -[node name="BuildingBlock33" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock33" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -19, 0, -169 ) -[node name="BuildingBlock34" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock34" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -46, 0, -169 ) -[node name="BuildingBlock35" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock35" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -67, 0, -163 ) -[node name="BuildingBlock36" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock36" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -76, 0, -142 ) -[node name="BuildingBlock49" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock49" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -103, 0, -142 ) -[node name="BuildingBlock27" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock27" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0, -148 ) -[node name="BuildingBlock28" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock28" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 79, 0, -109 ) -[node name="BuildingBlock29" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock29" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 79, 0, -136 ) -[node name="BuildingBlock30" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock30" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 79, 0, -163 ) -[node name="BuildingBlock39" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock39" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 133, 0, -190 ) -[node name="MeldewesenHome" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 9 )] +[node name="MeldewesenHome" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] -[node name="BuildingBlock6" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock6" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, -67 ) -[node name="BuildingBlock7" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock7" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 19, 0, -88 ) -[node name="BuildingBlock8" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock8" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 19, 0, -88 ) -[node name="BuildingBlock22" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock22" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 46, 0, -88 ) -[node name="BuildingBlock23" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )] +[node name="BuildingBlock23" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 73, 0, -88 ) -[node name="Factory" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 10 )] +[node name="Factory" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 9 )] [node name="Ground" type="MeshInstance" parent="NavigationMeshInstance"] editor/display_folded = true @@ -294,40 +251,30 @@ mesh = SubResource( 3 ) material/0 = null [node name="StaticBody" type="StaticBody" parent="NavigationMeshInstance/Ground"] -editor/display_folded = true collision_layer = 7 collision_mask = 7 [node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/Ground/StaticBody"] shape = SubResource( 4 ) -[node name="DoorWall" parent="NavigationMeshInstance/Ground" instance=ExtResource( 11 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 156.062, 0, -76.2607 ) - -[node name="Door" parent="NavigationMeshInstance/Ground/DoorWall" index="3"] -door_lvl = 1 - [node name="Environment" type="Spatial" parent="."] -editor/display_folded = true [node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"] environment = SubResource( 6 ) [node name="DirectionalLight" type="DirectionalLight" parent="Environment"] -transform = Transform( 0.642788, -0.262003, -0.719846, 0, -0.939693, 0.34202, -0.766044, -0.219846, -0.604023, 0, 7, 0 ) +transform = Transform( 0.642788, -0.262003, -0.719846, -8.21505e-008, -0.939693, 0.34202, -0.766044, -0.219847, -0.604023, 0, 7, 0 ) layers = 3 shadow_enabled = true -[node name="NodeGroupNotifier" parent="." instance=ExtResource( 12 )] +[node name="NodeGroupNotifier" parent="." instance=ExtResource( 10 )] group_name = "Navigator" node_to_send = NodePath("..") -[node name="PathNavigatorForNPC" parent="." instance=ExtResource( 13 )] +[node name="PathNavigatorForNPC" parent="." instance=ExtResource( 11 )] curve = SubResource( 7 ) body_nodepath = NodePath("Meldewesen") -[node name="Meldewesen" parent="PathNavigatorForNPC" instance=ExtResource( 2 )] +[node name="Meldewesen" parent="PathNavigatorForNPC" instance=ExtResource( 12 )] -[node name="AmbiencePlayer" parent="." instance=ExtResource( 14 )] - -[editable path="NavigationMeshInstance/Ground/DoorWall"] +[node name="AmbiencePlayer" parent="." instance=ExtResource( 13 )] diff --git a/Resources/Textures/daytimeUI.png b/Resources/Textures/daytimeUI.png index 5bfcc4d..275d247 100644 Binary files a/Resources/Textures/daytimeUI.png and b/Resources/Textures/daytimeUI.png differ diff --git a/project.godot b/project.godot index 7b540dc..e8f4473 100644 --- a/project.godot +++ b/project.godot @@ -72,6 +72,10 @@ Logger="*res://Util/gs-logger-3.1-R3/gs_logger/logger.gd" Pills="*res://Global/Pills.gd" Daytime="*res://Global/Daytime.gd" +[display] + +window/size/fullscreen=true + [input] move_left={