Fix staircase tile settings being incorrect, added small collision lining on standalone staircase tiles. Implement Chapter 2 level setups. Release Build 8601.

8 months ago · 21b6334a2a
parent 0e9d1b391d
commit 21b6334a2a
10 changed files with 2230 additions and 7602 deletions
--- a/Lestoria.tiled-project
+++ b/Lestoria.tiled-project
@ -232,8 +232,18 @@
                "HUB",
                "CAMPAIGN_1_B1",
                "BOSS_1_B",
-                "STORY_2_1",
-                "CAMPAIGN_1_B2"
+                "CAMPAIGN_2_1",
+                "CAMPAIGN_2_2",
+                "CAMPAIGN_2_3",
+                "CAMPAIGN_2_4",
+                "CAMPAIGN_2_5",
+                "CAMPAIGN_2_6",
+                "CAMPAIGN_2_7",
+                "CAMPAIGN_2_8",
+                "CAMPAIGN_2_B1",
+                "CAMPAIGN_2_B2",
+                "BOSS_2",
+                "BOSS_2_B"
            ],
            "valuesAsFlags": false
        },
--- a/Lestoria/Version.h
+++ b/Lestoria/Version.h
@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 #define VERSION_PATCH 0
-#define VERSION_BUILD 8598
+#define VERSION_BUILD 8601

 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
--- a/Lestoria/assets/Campaigns/2_1.tmx
+++ b/Lestoria/assets/Campaigns/2_1.tmx
--- a/Lestoria/assets/Campaigns/World_Map.tmx
+++ b/Lestoria/assets/Campaigns/World_Map.tmx
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="left-down" width="250" height="177" tilewidth="4" tileheight="4" infinite="0" nextlayerid="5" nextobjectid="20">
+<map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="left-down" width="250" height="177" tilewidth="4" tileheight="4" infinite="0" nextlayerid="5" nextobjectid="30">
 <properties>
  <property name="Background Music" propertytype="BGM" value="overworld"/>
  <property name="Level Type" propertytype="LevelType" value="World Map"/>
@ -603,7 +603,7 @@
  </object>
  <object id="8" name="Camp" type="StagePlate" x="416" y="416" width="20" height="24">
   <properties>
-    <property name="Connection 1 - North" type="object" value="0"/>
+    <property name="Connection 1 - North" type="object" value="20"/>
    <property name="Map" propertytype="Level" value="HUB"/>
    <property name="Type" propertytype="StageType" value="HUB"/>
    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
@ -686,5 +686,75 @@
    <property name="Unlock Condition" propertytype="Level" value="CAMPAIGN_1_B1"/>
   </properties>
  </object>
+  <object id="20" name="Stage II-I" type="StagePlate" x="201" y="233" width="42" height="14">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="21" name="Stage II-II" type="StagePlate" x="217" y="205" width="42" height="14">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="22" name="Stage II-III" type="StagePlate" x="149" y="181" width="42" height="14">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="23" name="Stage II-IV" type="StagePlate" x="121" y="137" width="42" height="14">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="24" name="Stage II-V" type="StagePlate" x="125" y="89" width="42" height="14">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="25" name="Stage II-VI" type="StagePlate" x="169" y="117" width="42" height="14">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="26" name="Stage II-VII" type="StagePlate" x="185" y="93" width="42" height="14">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="27" name="Stage II-VIII" type="StagePlate" x="245" y="89" width="42" height="14">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="28" name="Boss II" type="StagePlate" x="237" y="137" width="30" height="22">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="BOSS"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
+  <object id="29" name="Story IV" type="StagePlate" x="229" y="105" width="18" height="22">
+   <properties>
+    <property name="Map" propertytype="Level" value="CAMPAIGN_2_1"/>
+    <property name="Type" propertytype="StageType" value="STORY"/>
+    <property name="Unlock Condition" propertytype="Level" value="STORY_1_1"/>
+   </properties>
+  </object>
 </objectgroup>
 </map>
--- a/Lestoria/assets/config/levels.txt
+++ b/Lestoria/assets/config/levels.txt
@ -110,6 +110,12 @@ Levels
    {
        Map File = Boss_1_B.tmx
    }
+    CAMPAIGN_2_1
+    {
+        Map File = 2_1.tmx
+        # Specify item, min quantity, and max quantity of items. Optionally specify a % drop chance per item.
+        # Loot[0] = Berries, 1, 5, 100%
+    }
    HUB
    {
        Skip Loadout Selection = True
--- a/Lestoria/assets/gamepack.pak
+++ b/Lestoria/assets/gamepack.pak
--- a/Lestoria/assets/maps/Tilesheet_No_Shadow24x24.tsx
+++ b/Lestoria/assets/maps/Tilesheet_No_Shadow24x24.tsx
--- a/Lestoria/assets/maps/chapter2-props.png
+++ b/Lestoria/assets/maps/chapter2-props.png
--- a/Lestoria/assets/maps/objects.tsx
+++ b/Lestoria/assets/maps/objects.tsx
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.10" tiledversion="1.10.1" name="objects" tilewidth="24" tileheight="24" tilecount="783" columns="29">
- <image source="commercial_assets/objects.png" width="696" height="648"/>
+<tileset version="1.10" tiledversion="1.10.2" name="objects" tilewidth="24" tileheight="24" tilecount="783" columns="29">
+ <image source="chapter2-props.png" width="696" height="648"/>
 </tileset>
--- a/x64/Release/Adventures
+++ b/x64/Release/Adventures