From 05ba2b75c434935b4f96be96db6760777e084dea Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Sat, 25 Jun 2022 17:49:43 +0100
Subject: [PATCH] add basic level 3 shape

---
 CMakeLists.txt                |  3 ++
 assets-cg/levels/lv3.tmx      | 34 ++++++++++++++++
 assets-cg/levels/lv3.txt      | 10 +++++
 assets-cg/tilesets/heaven.tsx | 75 ++++++++++++++++++++++++++++++++++-
 src/level.c                   |  1 +
 src/level.h                   |  3 +-
 6 files changed, 123 insertions(+), 3 deletions(-)
 create mode 100644 assets-cg/levels/lv3.tmx
 create mode 100644 assets-cg/levels/lv3.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec66af8..20d863b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,11 +42,14 @@ set(ASSETS
   # Tilesets
   assets-cg/tilesets/cavern.tsx
   assets-cg/tilesets/lab.tsx
+  assets-cg/tilesets/heaven.tsx
   # Levels
   assets-cg/levels/lv1.tmx
   assets-cg/levels/lv1.txt
   assets-cg/levels/lv2.tmx
   assets-cg/levels/lv2.txt
+  assets-cg/levels/lv3.tmx
+  assets-cg/levels/lv3.txt
   assets-cg/levels/lvsandbox.tmx
   assets-cg/levels/lvsandbox.txt
   # Menu
diff --git a/assets-cg/levels/lv3.tmx b/assets-cg/levels/lv3.tmx
new file mode 100644
index 0000000..43544b4
--- /dev/null
+++ b/assets-cg/levels/lv3.tmx
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="24" height="11" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
+ <tileset firstgid="1" source="../tilesets/heaven.tsx"/>
+ <layer id="1" name="Ground" width="24" height="11">
+  <data encoding="csv">
+0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,
+0,0,0,0,2,7,8,8,7,15,15,16,15,8,8,7,2,2,2,2,2,2,2,0,
+0,0,0,0,2,4,4,4,4,6,3,3,3,6,6,6,2,2,15,15,16,15,2,0,
+0,2,2,2,2,4,4,3,6,6,6,6,6,3,6,6,2,2,4,4,4,5,2,0,
+0,2,8,8,7,4,3,4,2,2,2,2,4,3,3,5,8,8,5,5,5,4,2,0,
+0,2,6,6,6,6,6,4,7,2,2,7,6,4,5,3,5,5,5,5,5,5,2,0,
+0,2,6,6,6,3,4,4,4,8,8,6,4,6,2,2,2,2,5,5,5,5,2,0,
+0,2,6,6,6,6,3,3,3,3,3,3,3,4,8,8,2,2,5,4,4,4,2,0,
+0,2,2,2,2,2,2,2,2,2,2,2,3,4,4,4,2,2,2,2,2,2,2,0,
+0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0
+</data>
+ </layer>
+ <layer id="2" name="Decorations" width="24" height="11">
+  <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,17,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,11,10,0,10,0,0,0,0,17,0,17,0,0,0,0,0,0,0,0,
+0,0,0,0,0,10,0,0,0,0,0,0,0,0,9,9,0,0,0,0,17,17,0,0,
+0,0,17,17,0,0,0,0,0,0,0,0,0,0,0,9,0,0,10,0,11,9,0,0,
+0,0,9,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,20,10,0,0,
+0,0,0,20,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,9,0,0,0,9,9,9,9,0,0,0,11,0,0,0,0,9,0,10,11,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,11,10,11,11,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>
+ </layer>
+</map>
diff --git a/assets-cg/levels/lv3.txt b/assets-cg/levels/lv3.txt
new file mode 100644
index 0000000..e741a8d
--- /dev/null
+++ b/assets-cg/levels/lv3.txt
@@ -0,0 +1,10 @@
+name: Heaven's Garden
+map: lv3
+
+player_spawn: 11,2
+
+spawner: 3,7
+spawner: 21,4
+spawner: 21,6
+
+wave: 10s 4*slime/1
diff --git a/assets-cg/tilesets/heaven.tsx b/assets-cg/tilesets/heaven.tsx
index 6a4f2e5..62cad32 100644
--- a/assets-cg/tilesets/heaven.tsx
+++ b/assets-cg/tilesets/heaven.tsx
@@ -1,4 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.4" name="heaven" tilewidth="16" tileheight="16" tilecount="16" columns="8">
- <image source="heaven.png" width="128" height="32"/>
+<tileset version="1.8" tiledversion="1.8.6" name="heaven" tilewidth="16" tileheight="16" tilecount="24" columns="8">
+ <image source="heaven.png" width="128" height="48"/>
+ <tile id="1">
+  <properties>
+   <property name="plane" value="CEILING"/>
+   <property name="solid" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="5">
+  <animation>
+   <frame tileid="5" duration="500"/>
+   <frame tileid="13" duration="500"/>
+  </animation>
+ </tile>
+ <tile id="6">
+  <properties>
+   <property name="plane" value="WALL"/>
+   <property name="solid" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="7">
+  <properties>
+   <property name="plane" value="WALL"/>
+   <property name="solid" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="8">
+  <properties>
+   <property name="plane" value="WALL"/>
+  </properties>
+  <animation>
+   <frame tileid="8" duration="1000"/>
+   <frame tileid="16" duration="400"/>
+  </animation>
+ </tile>
+ <tile id="9">
+  <properties>
+   <property name="plane" value="WALL"/>
+  </properties>
+  <animation>
+   <frame tileid="9" duration="800"/>
+   <frame tileid="17" duration="200"/>
+  </animation>
+ </tile>
+ <tile id="10">
+  <properties>
+   <property name="plane" value="WALL"/>
+  </properties>
+  <animation>
+   <frame tileid="10" duration="1400"/>
+   <frame tileid="18" duration="200"/>
+  </animation>
+ </tile>
+ <tile id="14">
+  <properties>
+   <property name="plane" value="WALL"/>
+   <property name="solid" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="15">
+  <properties>
+   <property name="plane" value="WALL"/>
+   <property name="solid" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="19">
+  <animation>
+   <frame tileid="19" duration="1000"/>
+   <frame tileid="20" duration="1000"/>
+   <frame tileid="21" duration="1000"/>
+   <frame tileid="20" duration="1000"/>
+  </animation>
+ </tile>
 </tileset>
diff --git a/src/level.c b/src/level.c
index 56166e3..e929a77 100644
--- a/src/level.c
+++ b/src/level.c
@@ -3,6 +3,7 @@
 level_t const *level_all[LEVEL_COUNT] = {
     &level_lv1,
     &level_lv2,
+    &level_lv3,
     &level_lvsandbox,
 };
 
diff --git a/src/level.h b/src/level.h
index c618d1f..5cbe9b1 100644
--- a/src/level.h
+++ b/src/level.h
@@ -80,7 +80,8 @@ int level_wave_count(level_t const *lv);
 /* List of levels */
 extern level_t level_lv1;
 extern level_t level_lv2;
+extern level_t level_lv3;
 extern level_t level_lvsandbox;
 
-#define LEVEL_COUNT 3
+#define LEVEL_COUNT 4
 extern level_t const *level_all[LEVEL_COUNT];