Merged branch with laptop repo.

UQdeco2800 · Nov 4, 2021 · 5037409 · 5037409
2 parents 268042f + 164f314
commit 5037409
Show file tree

Hide file tree

Showing 83 changed files with 1,348 additions and 702 deletions.
diff --git a/assets/wiki/s3_t4_borders/BaseExample.svg → assets/wiki/s4_t3_borders/BaseExample.svg b/assets/wiki/s3_t4_borders/BaseExample.svg → assets/wiki/s4_t3_borders/BaseExample.svg
diff --git a/..._borders/playerRectangularBorderShape.PNG → ..._borders/playerRectangularBorderShape.PNG b/..._borders/playerRectangularBorderShape.PNG → ..._borders/playerRectangularBorderShape.PNG
diff --git a/assets/wiki/s4_t3_borders/testing/base.png b/assets/wiki/s4_t3_borders/testing/base.png
diff --git a/assets/wiki/s4_t3_borders/testing/c1.png b/assets/wiki/s4_t3_borders/testing/c1.png
diff --git a/assets/wiki/s4_t3_borders/testing/c2.png b/assets/wiki/s4_t3_borders/testing/c2.png
diff --git a/assets/wiki/s4_t3_borders/testing/c3.png b/assets/wiki/s4_t3_borders/testing/c3.png
diff --git a/assets/wiki/s4_t3_borders/testing/c4.png b/assets/wiki/s4_t3_borders/testing/c4.png
diff --git a/assets/wiki/s4_t3_borders/testing/h1.png b/assets/wiki/s4_t3_borders/testing/h1.png
diff --git a/assets/wiki/s4_t3_borders/testing/h2.png b/assets/wiki/s4_t3_borders/testing/h2.png
diff --git a/assets/wiki/s4_t3_borders/testing/h3.png b/assets/wiki/s4_t3_borders/testing/h3.png
diff --git a/source/core/assets/configs/leaderboard.txt b/source/core/assets/configs/leaderboard.txt
@@ -1 +0,0 @@
-2500,

diff --git a/source/core/assets/images/objects/backyard/groundhog.png b/source/core/assets/images/objects/backyard/groundhog.png
diff --git a/source/core/assets/images/objects/backyard/shovel.png b/source/core/assets/images/objects/backyard/shovel.png
diff --git a/source/core/assets/images/objects/backyard/stump.png b/source/core/assets/images/objects/backyard/stump.png
diff --git a/source/core/assets/images/objects/chores/dead_plant.png b/source/core/assets/images/objects/chores/dead_plant.png
diff --git a/source/core/assets/images/objects/chores/dropped_book_blue.atlas b/source/core/assets/images/objects/chores/dropped_book_blue.atlas
@@ -1,12 +1,19 @@
 dropped_book_blue.png
-size: 100, 72
+size: 512, 512
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 dropped_book
   rotate: false
   xy: 0, 0
-  size: 100, 72
-  orig: 100, 72
+  size: 256, 256
+  orig: 256, 256
   offset: 0, 0
   index: -1
+dropped_book_highlight
+  rotate: false
+  xy: 256, 0
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/objects/chores/dropped_book_blue.png b/source/core/assets/images/objects/chores/dropped_book_blue.png
diff --git a/source/core/assets/images/objects/chores/dropped_book_red.atlas b/source/core/assets/images/objects/chores/dropped_book_red.atlas
@@ -1,12 +1,19 @@
 dropped_book_red.png
-size: 100, 72
+size: 512, 512
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 dropped_book
   rotate: false
   xy: 0, 0
-  size: 100, 72
-  orig: 100, 72
+  size: 256, 256
+  orig: 256, 256
   offset: 0, 0
   index: -1
+dropped_book_highlight
+  rotate: false
+  xy: 256, 0
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/objects/chores/dropped_book_red.png b/source/core/assets/images/objects/chores/dropped_book_red.png
diff --git a/source/core/assets/images/objects/chores/dropped_books.atlas b/source/core/assets/images/objects/chores/dropped_books.atlas
@@ -1,12 +1,19 @@
 dropped_books.png
