Skip to content

Commit

Permalink
level 10
Browse files Browse the repository at this point in the history
  • Loading branch information
@stevepryde
stevepryde committed Jul 29, 2024
1 parent 92f8e1c commit 3840127
Show file tree
Hide file tree
Showing 4 changed files with 289 additions and 1 deletion.
77 changes: 77 additions & 0 deletions assets/level10.tmx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="25" height="25" 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="25" height="25">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,0,0,0,
0,0,0,0,0,4,4,4,0,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,0,
0,0,4,4,4,4,0,4,4,4,0,5,5,0,3,3,3,0,5,5,5,5,0,4,4,
0,0,4,0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,0,0,0,0,4,
0,4,4,0,3,3,0,3,0,6,0,6,6,6,6,0,3,3,3,3,3,3,0,4,4,
0,4,0,0,0,3,3,3,0,6,6,6,0,0,6,0,0,0,0,0,0,3,0,4,0,
0,4,0,3,3,3,0,3,0,0,0,0,0,6,6,6,0,3,0,3,0,3,0,4,0,
0,4,0,0,0,0,0,3,0,6,6,6,0,0,0,6,0,3,0,3,0,3,0,4,0,
4,4,0,3,3,3,0,3,6,6,0,6,6,6,0,6,0,3,0,3,0,3,0,4,0,
4,0,0,0,0,3,0,0,6,0,0,0,0,0,0,6,6,3,3,3,0,3,0,4,4,
4,0,5,3,3,3,0,6,6,6,0,6,6,6,0,0,0,0,0,0,0,3,0,0,4,
4,0,5,0,0,0,0,6,0,6,6,6,0,6,6,0,6,6,6,0,5,5,5,0,4,
4,0,5,5,0,6,6,6,0,0,6,0,0,0,0,0,6,0,6,0,0,0,5,0,4,
4,0,5,0,0,6,0,0,0,6,6,6,0,6,6,6,6,0,6,6,5,5,5,0,4,
4,5,5,0,5,6,0,6,6,6,0,6,6,6,0,6,0,0,0,6,0,0,5,0,4,
4,0,0,0,0,6,0,0,0,0,0,0,6,0,0,0,0,6,0,6,0,5,5,0,4,
4,0,5,5,5,6,0,3,3,3,0,6,6,6,0,6,6,6,0,6,0,5,0,0,4,
4,0,0,0,0,6,0,3,0,3,6,6,0,6,6,6,0,0,0,0,0,5,0,4,4,
4,0,3,3,0,6,0,3,0,0,0,0,0,0,0,0,0,3,3,3,5,5,0,4,0,
4,0,3,0,0,0,0,3,0,3,0,3,0,3,3,3,3,3,0,3,0,0,0,4,0,
4,0,3,3,3,3,3,3,0,3,0,3,3,3,0,3,0,3,0,3,0,3,0,4,0,
4,0,0,0,0,0,0,3,0,3,0,0,0,0,0,3,0,0,0,3,0,3,0,4,0,
4,4,4,4,4,4,0,3,0,3,3,3,3,3,3,3,0,5,0,3,3,3,0,4,0,
0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,4,0,
0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0
</data>
</layer>
</map>
77 changes: 77 additions & 0 deletions assets/level11.tmx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="25" height="25" 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="25" height="25">
<data encoding="csv">
4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
4,0,0,3,0,0,0,3,0,0,0,0,5,0,0,0,0,3,0,0,0,3,0,0,4,
4,0,0,0,0,3,0,0,0,3,3,0,5,0,3,3,0,0,0,3,0,0,0,0,4,
4,3,0,2,2,2,2,2,2,2,0,0,5,0,0,2,2,2,2,2,2,2,0,3,4,
4,0,0,2,0,0,0,0,0,2,0,5,5,5,0,2,0,0,0,0,0,2,0,0,4,
4,0,3,2,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,2,3,0,4,
4,0,0,2,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,2,0,0,4,
4,3,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,3,4,
4,0,0,2,0,0,2,0,6,6,6,6,0,6,6,6,6,2,2,0,0,2,0,0,4,
4,0,3,2,2,2,2,0,6,0,0,6,0,6,0,0,6,0,2,2,2,2,3,0,4,
4,0,3,0,0,0,2,0,6,0,0,0,0,0,0,0,6,0,5,0,0,0,3,0,4,
4,0,0,0,5,0,2,0,6,0,0,0,0,0,0,0,6,0,5,0,5,0,0,0,4,
4,5,5,5,5,0,2,0,6,0,0,0,0,0,0,0,6,0,5,5,5,5,5,5,4,
4,0,0,0,5,0,2,0,6,0,0,0,0,0,0,0,6,0,0,0,5,0,0,0,4,
4,0,5,0,0,0,2,0,6,0,0,0,0,0,0,0,6,0,2,0,0,0,3,0,4,
4,0,5,2,2,2,2,0,6,0,0,0,0,0,0,0,6,0,2,2,2,2,3,0,4,
4,0,0,2,0,0,0,0,6,6,6,6,6,6,6,6,6,0,0,0,0,2,0,0,4,
4,0,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,3,4,
4,0,0,2,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,2,0,0,4,
4,3,0,2,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,2,3,0,4,
4,0,0,2,0,0,0,0,0,2,0,5,5,5,0,2,0,0,0,0,0,2,0,0,4,
4,0,3,2,2,2,2,2,2,2,0,0,5,0,0,2,2,2,2,2,2,2,0,3,4,
4,0,3,0,0,3,0,0,0,3,3,0,5,0,3,3,0,0,0,3,0,0,0,0,4,
4,0,0,0,0,0,0,3,0,0,0,0,5,0,0,0,0,3,0,0,0,3,0,0,4,
4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
</data>
</layer>
</map>
77 changes: 77 additions & 0 deletions assets/level9.tmx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="25" height="25" 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="25" height="25">
<data encoding="csv">
0,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,
2,2,0,3,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,
2,0,0,3,0,5,0,3,3,3,0,0,0,0,0,0,3,0,3,0,0,3,0,0,2,
2,0,3,3,0,0,0,0,0,3,0,3,0,0,3,0,3,0,0,0,0,3,3,3,2,
2,0,0,0,0,0,5,0,0,5,5,5,0,0,5,5,5,0,0,3,0,0,0,0,2,
2,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,2,
2,0,3,0,0,0,0,5,0,7,7,7,7,7,7,7,7,0,0,0,5,0,0,0,2,
2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,2,
2,2,3,3,5,0,7,0,5,5,5,5,5,5,5,5,5,0,0,0,0,0,3,0,2,
0,2,0,0,5,0,7,0,5,0,7,0,0,0,0,0,5,0,7,0,5,3,3,2,2,
0,2,0,3,5,0,7,0,5,0,7,0,7,0,7,7,5,0,7,0,5,0,0,2,0,
0,2,0,0,0,0,7,0,0,0,0,0,6,0,0,0,5,0,7,0,5,3,0,2,0,
0,2,0,0,0,0,7,0,5,0,7,6,1,6,7,0,5,0,7,0,0,0,0,2,0,
0,2,0,3,5,0,7,0,5,0,0,0,6,0,0,0,0,0,7,0,0,0,0,2,0,
0,2,0,0,5,0,7,0,5,7,7,0,7,0,7,0,5,0,7,0,5,3,0,2,0,
2,2,3,3,5,0,7,0,5,0,0,0,0,0,7,0,5,0,7,0,5,0,0,2,0,
2,0,3,0,0,0,0,0,5,5,5,5,5,5,5,5,5,0,7,0,5,3,3,2,2,
2,0,3,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
2,0,0,0,5,0,0,0,7,7,7,7,7,7,7,7,0,5,0,0,0,0,3,0,2,
2,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,2,
2,0,0,0,0,3,0,0,5,5,5,0,0,5,5,5,0,0,5,0,0,0,0,0,2,
2,3,3,3,0,0,0,0,3,0,3,0,0,3,0,3,0,0,0,0,0,3,3,0,2,
2,0,0,3,0,0,3,0,3,0,0,0,0,0,0,3,3,3,0,5,0,3,0,0,2,
2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,3,0,2,2,
0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,0
</data>
</layer>
</map>
59 changes: 58 additions & 1 deletion src/game/spawn/level.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(7));
commands.insert_resource(CurrentLevel(9));
commands.trigger(FadeOut { duration: 0.5 });
commands.trigger(SpawnLevel);
}
Expand Down Expand Up @@ -379,6 +379,63 @@ impl Default for Levels {
IVec2::new(-11, -10),
],
},
Level {
map: "level9.tmx".to_string(),
size: IVec2::new(25, 25),
start_tile: IVec2::new(10, -10),
duckling_spawn_points: vec![
IVec2::new(3, 3),
IVec2::new(-3, 3),
IVec2::new(-3, -3),
IVec2::new(3, -3),
IVec2::new(-10, 0),
IVec2::new(10, 0),
IVec2::new(3, 10),
IVec2::new(-3, -10),
IVec2::new(10, 10),
IVec2::new(-10, -10),
IVec2::new(-10, 10),
IVec2::new(4, 11),
IVec2::new(4, -11),
],
},
Level {
map: "level11.tmx".to_string(),
size: IVec2::new(25, 25),
start_tile: IVec2::new(7, 1),
duckling_spawn_points: vec![
IVec2::new(0, 1),
IVec2::new(-1, 1),
IVec2::new(-2, 1),
IVec2::new(-3, 1),
IVec2::new(1, 1),
IVec2::new(2, 1),
IVec2::new(3, 1),
IVec2::new(4, 7),
IVec2::new(5, 7),
IVec2::new(6, 7),
IVec2::new(7, 7),
IVec2::new(8, 7),
IVec2::new(-4, 7),
IVec2::new(-5, 7),
IVec2::new(-6, 7),
IVec2::new(-7, 7),
IVec2::new(-8, 7),
IVec2::new(-4, -5),
IVec2::new(-5, -5),
IVec2::new(-6, -5),
IVec2::new(-7, -5),
IVec2::new(-8, -5),
IVec2::new(4, -5),
IVec2::new(5, -5),
IVec2::new(6, -5),
IVec2::new(7, -5),
IVec2::new(8, -5),
IVec2::new(-11, -11),
IVec2::new(-11, 11),
IVec2::new(11, -11),
],
},
],
}
}
Expand Down

0 comments on commit 3840127

Please sign in to comment.