From 793029c9cc463681bb566adcad675043dd1e64a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schulthei=C3=9F=2C=20Daniel?= <118031298+dany-cmd@users.noreply.github.com> Date: Sun, 17 Nov 2024 18:32:38 +0100 Subject: [PATCH 1/2] emergency fix --- images/postcards/postcard_chest_big.png | Bin 0 -> 6357 bytes .../postcards/postcard_chest_big.png.import | 34 ++++++++++++++++++ interactables/chest_scene.gd | 5 +++ mob/player/player.gd | 2 +- scenes/Inventory/inv_ui.tscn | 1 + scenes/Inventory/items/postcard.gd | 6 ++-- scenes/Main.tscn | 2 +- scenes/Underwater.tscn | 9 +++-- scenes/main_scene.tscn | 7 ++-- 9 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 images/postcards/postcard_chest_big.png create mode 100644 images/postcards/postcard_chest_big.png.import diff --git a/images/postcards/postcard_chest_big.png b/images/postcards/postcard_chest_big.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee9ff53371d6d8bed34d90f65643c37bfe5a367 GIT binary patch literal 6357 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 literal 0 HcmV?d00001 diff --git a/images/postcards/postcard_chest_big.png.import b/images/postcards/postcard_chest_big.png.import new file mode 100644 index 0000000..ceec70c --- /dev/null +++ b/images/postcards/postcard_chest_big.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://v4hpn3ou2lmh" +path="res://.godot/imported/postcard_chest_big.png-0a1b958c380aa013f739ae352ddc2ebf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/postcards/postcard_chest_big.png" +dest_files=["res://.godot/imported/postcard_chest_big.png-0a1b958c380aa013f739ae352ddc2ebf.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/interactables/chest_scene.gd b/interactables/chest_scene.gd index b6e3e8d..048db36 100644 --- a/interactables/chest_scene.gd +++ b/interactables/chest_scene.gd @@ -13,4 +13,9 @@ func _on_interact(): sprite_closed.visible = false sprite_open.visible = true event_collision.disabled = true + + var tex = load("res://images/icons/postcard.png") + var bigtex = load("res://images/icons/chest.jpg") + var name = "Chest" + Global.inv.items[3] = InvItem.new("Chest", tex, bigtex) diff --git a/mob/player/player.gd b/mob/player/player.gd index 0f7c98e..d22b238 100644 --- a/mob/player/player.gd +++ b/mob/player/player.gd @@ -125,7 +125,7 @@ func _on_area_2d_area_entered(area: Area2D) -> void: print("All fishes dead") var index = 5 var tex = load("res://images/icons/postcard.png") - var bigtex = load("res://images/icons/fish.jpg") + var bigtex = load("res://images/postcards/postcard_catchfish_big.png") name = "Strand" Global.inv.items[index] = InvItem.new(name, tex, bigtex) diff --git a/scenes/Inventory/inv_ui.tscn b/scenes/Inventory/inv_ui.tscn index 1ebf119..d1efcc6 100644 --- a/scenes/Inventory/inv_ui.tscn +++ b/scenes/Inventory/inv_ui.tscn @@ -238,6 +238,7 @@ offset_top = 60.0 offset_right = 1070.0 offset_bottom = 726.0 scale = Vector2(0.196237, 0.158742) +expand_mode = 4 [editable path="NinePatchRect/Inv_UI_Slot1"] [editable path="NinePatchRect/Inv_UI_Slot2"] diff --git a/scenes/Inventory/items/postcard.gd b/scenes/Inventory/items/postcard.gd index cda130f..80d23d3 100644 --- a/scenes/Inventory/items/postcard.gd +++ b/scenes/Inventory/items/postcard.gd @@ -42,8 +42,8 @@ func _process(delta): 3: index = 3 tex = load("res://images/icons/postcard.png") - bigtex = load("res://images/icons/postcard.jpg") - name = "Strand" + bigtex = load("res://images/postcards/postcard_chest_big.png") + name = "Chest" 4: index = 4 tex = load("res://images/postcards/postcard_small_2.png") @@ -52,7 +52,7 @@ func _process(delta): 5: index = 5 tex = load("res://images/icons/postcard.png") - bigtex = load("res://images/postcards/postcard_catchfish_big.png") + bigtex = load("res://images/icons/postcard.jpg") name = "Strand" 6: index = 6 diff --git a/scenes/Main.tscn b/scenes/Main.tscn index 4be43a0..9f9432d 100644 --- a/scenes/Main.tscn +++ b/scenes/Main.tscn @@ -10,7 +10,7 @@ [ext_resource type="Texture2D" uid="uid://bwv07exma57ns" path="res://images/Tilemaps/walls/wooden_door.png" id="6_4h62c"] [ext_resource type="Texture2D" uid="uid://dansg185qe06l" path="res://images/Tilemaps/walls/wooden_door_b.png" id="7_63skh"] [ext_resource type="PackedScene" uid="uid://egesikv1ec5t" path="res://mob/player/player.tscn" id="8_01c2f"] -[ext_resource type="PackedScene" uid="uid://m7g6luq0mlvi" path="res://scenes/speaker_node.tscn" id="10_n25yo"] +[ext_resource type="PackedScene" path="res://scenes/speaker_node.tscn" id="10_n25yo"] [ext_resource type="PackedScene" uid="uid://bcnlxhaiw2h1d" path="res://scenes/Music/audio_stream_player.tscn" id="12_g32sf"] [ext_resource type="PackedScene" uid="uid://c24kk85efm6h1" path="res://scenes/Inventory/items/postcard.tscn" id="12_va8pm"] [ext_resource type="AudioStream" uid="uid://brthwqbd1ese" path="res://sounds/LOOP_Mysterious Cave.wav" id="13_22tl0"] diff --git a/scenes/Underwater.tscn b/scenes/Underwater.tscn index ea1346f..c34b412 100644 --- a/scenes/Underwater.tscn +++ b/scenes/Underwater.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=15 format=4 uid="uid://b74vtdpkay2nv"] +[gd_scene load_steps=16 format=4 uid="uid://b74vtdpkay2nv"] [ext_resource type="Texture2D" uid="uid://ncr406ndikxp" path="res://images/Tilemaps/worlds/water/background/sand.png" id="1_3vnpc"] [ext_resource type="PackedScene" uid="uid://c24kk85efm6h1" path="res://scenes/Inventory/items/postcard.tscn" id="7_1tlrk"] [ext_resource type="PackedScene" uid="uid://egesikv1ec5t" path="res://mob/player/player.tscn" id="8_p7uvn"] +[ext_resource type="PackedScene" uid="uid://bgt0e6rxsslqm" path="res://scenes/entrance_template_interactable.tscn" id="10_butik"] [ext_resource type="PackedScene" uid="uid://bcnlxhaiw2h1d" path="res://scenes/Music/audio_stream_player.tscn" id="11_32d0t"] [ext_resource type="Texture2D" uid="uid://cbw6xxm48qkyd" path="res://images/Tilemaps/worlds/water/underwater_tileset.png" id="12_he1ea"] [ext_resource type="AudioStream" uid="uid://2b4magmr1dpk" path="res://sounds/LOOP_Let's Go Underwater!.wav" id="12_ikfqh"] @@ -140,7 +141,7 @@ modulate = Color(0, 0.485494, 0.485645, 1) position = Vector2(769, 363) [node name="Player" parent="." groups=["player"] instance=ExtResource("8_p7uvn")] -position = Vector2(359, 73) +position = Vector2(144, 251) [node name="Background" type="TileMapLayer" parent="."] modulate = Color(1, 1, 1, 0.109804) @@ -178,3 +179,7 @@ position = Vector2(309, 18) [node name="AudioStreamPlayer" parent="." instance=ExtResource("11_32d0t")] stream = ExtResource("12_ikfqh") + +[node name="Entrance" parent="." instance=ExtResource("10_butik")] +position = Vector2(39, 277) +sceneChanger = "/scenes/main_scene" diff --git a/scenes/main_scene.tscn b/scenes/main_scene.tscn index 5cc1fec..3ff6646 100644 --- a/scenes/main_scene.tscn +++ b/scenes/main_scene.tscn @@ -1,5 +1,4 @@ -[gd_scene load_steps=40 format=4 uid="uid://bcf6c0ghkv687"] - +[gd_scene load_steps=41 format=4 uid="uid://bcf6c0ghkv687"] [ext_resource type="PackedScene" path="res://gui/default_ui.tscn" id="1_0ryrq"] [ext_resource type="Texture2D" uid="uid://qii51n4l2jdk" path="res://images/Tilemaps/TopDown/Terrain/plains.png" id="2_chao5"] @@ -20,7 +19,7 @@ [ext_resource type="PackedScene" uid="uid://dtrveru3rk6ec" path="res://interactables/door_entrance_scene.tscn" id="15_7sdch"] [ext_resource type="PackedScene" uid="uid://egesikv1ec5t" path="res://mob/player/player.tscn" id="16_fxlap"] [ext_resource type="PackedScene" uid="uid://bgt0e6rxsslqm" path="res://scenes/entrance_template_interactable.tscn" id="16_pb8vh"] -[ext_resource type="PackedScene" uid="uid://m7g6luq0mlvi" path="res://scenes/speaker_node.tscn" id="17_7h2sa"] +[ext_resource type="PackedScene" path="res://scenes/speaker_node.tscn" id="17_7h2sa"] [ext_resource type="PackedScene" uid="uid://bcnlxhaiw2h1d" path="res://scenes/Music/audio_stream_player.tscn" id="18_tvtcd"] [ext_resource type="AudioStream" uid="uid://0c1lapm8y2us" path="res://sounds/LOOP_Exploring the Depths.wav" id="19_xpcnq"] [ext_resource type="PackedScene" path="res://interactables/damage_object.tscn" id="20_5ku0g"] @@ -1442,7 +1441,7 @@ gamemode = 1 [node name="Entrance" parent="." instance=ExtResource("16_pb8vh")] position = Vector2(240, 262) -sceneChanger = "/mob/player/test" +sceneChanger = "/scenes/Underwater" activate_on_collision = false [node name="Entrance2" parent="." instance=ExtResource("16_pb8vh")] From 1bb15cb4a7666a1f4f8b8b25c0a636a0a6dc61d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schulthei=C3=9F=2C=20Daniel?= <118031298+dany-cmd@users.noreply.github.com> Date: Sun, 17 Nov 2024 19:31:24 +0100 Subject: [PATCH 2/2] last commit --- .../Scripts/pause_menu_controller.gd | 3 +- images/postcards/postcard_dead_big.png | Bin 0 -> 18324 bytes images/postcards/postcard_dead_big.png.import | 34 ++++++++++++++++++ interactables/chest_scene.gd | 2 +- project.godot | 1 - scenes/Dungeon.tscn | 6 ++-- scenes/Inventory/inv_ui.tscn | 2 +- scenes/Underwater.tscn | 3 +- scripts/overlap_event_object.gd | 5 +++ 9 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 images/postcards/postcard_dead_big.png create mode 100644 images/postcards/postcard_dead_big.png.import diff --git a/addons/EasyMenus/Scripts/pause_menu_controller.gd b/addons/EasyMenus/Scripts/pause_menu_controller.gd index 558c45b..ed09e96 100644 --- a/addons/EasyMenus/Scripts/pause_menu_controller.gd +++ b/addons/EasyMenus/Scripts/pause_menu_controller.gd @@ -43,6 +43,7 @@ func _on_back_to_menu_button_pressed(): get_tree().change_scene_to_file("res://gui/main.tscn") func _input(event): - if (event.is_action_pressed("ui_cancel") or event.is_action_pressed("pause")) and visible and !options_menu.visible: + if (event.is_action_pressed("ui_cancel")) and visible and !options_menu.visible: + #if (event.is_action_pressed("ui_cancel") or event.is_action_pressed("pause")) and visible and !options_menu.visible: accept_event() close_pause_menu() diff --git a/images/postcards/postcard_dead_big.png b/images/postcards/postcard_dead_big.png new file mode 100644 index 0000000000000000000000000000000000000000..857df7a30afd77fc139ec75903a8938db1c62c6b GIT binary patch literal 18324 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 OZkxT!mZHtOkN-bqkPtZl literal 0 HcmV?d00001 diff --git a/images/postcards/postcard_dead_big.png.import b/images/postcards/postcard_dead_big.png.import new file mode 100644 index 0000000..5b1becb --- /dev/null +++ b/images/postcards/postcard_dead_big.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cbs3h526sqhf" +path="res://.godot/imported/postcard_dead_big.png-70bd6dd3e3f18735866a84b06e5f34b8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/postcards/postcard_dead_big.png" +dest_files=["res://.godot/imported/postcard_dead_big.png-70bd6dd3e3f18735866a84b06e5f34b8.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/interactables/chest_scene.gd b/interactables/chest_scene.gd index 048db36..b44aac1 100644 --- a/interactables/chest_scene.gd +++ b/interactables/chest_scene.gd @@ -15,7 +15,7 @@ func _on_interact(): event_collision.disabled = true var tex = load("res://images/icons/postcard.png") - var bigtex = load("res://images/icons/chest.jpg") + var bigtex = load("res://images/postcards/postcard_chest_big.png") var name = "Chest" Global.inv.items[3] = InvItem.new("Chest", tex, bigtex) diff --git a/project.godot b/project.godot index 8b4b0d4..c3cb347 100644 --- a/project.godot +++ b/project.godot @@ -32,7 +32,6 @@ StaminaManager="*res://scenes/Stamina/StaminaManager.tscn" window/size/viewport_width=1920 window/size/viewport_height=1080 window/stretch/mode="canvas_items" -window/vsync/vsync_mode=2 [editor_plugins] diff --git a/scenes/Dungeon.tscn b/scenes/Dungeon.tscn index aca87e8..6a8e580 100644 --- a/scenes/Dungeon.tscn +++ b/scenes/Dungeon.tscn @@ -2853,7 +2853,7 @@ position = Vector2(302, 273) visible = false [node name="CollisionShape2D" parent="Pain" index="1"] -position = Vector2(1.25, -4) +position = Vector2(2, -20) scale = Vector2(1.06622, 0.719812) [node name="CollisionShape2D" parent="Pain/InteractionArea" index="0"] @@ -2866,7 +2866,7 @@ scale = Vector2(0.841282, 1.00542) visible = false [node name="CollisionShape2D" parent="Object" index="1"] -position = Vector2(704.125, 273) +position = Vector2(701.5, 254) [node name="Object2" parent="." instance=ExtResource("9_wrelx")] @@ -2874,7 +2874,7 @@ position = Vector2(704.125, 273) visible = false [node name="CollisionShape2D" parent="Object2" index="1"] -position = Vector2(1358.56, 214) +position = Vector2(1356, 194) [connection signal="player_damaged" from="Pain" to="Player" method="_on_pain_player_damaged"] [connection signal="player_damaged" from="Object" to="Player" method="_on_object_player_damaged"] diff --git a/scenes/Inventory/inv_ui.tscn b/scenes/Inventory/inv_ui.tscn index d1efcc6..6232fc5 100644 --- a/scenes/Inventory/inv_ui.tscn +++ b/scenes/Inventory/inv_ui.tscn @@ -238,7 +238,7 @@ offset_top = 60.0 offset_right = 1070.0 offset_bottom = 726.0 scale = Vector2(0.196237, 0.158742) -expand_mode = 4 +expand_mode = 2 [editable path="NinePatchRect/Inv_UI_Slot1"] [editable path="NinePatchRect/Inv_UI_Slot2"] diff --git a/scenes/Underwater.tscn b/scenes/Underwater.tscn index c34b412..f9e2d58 100644 --- a/scenes/Underwater.tscn +++ b/scenes/Underwater.tscn @@ -139,6 +139,7 @@ texture = ExtResource("1_3vnpc") [node name="Postcard" parent="." instance=ExtResource("7_1tlrk")] modulate = Color(0, 0.485494, 0.485645, 1) position = Vector2(769, 363) +metadata/postcard_index = 1 [node name="Player" parent="." groups=["player"] instance=ExtResource("8_p7uvn")] position = Vector2(144, 251) @@ -175,7 +176,7 @@ position = Vector2(406, 341) position = Vector2(611, 288) [node name="Fish4" parent="." instance=ExtResource("15_acr2r")] -position = Vector2(309, 18) +position = Vector2(492, 349) [node name="AudioStreamPlayer" parent="." instance=ExtResource("11_32d0t")] stream = ExtResource("12_ikfqh") diff --git a/scripts/overlap_event_object.gd b/scripts/overlap_event_object.gd index 8b741fb..3700e34 100644 --- a/scripts/overlap_event_object.gd +++ b/scripts/overlap_event_object.gd @@ -39,3 +39,8 @@ func _on_interact(): func event(): print("SHOOT EM TO THE SKYYY") player_damaged.emit() + + var tex = load("res://images/icons/postcard.png") + var bigtex = load("res://images/postcards/postcard_dead_big.png") + var name = "Dead" + Global.inv.items[0] = InvItem.new(name, tex, bigtex)