-size: 168, 92
+size: 512, 512
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 dropped_book
   rotate: false
   xy: 0, 0
-  size: 168, 92
-  orig: 168, 92
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+dropped_book_highlight
+  rotate: false
+  xy: 256, 0
+  size: 256, 256
+  orig: 256, 256
   offset: 0, 0
   index: -1
diff --git a/source/core/assets/images/objects/chores/dropped_books.png b/source/core/assets/images/objects/chores/dropped_books.png
diff --git a/source/core/assets/images/objects/chores/empty_can.atlas b/source/core/assets/images/objects/chores/empty_can.atlas
@@ -1,12 +1,19 @@
 empty_can.png
-size: 88, 60
+size: 512, 512
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 trash
   rotate: false
   xy: 0, 0
-  size: 88, 60
-  orig: 88, 60
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+trash_highlight
+  rotate: false
+  xy: 256, 0
+  size: 256, 256
+  orig: 256, 256
   offset: 0, 0
   index: -1
diff --git a/source/core/assets/images/objects/chores/empty_can.png b/source/core/assets/images/objects/chores/empty_can.png
diff --git a/source/core/assets/images/objects/chores/paper_ball.atlas b/source/core/assets/images/objects/chores/paper_ball.atlas
@@ -1,12 +1,19 @@
 paper_ball.png
-size: 48, 42
+size: 512, 512
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 trash
   rotate: false
   xy: 0, 0
-  size: 48, 42
-  orig: 48, 42
+  size: 256, 256
+  orig: 256, 256
   offset: 0, 0
   index: -1
+trash_highlight
+  rotate: false
+  xy: 256, 0
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/objects/chores/paper_ball.png b/source/core/assets/images/objects/chores/paper_ball.png
diff --git a/source/core/assets/images/objects/chores/pot_plant.png b/source/core/assets/images/objects/chores/pot_plant.png
diff --git a/source/core/assets/images/objects/dish_washer/dishwashing_animation.atlas b/source/core/assets/images/objects/dish_washer/dishwashing_animation.atlas
@@ -1,30 +1,30 @@
 dishwashing_animation.png
-size: 700, 156
+size: 700, 312
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-dishwasher_notworking
+dishwasher_notworking0
   rotate: false
   xy: 0, 0
   size: 140, 156
   orig: 140, 156
   offset: 0, 0
   index: -1
-dishwasher_notworking2
+dishwasher_notworking1
   rotate: false
   xy: 140, 0
   size: 140, 156
   orig: 140, 156
   offset: 0, 0
   index: -1
-dishwasher_notworking3
+dishwasher_notworking2
   rotate: false
   xy: 280, 0
   size: 140, 156
   orig: 140, 156
   offset: 0, 0
   index: -1
-dishwasher_notworking4
+dishwasher_notworking3
   rotate: false
   xy: 420, 0
   size: 140, 156
@@ -38,3 +38,31 @@ dishwasher_working
   orig: 140, 156
   offset: 0, 0
   index: -1
