level 8

stevepryde · Jul 29, 2024 · 92f8e1c · 92f8e1c
1 parent 2749b49
commit 92f8e1c
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 28 deletions.
diff --git a/assets/level7.tmx b/assets/level7.tmx
@@ -50,33 +50,33 @@
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,5,5,5,5,5,0,0,0,5,0,5,0,5,5,5,5,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,5,0,0,0,0,0,5,0,0,0,5,0,0,0,0,5,0,0,0,0,0,0,0,
-0,0,0,0,0,5,5,5,5,0,3,3,3,0,5,5,5,5,5,0,3,3,0,5,5,5,0,0,0,0,0,
-0,0,0,0,0,5,0,0,5,0,3,0,0,0,0,0,12,0,0,0,0,3,0,5,0,5,0,0,0,0,0,
-0,0,0,5,5,5,5,0,5,0,3,0,3,3,3,3,3,3,3,3,0,3,0,0,0,5,0,0,0,0,0,
-0,0,0,5,0,0,0,0,5,0,0,0,3,0,0,0,0,0,0,0,0,3,5,5,5,5,5,5,0,0,0,
-0,0,0,5,0,3,3,3,3,3,3,0,3,0,7,7,7,0,7,0,0,3,0,0,0,0,0,5,0,0,0,
-0,0,5,5,0,3,0,0,0,0,0,0,3,0,7,0,7,0,7,7,0,3,0,3,3,3,0,5,0,0,0,
-0,0,5,0,0,0,0,3,0,0,7,0,0,0,7,0,7,0,0,0,0,0,0,0,0,3,0,5,0,0,0,
-0,0,5,5,5,5,0,3,0,7,7,0,7,0,7,0,7,7,7,0,3,3,3,3,0,3,0,5,5,0,0,
-0,0,5,0,0,5,0,3,0,0,0,0,7,0,7,0,0,0,0,0,0,0,0,3,0,0,0,0,5,0,0,
-0,0,5,5,0,5,12,3,0,7,7,7,7,0,7,6,7,7,7,7,7,7,0,3,0,5,5,0,5,0,0,
-0,0,5,0,0,5,0,3,0,7,0,0,0,0,6,1,6,0,0,0,0,7,0,3,0,5,0,0,5,0,0,
-0,0,5,0,5,5,0,3,0,7,7,7,7,7,7,6,7,0,7,7,7,7,0,3,12,5,0,5,5,0,0,
-0,0,5,0,0,0,0,3,0,0,0,0,0,0,0,0,7,0,7,0,0,0,0,3,0,5,0,0,5,0,0,
-0,0,5,5,0,3,0,3,3,3,3,0,7,7,7,0,7,0,7,0,7,7,0,3,0,5,5,5,5,0,0,
-0,0,0,5,0,3,0,0,0,0,0,0,0,0,7,0,7,0,0,0,7,0,0,3,0,0,0,0,5,0,0,
-0,0,0,5,0,3,3,3,0,3,0,7,7,0,7,0,7,0,3,0,0,0,0,0,0,3,0,5,5,0,0,
-0,0,0,5,0,0,0,0,0,3,0,0,7,0,7,7,7,0,3,0,3,3,3,3,3,3,0,5,0,0,0,
-0,0,0,5,5,5,5,5,5,3,0,0,0,0,0,0,0,0,3,0,0,0,5,0,0,0,0,5,0,0,0,
-0,0,0,0,0,5,0,0,0,3,0,3,3,3,3,3,3,3,3,0,3,0,5,0,5,5,5,5,0,0,0,
-0,0,0,0,0,5,0,5,0,3,0,0,0,0,12,0,0,0,0,0,3,0,5,0,0,5,0,0,0,0,0,
-0,0,0,0,0,5,5,5,0,3,3,0,5,5,5,5,5,0,3,3,3,0,5,5,5,5,0,0,0,0,0,
-0,0,0,0,0,0,0,5,0,0,0,0,5,0,0,0,5,0,0,0,0,0,5,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,5,5,5,5,0,5,0,5,0,0,0,5,5,5,5,5,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,5,0,5,0,4,4,4,4,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,4,0,0,0,0,0,5,0,0,0,5,0,0,0,0,4,0,0,0,0,0,0,0,
+0,0,0,0,0,4,4,4,4,0,3,3,3,0,5,5,5,5,5,0,3,3,0,4,4,4,0,0,0,0,0,
+0,0,0,0,0,4,0,0,5,0,3,0,0,0,0,0,12,0,0,0,0,3,0,5,0,4,0,0,0,0,0,
+0,0,0,4,4,4,5,0,5,0,3,0,3,3,3,3,3,3,3,3,0,3,0,0,0,4,0,0,0,0,0,
+0,0,0,4,0,0,0,0,5,0,0,0,3,0,0,0,0,0,0,0,0,3,5,5,5,4,4,4,0,0,0,
+0,0,0,4,0,3,3,3,3,3,3,0,3,0,7,7,7,0,7,0,0,3,0,0,0,0,0,4,0,0,0,
+0,0,4,4,0,3,0,0,0,0,0,0,3,0,7,0,7,0,7,7,0,3,0,3,3,3,0,4,0,0,0,
+0,0,4,0,0,0,0,3,0,0,7,0,0,0,7,0,7,0,0,0,0,0,0,0,0,3,0,4,0,0,0,
+0,0,4,5,5,5,0,3,0,7,7,0,7,0,7,0,7,7,7,0,3,3,3,3,0,3,0,4,4,0,0,
+0,0,4,0,0,5,0,3,0,0,0,0,7,0,7,0,0,0,0,0,0,0,0,3,0,0,0,0,4,0,0,
+0,0,4,5,0,5,12,3,0,7,7,7,7,0,7,6,7,7,7,7,7,7,0,3,0,5,5,0,4,0,0,
+0,0,4,0,0,5,0,3,0,7,0,0,0,0,6,1,6,0,0,0,0,7,0,3,0,5,0,0,4,0,0,
+0,0,4,0,5,5,0,3,0,7,7,7,7,7,7,6,7,0,7,7,7,7,0,3,12,5,0,5,4,0,0,
+0,0,4,0,0,0,0,3,0,0,0,0,0,0,0,0,7,0,7,0,0,0,0,3,0,5,0,0,4,0,0,
+0,0,4,4,0,3,0,3,3,3,3,0,7,7,7,0,7,0,7,0,7,7,0,3,0,5,5,5,4,0,0,
+0,0,0,4,0,3,0,0,0,0,0,0,0,0,7,0,7,0,0,0,7,0,0,3,0,0,0,0,4,0,0,
+0,0,0,4,0,3,3,3,0,3,0,7,7,0,7,0,7,0,3,0,0,0,0,0,0,3,0,4,4,0,0,
+0,0,0,4,0,0,0,0,0,3,0,0,7,0,7,7,7,0,3,0,3,3,3,3,3,3,0,4,0,0,0,
+0,0,0,4,4,4,5,5,5,3,0,0,0,0,0,0,0,0,3,0,0,0,5,0,0,0,0,4,0,0,0,
+0,0,0,0,0,4,0,0,0,3,0,3,3,3,3,3,3,3,3,0,3,0,5,0,5,4,4,4,0,0,0,
+0,0,0,0,0,4,0,5,0,3,0,0,0,0,12,0,0,0,0,0,3,0,5,0,0,4,0,0,0,0,0,
+0,0,0,0,0,4,4,4,0,3,3,0,5,5,5,5,5,0,3,3,3,0,4,4,4,4,0,0,0,0,0,
+0,0,0,0,0,0,0,4,0,0,0,0,5,0,0,0,5,0,0,0,0,0,4,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,4,4,4,4,0,5,0,5,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>

