Shaperka (#211)

--------- Co-authored-by: shaperka <[email protected]>
porkbrain · Jul 3, 2024 · 1869323 · 1869323
1 parent 386bb07
commit 1869323
Show file tree

Hide file tree

Showing 42 changed files with 812 additions and 891 deletions.
diff --git a/main_game/assets/characters/atlases/crow_atlas.png b/main_game/assets/characters/atlases/crow_atlas.png
diff --git a/main_game/assets/characters/atlases/seagull.png b/main_game/assets/characters/atlases/seagull.png
diff --git a/main_game/assets/characters/atlases/winnie1.png b/main_game/assets/characters/atlases/winnie1.png
diff --git a/main_game/assets/compound/barn.png b/main_game/assets/compound/barn.png
diff --git a/main_game/assets/compound/compound_bg.png b/main_game/assets/compound/compound_bg.png
diff --git a/main_game/assets/compound/greenhouse.png b/main_game/assets/compound/greenhouse.png
diff --git a/main_game/assets/compound/tower.png b/main_game/assets/compound/tower.png
diff --git a/main_game/assets/downtown/building_abandoned.png b/main_game/assets/downtown/building_abandoned.png
diff --git a/main_game/assets/downtown/building_duo.png b/main_game/assets/downtown/building_duo.png
diff --git a/main_game/assets/downtown/dlazdicky.png b/main_game/assets/downtown/dlazdicky.png
diff --git a/main_game/assets/downtown/electric_antenna.png b/main_game/assets/downtown/electric_antenna.png
diff --git a/main_game/assets/downtown/electric_antenna2.png b/main_game/assets/downtown/electric_antenna2.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/electric_pole_wire1.png b/main_game/assets/downtown/electric_pole_wire1.png
diff --git a/main_game/assets/downtown/electric_pole_wire2.png b/main_game/assets/downtown/electric_pole_wire2.png
diff --git a/main_game/assets/downtown/electric_pole_wire3.png b/main_game/assets/downtown/electric_pole_wire3.png
diff --git a/main_game/assets/downtown/electric_pole_wire4.png b/main_game/assets/downtown/electric_pole_wire4.png
diff --git a/main_game/assets/downtown/hanging_plants2.png b/main_game/assets/downtown/hanging_plants2.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/house_big_lime.png b/main_game/assets/downtown/house_big_lime.png
diff --git a/main_game/assets/downtown/house_big_sky.png b/main_game/assets/downtown/house_big_sky.png
diff --git a/main_game/assets/downtown/house_plantshoptrio.png b/main_game/assets/downtown/house_plantshoptrio.png
diff --git a/main_game/assets/downtown/potted_bush.png b/main_game/assets/downtown/potted_bush.png
diff --git a/main_game/assets/downtown/potted_bush2.png b/main_game/assets/downtown/potted_bush2.png
diff --git a/main_game/assets/environment/palm_tree.png b/main_game/assets/environment/palm_tree.png
diff --git a/main_game/assets/mall/mallisles.png b/main_game/assets/mall/mallisles.png
diff --git a/main_game/assets/maps/building1_basement1.ron b/main_game/assets/maps/building1_basement1.ron
@@ -778,7 +778,7 @@
   (x: -49, y: 12): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -49, y: 13): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -49, y: 14): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
-  (x: -49, y: 15): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
+  (x: -49, y: 15): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -49, y: 16): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -49, y: 17): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -49, y: 18): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
@@ -811,7 +811,7 @@
   (x: -48, y: 12): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -48, y: 13): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -48, y: 14): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
-  (x: -48, y: 15): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
+  (x: -48, y: 15): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -48, y: 16): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -48, y: 17): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -48, y: 18): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
@@ -844,7 +844,7 @@
   (x: -47, y: 12): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -47, y: 13): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -47, y: 14): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
-  (x: -47, y: 15): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
+  (x: -47, y: 15): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -47, y: 16): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -47, y: 17): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -47, y: 18): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
@@ -877,7 +877,7 @@
   (x: -46, y: 12): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -46, y: 13): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -46, y: 14): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
-  (x: -46, y: 15): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
+  (x: -46, y: 15): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -46, y: 16): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -46, y: 17): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -46, y: 18): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
@@ -910,7 +910,7 @@
   (x: -45, y: 12): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -45, y: 13): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -45, y: 14): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
-  (x: -45, y: 15): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
+  (x: -45, y: 15): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -45, y: 16): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -45, y: 17): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -45, y: 18): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
@@ -959,7 +959,7 @@
   (x: -44, y: 12): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -44, y: 13): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -44, y: 14): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
-  (x: -44, y: 15): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
+  (x: -44, y: 15): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -44, y: 16): [Wall, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -44, y: 17): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],
   (x: -44, y: 18): [Empty, Empty, Local(UpperApartmentWallHiddenZone)],

diff --git a/main_game/assets/maps/building1_player_floor.ron b/main_game/assets/maps/building1_player_floor.ron