Shaperka (#219)

* mostly compound upgrade * electric boogaloo and a seagull:) * sounds&phone update * soundff etc --------- Co-authored-by: shaperka <[email protected]>
porkbrain · Jul 9, 2024 · 6ff3576 · 6ff3576
1 parent 1e6ac4a
commit 6ff3576
Show file tree

Hide file tree

Showing 59 changed files with 245 additions and 1,672 deletions.
diff --git a/main_game/assets/audio/doorFFX.oga b/main_game/assets/audio/doorFFX.oga
diff --git a/main_game/assets/audio/dramaticFFX.oga b/main_game/assets/audio/dramaticFFX.oga
diff --git a/main_game/assets/audio/elevator2FFX.oga b/main_game/assets/audio/elevator2FFX.oga
diff --git a/main_game/assets/audio/elevatorFFX.oga b/main_game/assets/audio/elevatorFFX.oga
diff --git a/main_game/assets/audio/failFFX.oga b/main_game/assets/audio/failFFX.oga
diff --git a/main_game/assets/audio/ghostFFX.oga b/main_game/assets/audio/ghostFFX.oga
diff --git a/main_game/assets/audio/oceanFFX.oga b/main_game/assets/audio/oceanFFX.oga
diff --git a/main_game/assets/audio/sad_echo.oga b/main_game/assets/audio/sad_echo.oga
diff --git a/main_game/assets/audio/shortmelody.oga b/main_game/assets/audio/shortmelody.oga
diff --git a/main_game/assets/audio/tvFFX.oga b/main_game/assets/audio/tvFFX.oga
diff --git a/main_game/assets/audio/walk_crunchyFFX.oga b/main_game/assets/audio/walk_crunchyFFX.oga
diff --git a/main_game/assets/audio/walk_snowFFX.oga b/main_game/assets/audio/walk_snowFFX.oga
diff --git a/main_game/assets/audio/xylophoneFFX.oga b/main_game/assets/audio/xylophoneFFX.oga
diff --git a/main_game/assets/compound/barn_interior.png b/main_game/assets/compound/barn_interior.png
diff --git a/main_game/assets/compound/barn_interior2.png b/main_game/assets/compound/barn_interior2.png
diff --git a/main_game/assets/compound/clothing_line.png b/main_game/assets/compound/clothing_line.png
diff --git a/main_game/assets/compound/greenhouse_white.png b/main_game/assets/compound/greenhouse_white.png
diff --git a/main_game/assets/downtown/hanging_plants3.png b/main_game/assets/downtown/hanging_plants3.png
diff --git a/main_game/assets/downtown/hanging_plants4.png b/main_game/assets/downtown/hanging_plants4.png
diff --git a/main_game/assets/downtown/house_big.png b/main_game/assets/downtown/house_big.png
diff --git a/main_game/assets/downtown/plain_trio.png b/main_game/assets/downtown/plain_trio.png
diff --git a/main_game/assets/downtown/tree.png b/main_game/assets/downtown/tree.png
diff --git a/main_game/assets/environment/flipflops.png b/main_game/assets/environment/flipflops.png
diff --git a/main_game/assets/environment/sand_castle_atlas.png b/main_game/assets/environment/sand_castle_atlas.png
diff --git a/main_game/assets/fonts/tiny_pixel.ttf b/main_game/assets/fonts/tiny_pixel.ttf
diff --git a/main_game/assets/maps/mall.ron b/main_game/assets/maps/mall.ron
diff --git a/main_game/assets/misc/emoji_atlas.png b/main_game/assets/misc/emoji_atlas.png
diff --git a/main_game/assets/residential/indoors/calendar2.png b/main_game/assets/residential/indoors/calendar2.png
diff --git a/main_game/assets/residential/indoors/plant_pink.png b/main_game/assets/residential/indoors/plant_pink.png
diff --git a/main_game/assets/residential/indoors/plant_yellow.png b/main_game/assets/residential/indoors/plant_yellow.png
diff --git a/main_game/assets/residential/indoors/shelf.png b/main_game/assets/residential/indoors/shelf.png
diff --git a/main_game/assets/residential/indoors/shelf_wide.png b/main_game/assets/residential/indoors/shelf_wide.png
diff --git a/main_game/assets/residential/indoors/wall_fish.png b/main_game/assets/residential/indoors/wall_fish.png
diff --git a/main_game/assets/residential/indoors/wall_fish2.png b/main_game/assets/residential/indoors/wall_fish2.png
diff --git a/main_game/assets/scenes/barn.tscn b/main_game/assets/scenes/barn.tscn
@@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=3 uid="uid://dajava8pv8ysd"]
+
+[ext_resource type="Texture2D" uid="uid://bo4wq2i0bkr8c" path="res://assets/compound/barn_interior.png" id="1_2glsl"]
+[ext_resource type="Texture2D" uid="uid://dhbfxi5fhc2uf" path="res://assets/residential/indoors/wall_fish2.png" id="2_ukrpc"]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="BarnInterior" type="Sprite2D" parent="."]
+position = Vector2(-23, 14)
+texture = ExtResource("1_2glsl")
+
+[node name="WallFish3" type="Sprite2D" parent="."]
+position = Vector2(74, -60)
+texture = ExtResource("2_ukrpc")
diff --git a/main_game/assets/scenes/compound.tscn b/main_game/assets/scenes/compound.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=3 uid="uid://cfuxf3w4hro7y"]
+[gd_scene load_steps=31 format=3 uid="uid://cfuxf3w4hro7y"]
 
 [ext_resource type="Texture2D" uid="uid://58ji12gkirbl" path="res://assets/compound/compound_bg.png" id="1_ubi6a"]
 [ext_resource type="Texture2D" uid="uid://cfg13e2oo8f38" path="res://assets/downtown/fence_stone.png" id="2_0w2gu"]