+dishwasher_notworking0_highlight
+  rotate: false
+  xy: 0, 156
+  size: 140, 156
+  orig: 140, 156
+  offset: 0, 0
+  index: -1
+dishwasher_notworking1_highlight
+  rotate: false
+  xy: 140, 156
+  size: 140, 156
+  orig: 140, 156
+  offset: 0, 0
+  index: -1
+dishwasher_notworking2_highlight
+  rotate: false
+  xy: 280, 156
+  size: 140, 156
+  orig: 140, 156
+  offset: 0, 0
+  index: -1
+dishwasher_notworking3_highlight
+  rotate: false
+  xy: 420, 156
+  size: 140, 156
+  orig: 140, 156
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/objects/dish_washer/dishwashing_animation.png b/source/core/assets/images/objects/dish_washer/dishwashing_animation.png
diff --git a/source/core/assets/images/objects/foreign_bed/fbed.png b/source/core/assets/images/objects/foreign_bed/fbed.png
diff --git a/source/core/assets/images/objects/foreign_bed/foreign_bed.atlas b/source/core/assets/images/objects/foreign_bed/foreign_bed.atlas
@@ -0,0 +1,12 @@
+foreign_bed.png
+size: 312, 243
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+fbed
+  rotate: false
+  xy: 0, 0
+  size: 312, 243
+  orig: 312, 243
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/objects/foreign_bed/foreign_bed.png b/source/core/assets/images/objects/foreign_bed/foreign_bed.png
diff --git a/source/core/assets/images/objects/furniture/Nintendo_southeast.png b/source/core/assets/images/objects/furniture/Nintendo_southeast.png
diff --git a/source/core/assets/images/objects/furniture/Nintendo_southwest.png b/source/core/assets/images/objects/furniture/Nintendo_southwest.png
diff --git a/source/core/assets/images/objects/furniture/bath_bin.png b/source/core/assets/images/objects/furniture/bath_bin.png
diff --git a/source/core/assets/images/objects/furniture/clothes-drying-rack.png b/source/core/assets/images/objects/furniture/clothes-drying-rack.png
diff --git a/source/core/assets/images/objects/furniture/pot_plant.png b/source/core/assets/images/objects/furniture/pot_plant.png
diff --git a/source/core/assets/images/objects/furniture/sofaside-lamp.png b/source/core/assets/images/objects/furniture/sofaside-lamp.png
diff --git a/source/core/assets/images/objects/plant/plant_animation.atlas b/source/core/assets/images/objects/plant/plant_animation.atlas
@@ -1,26 +1,26 @@
 plant_animation.png
-size: 768, 256
+size: 576, 192
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 plant
   rotate: false
   xy: 0, 0
-  size: 256, 256
-  orig: 256, 256
+  size: 192, 192
+  orig: 192, 192
   offset: 0, 0
   index: -1
 plant_highlight
   rotate: false
-  xy: 256, 0
-  size: 256, 256
-  orig: 256, 256
+  xy: 192, 0
+  size: 192, 192
+  orig: 192, 192
   offset: 0, 0
   index: -1
 plant_off
   rotate: false
-  xy: 512, 0
-  size: 256, 256
-  orig: 256, 256
+  xy: 384, 0
+  size: 192, 192
+  orig: 192, 192
   offset: 0, 0
   index: -1
diff --git a/source/core/assets/images/objects/plant/plant_animation.png b/source/core/assets/images/objects/plant/plant_animation.png
diff --git a/source/core/assets/images/objects/puddle/puddle.atlas b/source/core/assets/images/objects/puddle/puddle.atlas
@@ -1,19 +1,12 @@
-puddle2.png
-size: 848, 232
+puddle.png
+size: 190, 104
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 puddle
   rotate: false
   xy: 0, 0
-  size: 424, 232
-  orig: 424, 232
-  offset: 0, 0
-  index: -1
-puddle_highlight
-  rotate: false
-  xy: 424, 0
-  size: 424, 232
-  orig: 424, 232
+  size: 190, 104
+  orig: 190, 104
   offset: 0, 0
   index: -1
diff --git a/source/core/assets/images/objects/puddle/puddle.png b/source/core/assets/images/objects/puddle/puddle.png
diff --git a/source/core/assets/images/objects/puddle/puddle1.png b/source/core/assets/images/objects/puddle/puddle1.png
diff --git a/source/core/assets/maps/_floor_plans/floor_plan_43x43_0.json b/source/core/assets/maps/_floor_plans/floor_plan_43x43_0.json
@@ -9,8 +9,15 @@
     .: [object_wall_1, 0]              // Exterior wall
     -: [interactive_door_wood_0_h, 0]  // Horizontal door. In isometric view, this is northwest to southeast
     |: [interactive_door_wood_0_v, 0]  // Vertical door. In isometric view, this is northeast to southwest