diff --git a/assets/level8.tmx b/assets/level8.tmx
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="31" height="31" tilewidth="32" tileheight="32" infinite="0" nextlayerid="2" nextobjectid="1">
+ <tileset firstgid="1" name="Tileset1" tilewidth="32" tileheight="32" tilecount="7" columns="0">
+  <grid orientation="orthogonal" width="1" height="1"/>
+  <tile id="0">
+   <image source="tiles/tile0.png" width="32" height="32"/>
+   <objectgroup draworder="index" id="2">
+    <object id="1" name="collider" x="0" y="0" width="32" height="32"/>
+   </objectgroup>
+  </tile>
+  <tile id="1">
+   <image source="tiles/tile1.png" width="32" height="32"/>
+   <objectgroup draworder="index" id="2">
+    <object id="4" name="collision" x="0" y="0" width="32" height="32"/>
+   </objectgroup>
+  </tile>
+  <tile id="2">
+   <image source="tiles/tile2.png" width="32" height="32"/>
+   <objectgroup draworder="index" id="2">
+    <object id="1" name="collision" x="0" y="0" width="32" height="32"/>
+   </objectgroup>
+  </tile>
+  <tile id="3">
+   <image source="tiles/tile3.png" width="32" height="32"/>
+   <objectgroup draworder="index" id="2">
+    <object id="1" name="collision" x="0" y="0" width="32" height="32"/>
+   </objectgroup>
+  </tile>
+  <tile id="4">
+   <image source="tiles/tile4.png" width="32" height="32"/>
+   <objectgroup draworder="index" id="2">
+    <object id="3" name="collision" x="0" y="0" width="32" height="32"/>
+   </objectgroup>
+  </tile>
+  <tile id="5">
+   <image source="tiles/tile5.png" width="32" height="32"/>
+   <objectgroup draworder="index" id="2">
+    <object id="1" name="collision" x="0" y="0" width="32" height="32"/>
+   </objectgroup>
+  </tile>
+  <tile id="6">
+   <image source="tiles/tile6.png" width="32" height="32"/>
+   <objectgroup draworder="index" id="2">
+    <object id="2" name="collision" x="0" y="0" width="32" height="32"/>
+   </objectgroup>
+  </tile>
+ </tileset>
+ <layer id="1" name="Tile Layer 1" width="31" height="31">
+  <data encoding="csv">
+0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,
+0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,
+0,0,4,0,5,5,5,5,5,5,5,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,5,0,0,4,
+0,0,4,0,0,0,0,0,0,0,0,3,0,0,0,0,3,0,0,0,3,3,3,3,3,3,0,5,0,4,4,
+0,0,4,0,3,3,3,3,3,3,3,3,0,3,3,0,0,0,3,0,0,0,0,0,0,3,0,0,0,4,0,
+0,0,4,0,3,0,3,0,0,0,0,0,0,0,3,3,3,3,3,3,3,0,3,3,3,3,3,3,0,4,0,
+4,4,4,0,3,0,3,0,3,3,3,3,3,0,3,0,3,0,0,0,3,0,3,0,0,0,0,3,0,4,0,
+4,0,0,0,3,0,3,0,3,0,7,0,0,0,3,0,0,0,7,0,0,0,0,0,3,3,0,3,0,4,0,
+4,0,3,3,3,0,3,0,3,0,7,0,7,7,7,7,7,7,7,7,7,0,7,0,3,0,0,3,0,4,0,
+4,0,3,0,0,0,3,0,3,0,7,0,7,0,0,0,0,0,7,0,0,0,7,0,3,3,3,3,5,4,4,
+4,0,3,0,3,3,3,3,3,0,7,0,7,7,7,7,7,0,7,0,7,7,7,0,0,0,0,0,0,0,4,
+4,0,3,0,3,0,0,0,0,0,7,0,0,0,0,0,0,0,7,0,0,0,7,3,3,0,3,3,3,0,4,
+4,0,3,0,3,0,3,3,3,0,7,0,7,7,7,7,7,7,7,7,7,0,7,0,3,0,3,0,3,0,4,
+4,0,0,0,3,0,3,0,3,0,7,0,7,0,0,0,0,0,0,0,0,0,7,0,3,0,3,0,3,0,4,
+4,4,4,0,3,0,3,0,3,0,7,7,7,0,6,6,6,0,7,7,7,0,7,0,3,0,3,0,3,0,4,
+0,0,4,0,3,0,0,0,3,0,7,0,7,0,6,1,6,0,7,0,7,0,7,0,0,0,0,0,3,0,4,
+0,0,4,0,3,3,3,3,3,0,7,0,7,0,6,6,6,0,7,0,7,0,7,3,3,3,3,3,3,0,4,
+0,0,4,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,7,0,7,0,0,0,0,0,3,0,4,
+0,0,4,0,3,0,7,7,7,7,7,0,7,7,7,7,7,7,7,0,7,0,7,0,3,3,3,3,3,0,4,
+4,4,4,0,3,0,0,0,0,0,7,0,7,0,0,0,0,0,0,0,7,7,7,0,3,0,0,0,0,0,4,
+4,0,0,0,3,3,3,0,3,0,7,0,7,0,7,7,7,7,7,7,7,0,0,0,3,0,5,5,5,0,4,
+4,0,3,0,0,0,3,0,3,0,7,0,7,0,7,0,0,0,0,0,0,0,3,0,3,0,5,0,5,0,4,
+4,0,3,3,3,3,3,0,3,0,7,0,7,0,7,0,7,0,3,3,3,3,3,0,3,0,5,0,5,0,4,
+4,0,3,0,0,0,0,0,3,0,7,0,0,0,0,0,7,0,3,0,0,0,0,0,3,0,5,0,5,0,4,
+4,0,3,0,3,3,3,3,3,3,7,7,7,7,7,7,7,0,3,3,3,3,3,0,3,0,5,0,5,0,4,
+4,0,3,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,3,0,0,0,5,0,4,
+4,0,3,3,3,3,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,0,3,5,5,5,5,0,4,
+4,0,0,0,0,3,0,3,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,0,0,0,0,0,4,
+4,4,4,4,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,4,4,4,4,4,
+0,0,0,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+</map>
diff --git a/src/game/spawn/level.rs b/src/game/spawn/level.rs
@@ -100,7 +100,7 @@ fn start_new_game(
     commands.insert_resource(OverallScore::default());
     commands.insert_resource(Score::default());
     commands.insert_resource(Levels::default());
-    commands.insert_resource(CurrentLevel(6));
+    commands.insert_resource(CurrentLevel(7));
     commands.trigger(FadeOut { duration: 0.5 });
     commands.trigger(SpawnLevel);
 }
@@ -359,6 +359,26 @@ impl Default for Levels {
                         IVec2::new(-9, 9),
                     ],
                 },
+                Level {
+                    map: "level8.tmx".to_string(),
+                    size: IVec2::new(31, 31),
+                    start_tile: IVec2::new(-2, -2),
+                    duckling_spawn_points: vec![
+                        IVec2::new(-4, 2),
+                        IVec2::new(-8, 0),
+                        IVec2::new(4, 0),
+                        IVec2::new(6, -3),
+                        IVec2::new(4, -8),
+                        IVec2::new(8, 0),
+                        IVec2::new(10, 7),
+                        IVec2::new(-8, 6),
+                        IVec2::new(0, 8),
+                        IVec2::new(13, 7),
+                        IVec2::new(12, -6),
+                        IVec2::new(-10, -6),
+                        IVec2::new(-11, -10),
+                    ],
+                },
             ],
         }
     }