Merge pull request #69 from TheBlackDragon4/main-merge

Main merge

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()

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

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

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/postcards/postcard_chest_big.png")
+	var name = "Chest"
+	Global.inv.items[3] = InvItem.new("Chest", tex, bigtex)
 

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)
 

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]
 

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,15 +2866,15 @@ 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")]
 
 [node name="SpriteBefore" parent="Object2" index="0"]
 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"]

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 = 2
 
 [editable path="NinePatchRect/Inv_UI_Slot1"]
 [editable path="NinePatchRect/Inv_UI_Slot2"]

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

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"]

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"]
@@ -138,9 +139,10 @@ 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(359, 73)
+position = Vector2(144, 251)
 
 [node name="Background" type="TileMapLayer" parent="."]
 modulate = Color(1, 1, 1, 0.109804)
@@ -174,7 +176,11 @@ 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")
+
+[node name="Entrance" parent="." instance=ExtResource("10_butik")]
+position = Vector2(39, 277)
+sceneChanger = "/scenes/main_scene"

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")]

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)