Shaperka (#225)

--------- Co-authored-by: shaperka <[email protected]>
porkbrain · Jul 20, 2024 · 63e2a21 · 63e2a21
1 parent d29ad81
commit 63e2a21
Show file tree

Hide file tree

Showing 45 changed files with 65 additions and 8 deletions.
diff --git a/main_game/assets/audio/shortmelody.oga → main_game/assets/audio/melody_cheerful.oga b/main_game/assets/audio/shortmelody.oga → main_game/assets/audio/melody_cheerful.oga
diff --git a/main_game/assets/audio/melody_melancholic_guitar.oga b/main_game/assets/audio/melody_melancholic_guitar.oga
diff --git a/main_game/assets/audio/melody_melancholic_piano.oga b/main_game/assets/audio/melody_melancholic_piano.oga
diff --git a/main_game/assets/audio/mysteriousFFX.oga b/main_game/assets/audio/mysteriousFFX.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/compound/barn.png b/main_game/assets/compound/barn.png
diff --git a/main_game/assets/compound/fridge.png b/main_game/assets/compound/fridge.png
diff --git a/main_game/assets/compound/table.png b/main_game/assets/compound/table.png
diff --git a/main_game/assets/compound/window.png b/main_game/assets/compound/window.png
diff --git a/main_game/assets/compound/window_light.png b/main_game/assets/compound/window_light.png
diff --git a/main_game/assets/downtown/background.png b/main_game/assets/downtown/background.png
diff --git a/main_game/assets/downtown/briza.png b/main_game/assets/downtown/briza.png
diff --git a/main_game/assets/downtown/electric_pole.png b/main_game/assets/downtown/electric_pole.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/environment/filter_pink.png b/main_game/assets/environment/filter_pink.png
diff --git a/main_game/assets/environment/filter_purple.png b/main_game/assets/environment/filter_purple.png
diff --git a/main_game/assets/environment/filter_yellow.png b/main_game/assets/environment/filter_yellow.png
diff --git a/main_game/assets/environment/komin.png b/main_game/assets/environment/komin.png
diff --git a/main_game/assets/environment/room_light.png b/main_game/assets/environment/room_light.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/environment/stall_wood2.png b/main_game/assets/environment/stall_wood2.png
diff --git a/main_game/assets/environment/window.png b/main_game/assets/environment/window.png
diff --git a/main_game/assets/fonts/clean by shaperka.ttf b/main_game/assets/fonts/clean by shaperka.ttf
diff --git a/main_game/assets/residential/indoors/basement.png b/main_game/assets/residential/indoors/basement.png
diff --git a/main_game/assets/residential/indoors/bath_horizontal.png b/main_game/assets/residential/indoors/bath_horizontal.png
diff --git a/main_game/assets/residential/indoors/bin_small.png b/main_game/assets/residential/indoors/bin_small.png
diff --git a/main_game/assets/residential/indoors/blue_bed.png b/main_game/assets/residential/indoors/blue_bed.png
diff --git a/main_game/assets/residential/indoors/blue_bed_noblanket.png b/main_game/assets/residential/indoors/blue_bed_noblanket.png
diff --git a/main_game/assets/residential/indoors/bonsai1.png b/main_game/assets/residential/indoors/bonsai1.png
diff --git a/main_game/assets/residential/indoors/brown_dark_door_atlas.png b/main_game/assets/residential/indoors/brown_dark_door_atlas.png
diff --git a/main_game/assets/residential/indoors/chair_blue_back.png b/main_game/assets/residential/indoors/chair_blue_back.png
diff --git a/main_game/assets/residential/indoors/clinic_cart.png b/main_game/assets/residential/indoors/clinic_cart.png
diff --git a/main_game/assets/residential/indoors/counter.png b/main_game/assets/residential/indoors/counter.png
diff --git a/main_game/assets/residential/indoors/counter_wide.png b/main_game/assets/residential/indoors/counter_wide.png
diff --git a/main_game/assets/residential/indoors/counter_wide_purple.png b/main_game/assets/residential/indoors/counter_wide_purple.png
diff --git a/main_game/assets/residential/indoors/meditation_chair.png b/main_game/assets/residential/indoors/meditation_chair.png
diff --git a/main_game/assets/residential/indoors/plant_biggest.png b/main_game/assets/residential/indoors/plant_biggest.png
diff --git a/main_game/assets/residential/indoors/player_apartment_backwall_furniture.png b/main_game/assets/residential/indoors/player_apartment_backwall_furniture.png
diff --git a/main_game/assets/residential/indoors/player_neighbours_bg.png b/main_game/assets/residential/indoors/player_neighbours_bg.png
diff --git a/main_game/assets/residential/indoors/sofa_blue.png b/main_game/assets/residential/indoors/sofa_blue.png
diff --git a/main_game/assets/residential/indoors/sofa_blue_back.png b/main_game/assets/residential/indoors/sofa_blue_back.png
diff --git a/main_game/assets/residential/indoors/table_big.png b/main_game/assets/residential/indoors/table_big.png
diff --git a/main_game/assets/scenes/barn.tscn b/main_game/assets/scenes/barn.tscn
@@ -1,14 +1,49 @@
-[gd_scene load_steps=3 format=3 uid="uid://dajava8pv8ysd"]
+[gd_scene load_steps=10 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"]
+[ext_resource type="Texture2D" uid="uid://b5fppd4473rfo" path="res://assets/compound/barn_interior.png" id="1_2glsl"]
+[ext_resource type="Texture2D" uid="uid://bw1m7ph67v8u7" path="res://assets/residential/indoors/wall_fish2.png" id="2_ukrpc"]
+[ext_resource type="Texture2D" uid="uid://dpgi57ipo0gox" path="res://assets/residential/indoors/clinic_clock.png" id="4_rrsnu"]
+[ext_resource type="Texture2D" uid="uid://cpu1o25c7res0" path="res://assets/compound/window.png" id="5_43hc4"]
+[ext_resource type="Texture2D" uid="uid://d07qq5e0nd3h1" path="res://assets/residential/indoors/toilet.png" id="6_cr7wq"]
+[ext_resource type="Texture2D" uid="uid://dc5s5udab8n2k" path="res://assets/compound/window_light.png" id="6_xbloy"]
+[ext_resource type="Texture2D" uid="uid://co8cvyghhuss1" path="res://assets/compound/table.png" id="8_h4ttt"]
+[ext_resource type="Texture2D" uid="uid://bcnwgs4asdo3o" path="res://assets/residential/indoors/sink.png" id="8_n6hoc"]
+[ext_resource type="Texture2D" uid="uid://dxt2jrtnaaqca" path="res://assets/compound/fridge.png" id="9_b5hlb"]
 
-[node name="Node2D" type="Node2D"]
+[node name="Barn" type="Node2D"]
 
-[node name="BarnInterior" type="Sprite2D" parent="."]
+[node name="BarnBg" type="Sprite2D" parent="."]
 position = Vector2(-23, 14)
 texture = ExtResource("1_2glsl")
 
 [node name="WallFish3" type="Sprite2D" parent="."]
-position = Vector2(74, -60)
+position = Vector2(71, -45)
 texture = ExtResource("2_ukrpc")
+
+[node name="ClinicClock" type="Sprite2D" parent="."]
+position = Vector2(103, -60)
+texture = ExtResource("4_rrsnu")
+
+[node name="Window" type="Sprite2D" parent="."]
+position = Vector2(-49, -40)
+texture = ExtResource("5_43hc4")
+
+[node name="WindowLight" type="Sprite2D" parent="."]
+position = Vector2(-49, -12)
+texture = ExtResource("6_xbloy")
+
+[node name="Toilet" type="Sprite2D" parent="."]
+position = Vector2(232, 48)
+texture = ExtResource("6_cr7wq")
+
+[node name="Sink" type="Sprite2D" parent="."]
+position = Vector2(190, -11)
+texture = ExtResource("8_n6hoc")
+
+[node name="Table" type="Sprite2D" parent="."]
+position = Vector2(-52, 39)
+texture = ExtResource("8_h4ttt")
+
+[node name="Fridge" type="Sprite2D" parent="."]
+position = Vector2(146, -22)
+texture = ExtResource("9_b5hlb")
diff --git a/main_game/assets/scenes/building1_player_floor.tscn b/main_game/assets/scenes/building1_player_floor.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=115 format=3 uid="uid://dyrtqlwb1xtvf"]
+[gd_scene load_steps=118 format=3 uid="uid://dyrtqlwb1xtvf"]
 
 [ext_resource type="Texture2D" uid="uid://darta8tusokhc" path="res://assets/residential/indoors/player_apartment_bg.png" id="1_70osf"]
 [ext_resource type="Texture2D" uid="uid://h5w2770frdhg" path="res://assets/residential/indoors/cloud_atlas.png" id="2_yacc0"]
@@ -48,6 +48,9 @@
 [ext_resource type="Texture2D" uid="uid://c24128k3soyhf" path="res://assets/items/pill_box.png" id="46_r200y"]
 [ext_resource type="Texture2D" uid="uid://dolvlk268uyvh" path="res://assets/environment/box_cardboard_sideways.png" id="47_jy22a"]
 [ext_resource type="Texture2D" uid="uid://bl6casbqthnd3" path="res://assets/environment/plate_cookies.png" id="48_jgxiy"]
+[ext_resource type="Texture2D" uid="uid://ctfvqwyu7rfpw" path="res://assets/environment/filter_yellow.png" id="49_e4apf"]
+[ext_resource type="Texture2D" uid="uid://bbvgexcjujtws" path="res://assets/environment/filter_purple.png" id="50_laek6"]
+[ext_resource type="Texture2D" uid="uid://drpvso2tmnxi2" path="res://assets/environment/filter_pink.png" id="51_8xqr1"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_nte4w"]
 atlas = ExtResource("2_yacc0")
@@ -941,3 +944,18 @@ texture = ExtResource("18_fe7mm")
 
 [node name="YSort" type="Node2D" parent="Package"]
 position = Vector2(1, 4)
+
+[node name="FilterYellow" type="Sprite2D" parent="."]
+visible = false
+position = Vector2(0, 2)
+texture = ExtResource("49_e4apf")
+
+[node name="FilterPurple" type="Sprite2D" parent="."]
+visible = false
+position = Vector2(-31, 2)
+texture = ExtResource("50_laek6")
+
+[node name="FilterPink" type="Sprite2D" parent="."]
+visible = false
+position = Vector2(-52, 66)
+texture = ExtResource("51_8xqr1")
diff --git a/main_game_lib/src/rscn/tree.rs b/main_game_lib/src/rscn/tree.rs
@@ -281,7 +281,11 @@ fn apply_section_key(
                 .iter()
                 .find(|res| res.id == id)
                 .expect("sub resource should exist");
-            assert_eq!(1, res.section_keys.len());
+            assert_eq!(
+                1,
+                res.section_keys.len(),
+                "SpriteFrames should have exactly one animation"
+            );
 
             let SectionKey::SingleAnim(anim) = &res.section_keys[0] else {
                 panic!(