+    m: [misc_mum_spawn_0, 0]           // Where the mum spawns for the timer ending cinematic
+    n: [misc_mum_target_0, 0]
+    !: [object_flowers_0, 0]
+    @: [object_small_tree_0, 0]
+    #: [interactive_groundhog_0, 0]
+    $: [object_green_tree_0, 0]
+    %: [object_stump_0, 0]
 //  *: [nothing, 0]                    // Nothing. Used for opening up rooms where no walls are desired
-  }
+  },
   roomMap: {
     //    Type     Dimensions   Offset
     A: [bathroom,     9, 8,     13, 19]
@@ -26,50 +33,52 @@
     K: [front_foyer,  5, 5,     33, 25]
     L: [garage,       10, 10,   38, 30]
     M: [hallway,      4, 9,     28, 12]
+    O: [garden,       5, 2,     42, 7]
+    P: [garden,       5, 2,     42, 13]
   }
   floorGrid: [
     [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, A, A, A, A, A, A, A, A, A, ., _, _, _, -, |, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, A, A, A, A, A, A, A, A, A, ., _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, A, A, A, A, A, A, A, A, A, ., _, _, _, _, _, _, _, _, _, _, _, _, _, _],
+    [_, #, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, $, _, _, _, _, _],
+    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, $, _, _, _, _, _, _, _, _, _, _],
+    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, $, _, $, _, _, _, _, _],
+    [_, _, _, $, _, _, _, _, $, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, %, $, _, _, _, _],
+    [_, $, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, $, _, _, _, _, _, _, _, _],
     [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, A, A, A, A, A, A, A, A, A, ., _, _, _, _, _, _, _, _, _, _, _, _, _, _],
+    [_, _, _, _, _, _, _, _, _, _, _, $, _, _, _, _, _, _, _, A, A, A, A, A, A, A, A, A, ., _, _, _, _, $, _, _, _, _, _, _, $, _, _],
+    [_, _, _, _, $, _, _, _, _, _, _, _, _, _, _, _, _, _, _, A, A, A, A, A, A, A, A, A, ., _, _, _, _, _, _, _, _, _, _, _, _, _, _],
     [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, A, A, A, A, A, A, A, A, A, ., _, _, _, _, _, _, _, _, _, _, _, _, _, _],