@@ -28,6 +28,8 @@
 [ext_resource type="Texture2D" uid="uid://befj4fdhgdkwi" path="res://assets/environment/mushroom3.png" id="26_kl1iv"]
 [ext_resource type="Texture2D" uid="uid://oroa0xkc4ok0" path="res://assets/downtown/hanging_plants2.png" id="27_sx323"]
 [ext_resource type="Texture2D" uid="uid://bxw8mq2ynsea7" path="res://assets/compound/greenhouse.png" id="28_aojpr"]
+[ext_resource type="Texture2D" uid="uid://c2qvs82sxkb4t" path="res://assets/compound/greenhouse_white.png" id="29_2ov1p"]
+[ext_resource type="Texture2D" uid="uid://boqfud81ek7xo" path="res://assets/compound/clothing_line.png" id="30_nuyol"]
 
 [node name="Compound" type="Node2D"]
 
@@ -312,7 +314,7 @@ texture = ExtResource("3_slirt")
 position = Vector2(5, 73)
 
 [node name="Jehlicnan" type="Sprite2D" parent="AroundBarn"]
-position = Vector2(79, 223)
+position = Vector2(79, 225)
 texture = ExtResource("4_codlm")
 
 [node name="YSort" type="Node2D" parent="AroundBarn/Jehlicnan"]
@@ -478,3 +480,14 @@ texture = ExtResource("28_aojpr")
 
 [node name="YSort" type="Node2D" parent="Greenhouse"]
 position = Vector2(0, 89)
+
+[node name="GreenhouseWhite" type="Sprite2D" parent="."]
+position = Vector2(-965, 102)
+texture = ExtResource("29_2ov1p")
+
+[node name="YSort" type="Node2D" parent="GreenhouseWhite"]
+position = Vector2(0, 89)
+
+[node name="ClothingLine" type="Sprite2D" parent="."]
+position = Vector2(-25, 273)
+texture = ExtResource("30_nuyol")
diff --git a/main_game/assets/scenes/compound_tower.tscn b/main_game/assets/scenes/compound_tower.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=3 uid="uid://bi775uudi3uy8"]
+[gd_scene load_steps=14 format=3 uid="uid://bi775uudi3uy8"]
 
 [ext_resource type="Texture2D" uid="uid://cy7cwfigylkyd" path="res://assets/compound/tower_inside.png" id="1_pwn7c"]
 [ext_resource type="Texture2D" uid="uid://c81eqm7duppl4" path="res://assets/residential/indoors/wall_mirror.png" id="2_av753"]
@@ -8,6 +8,8 @@
 [ext_resource type="Texture2D" uid="uid://c6g7tke0jjcmg" path="res://assets/residential/indoors/side_table3.png" id="6_seuah"]
 [ext_resource type="Texture2D" uid="uid://h03jwe4lr73k" path="res://assets/residential/indoors/tissues.png" id="7_66ihp"]
 [ext_resource type="Texture2D" uid="uid://c4phqysbg8s3" path="res://assets/residential/indoors/oven.png" id="9_i02jj"]
+[ext_resource type="Texture2D" uid="uid://b0opuxwhdm2ht" path="res://assets/residential/indoors/wall_fish.png" id="9_splu5"]
+[ext_resource type="Texture2D" uid="uid://ce2di0d1v7c3w" path="res://assets/residential/indoors/calendar2.png" id="10_m3ass"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_q04iu"]
 atlas = ExtResource("9_i02jj")
@@ -39,7 +41,7 @@ position = Vector2(-29, 16)
 texture = ExtResource("1_pwn7c")
 
 [node name="WallMirror" type="Sprite2D" parent="TowerBg"]
-position = Vector2(22, -76)
+position = Vector2(21, -78)
 texture = ExtResource("2_av753")
 
 [node name="FrontWallRight" type="Sprite2D" parent="."]
@@ -78,6 +80,8 @@ position = Vector2(-11, 13)
 [node name="Stove" type="AnimatedSprite2D" parent="."]
 position = Vector2(-90, -11)
 sprite_frames = SubResource("SpriteFrames_jc6xg")
+frame = 1
+frame_progress = 0.610486
 
 [node name="YSort" type="Node2D" parent="Stove"]
 position = Vector2(13, 29)
@@ -94,3 +98,11 @@ metadata/zone = "ExitZone"
 metadata/action = "ExitScene"
 metadata/label = "Exit"
 metadata/category = "Default"
+
+[node name="WallFish" type="Sprite2D" parent="."]
+position = Vector2(-67, -38)
+texture = ExtResource("9_splu5")
+
+[node name="Calendar2" type="Sprite2D" parent="."]
+position = Vector2(67, -37)
+texture = ExtResource("10_m3ass")