+    [_, _, $, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, A, A, A, A, A, A, A, A, A, ., _, _, _, _, _, _, _, _, _, _, _, _, _, _],
     [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, ., _, _, A, A, A, A, A, A, A, A, A, D, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
-    [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, ., _, _, A, A, A, A, A, A, A, A, A, -, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
+    [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, ., _, _, A, A, A, A, A, A, A, A, A, |, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
     [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, ., _, _, A, A, A, A, A, A, A, A, A, D, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
     [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, C, C, C, C, C, C, C, C, C, C, C, C, D, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
     [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, C, C, C, C, C, C, C, C, C, C, C, C, D, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
     [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, C, C, C, C, C, C, C, C, C, C, C, C, D, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
     [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, C, C, C, C, C, C, C, C, C, C, C, C, D, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
     [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, C, C, C, C, C, C, C, C, C, C, C, C, D, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
-    [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, C, C, C, C, C, C, C, C, C, C, C, C, -, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
+    [_, _, _, _, _, _, _, B, B, B, B, B, B, B, B, B, C, C, C, C, C, C, C, C, C, C, C, C, |, D, D, D, D, D, D, D, D, ., _, _, _, _, _],
     [_, _, _, E, E, E, E, E, E, E, E, E, M, M, -, M, G, *, *, *, *, *, *, *, *, *, *, *, F, F, F, F, F, F, F, F, ., ., _, _, _, _, _],
     [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, G, G, G, G, G, G, G, G, G, G, G, G, F, F, F, F, F, F, F, F, ., _, _, _, _, _, _],
-    [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, G, G, G, G, G, G, G, G, G, G, G, G, *, F, F, F, F, F, F, F, ., _, _, _, _, _, _],
+    [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, G, G, G, G, G, G, G, G, G, G, G, G, *, F, F, F, F, F, F, F, ., $, _, _, _, _, _],
     [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, *, G, G, G, G, G, G, G, G, G, G, G, *, F, F, F, F, F, F, F, ., _, _, _, _, _, _],
     [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, *, G, G, G, G, G, G, G, G, G, G, G, *, F, F, F, F, F, F, F, H, H, H, H, H, ., _],
     [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, *, G, G, G, G, G, G, G, G, G, G, G, *, F, F, F, F, F, F, F, H, H, H, H, H, ., _],
     [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, *, G, G, G, G, G, G, G, G, G, G, G, *, F, F, F, F, F, F, F, H, H, H, H, H, ., _],
     [_, _, _, E, E, E, E, E, E, E, E, E, |, M, M, M, G, G, G, G, G, G, G, G, G, G, G, G, *, F, F, F, F, F, F, F, |, H, H, H, H, ., _],
-    [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, G, G, G, G, G, G, G, G, G, G, G, G, *, F, F, F, F, F, F, F, H, H, H, H, H, ., _],
+    [_, _, _, E, E, E, E, E, E, E, E, E, M, M, M, M, G, G, G, G, G, G, G, G, G, G, G, n, *, F, F, F, F, F, F, F, H, H, H, H, H, ., _],
     [_, _, _, ., ., ., ., I, I, I, I, I, I, I, -, I, J, -, J, J, J, J, J, J, J, K, K, *, K, K, L, L, L, L, L, L, L, L, L, L, ., ., _],
     [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, K, K, K, K, K, L, L, L, L, L, L, L, L, L, L, ., _, _],
     [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, K, K, K, K, K, L, L, L, L, L, L, L, L, L, L, ., _, _],
     [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, K, K, K, K, K, L, L, L, L, L, L, L, L, L, L, ., _, _],
     [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, K, K, K, K, K, |, L, L, L, L, L, L, L, L, L, ., _, _],
-    [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, ., ., -, ., ., L, L, L, L, L, L, L, L, L, L, ., _, _],
-    [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, ., _, _, _, _, L, L, L, L, L, L, L, L, L, L, ., _, _],
-    [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, ., _, _, _, _, L, L, L, L, L, L, L, L, L, L, ., _, _],
-    [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, ., ., ., ., ., ., ., ., ., ., _, _, _, _, L, L, L, L, L, L, L, L, L, L, ., _, _],
-    [_, _, _, _, _, _, _, ., ., ., ., ., ., ., ., ., ., _, _, _, _, _, _, _, _, _, _, _, _, _, L, L, L, L, L, L, L, L, L, L, ., _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, ., ., ., ., ., ., ., ., ., ., ., _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
-    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _]
+    [_, _, %, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, ., ., -, ., ., L, L, L, L, L, L, L, L, L, L, ., _, _],
+    [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, ., @, _, _, @, L, L, L, L, L, L, L, L, L, L, ., _, _],
+    [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, J, J, J, J, J, J, J, J, J, ., !, _, _, !, L, L, L, L, L, L, L, L, L, L, ., _, _],
+    [_, _, _, _, _, _, _, I, I, I, I, I, I, I, I, I, ., ., ., ., ., ., ., ., ., ., !, _, _, _, L, L, L, L, L, L, L, L, L, L, ., _, _],
+    [_, _, _, _, _, _, _, ., ., ., ., ., ., ., ., ., ., !, !, !, !, !, !, !, !, !, !, _, _, !, L, L, L, L, L, L, L, L, L, L, ., _, _],
+    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, !, ., ., ., ., ., ., ., ., ., ., ., _, _],
+    [_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, !, !, !, !, !, !, !, !, !, !, !, !, _, _],
+    [_, _, _, _, _, _, _, O, O, O, O, O, _, P, P, P, P, P, _, _, _, _, _, _, _, _, _, m, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _],
+    [_, _, _, _, _, _, _, O, O, O, O, O, _, P, P, P, P, P, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _]
   ]
 }