feat: add demo2 to launcher

buxx · Mar 27, 2024 · caa21ce · caa21ce
1 parent 300e63f
commit caa21ce
Show file tree

Hide file tree

Showing 17 changed files with 11,967 additions and 7 deletions.
diff --git a/assets/demo2_deployment.json b/assets/demo2_deployment.json
diff --git a/assets/demo2_deployment2.json b/assets/demo2_deployment2.json
diff --git a/oc_launcher/src/main.rs b/oc_launcher/src/main.rs
@@ -74,8 +74,8 @@ impl eframe::App for Launcher {
             ui.horizontal(|ui|{
                 let texture: &egui::TextureHandle = self.map1_preview.get_or_insert_with(|| {
                     ui.ctx().load_texture(
-                        "Demo1Preview.png",
-                        load_image_from_path(Path::new("resources/maps/Demo1/Demo1Preview.png")).unwrap(),
+                        "Demo2Preview.png",
+                        load_image_from_path(Path::new("resources/maps/Demo2/Demo2Preview.png")).unwrap(),
                         Default::default()
                     )
                 });
@@ -103,18 +103,18 @@ impl eframe::App for Launcher {
 impl Launcher {
     fn launch_attack_from_west(&self) -> Result<()> {
         self.launch(
-            "Demo1",
-            "assets/demo1_deployment.json",
+            "Demo2",
+            "assets/demo2_deployment.json",
             vec!["W", "NW", "SW"],
             vec!["ALL"],
         )?;
         Ok(())
     }
     fn launch_attack_from_north_est(&self) -> Result<()> {
         self.launch(
-            "Demo1",
-            "assets/demo1_deployment2.json",
-            vec!["N", "NE", "E"],
+            "Demo2",
+            "assets/demo2_deployment2.json",
+            vec!["S", "SE", "E"],
             vec!["ALL"],
         )?;
         Ok(())

diff --git a/resources/maps/Demo2/CREDITS b/resources/maps/Demo2/CREDITS
@@ -0,0 +1,6 @@
+Original background, Creative Commons (BY) : https://rpgmapshare.com/piwigo/gallery/picture.php?/8327/category/55
+Trees, Creative Commons (BY): https://rpgmapshare.com/piwigo/gallery/index.php?/category/22
+House1, Creative Commons (BY) : https://rpgmapshare.com/piwigo/gallery/index.php?/category/19
+Tree stump : https://www.kindpng.com/imgv/wThwhx_tree-wellness-alpharetta-ga-top-tree-stump-png/
+Wood : https://rpgmapshare.com/piwigo/gallery/index.php
+Rock & Stones : https://rpgmapshare.com/piwigo/gallery/index.php?/category/23
diff --git a/resources/maps/Demo2/Demo2.png b/resources/maps/Demo2/Demo2.png
diff --git a/resources/maps/Demo2/Demo2.tmx b/resources/maps/Demo2/Demo2.tmx
diff --git a/resources/maps/Demo2/Demo2Preview.png b/resources/maps/Demo2/Demo2Preview.png
diff --git a/resources/maps/Demo2/Demo2__HD.png b/resources/maps/Demo2/Demo2__HD.png
diff --git a/resources/maps/Demo2/interiors.png b/resources/maps/Demo2/interiors.png
diff --git a/resources/maps/Demo2/interiors__HD.png b/resources/maps/Demo2/interiors__HD.png
diff --git a/resources/maps/Demo2/terrain.png b/resources/maps/Demo2/terrain.png
diff --git a/resources/maps/Demo2/terrain.tsx b/resources/maps/Demo2/terrain.tsx
@@ -0,0 +1,79 @@
+<?xml version = "1.0" encoding = "UTF-8" ?>
+<tileset version="1.5" tiledversion="1.6.0" name="terrain" tilewidth="5" tileheight="5" tilecount="2000" columns="100">
+<image source="terrain.png" width="500" height="100" />
+<tile id="0">
+    <properties>
+        <property name="ID" value="ShortGrass" />
+    </properties>
+</tile>
+<tile id="1">
+    <properties>
+        <property name="ID" value="MiddleGrass" />
+    </properties>
+</tile>
+<tile id="2">
+    <properties>
+        <property name="ID" value="HighGrass" />
+    </properties>
+</tile>
+<tile id="3">
+    <properties>
+        <property name="ID" value="Dirt" />
+    </properties>
+</tile>
+<tile id="4">
+    <properties>
+        <property name="ID" value="Mud" />
+    </properties>
+</tile>
+<tile id="5">
+    <properties>
+        <property name="ID" value="Concrete" />
+    </properties>
+</tile>
+<tile id="6">
+    <properties>
+        <property name="ID" value="BrickWall" />
+    </properties>
+</tile>
+<tile id="100">
+    <properties>
+        <property name="ID" value="Trunk" />
+    </properties>
+</tile>
+<tile id="101">
+    <properties>
+        <property name="ID" value="Water" />
+    </properties>
+</tile>
+<tile id="102">
+    <properties>
+        <property name="ID" value="DeepWater" />
+    </properties>
+</tile>
+<tile id="103">
+    <properties>
+        <property name="ID" value="Underbrush" />
+    </properties>
+</tile>
+<tile id="104">
+    <properties>
+        <property name="ID" value="LightUnderbrush" />
+    </properties>
+</tile>
+<tile id="200">
+    <properties>
+        <property name="ID" value="MiddleWoodLogs" />
+    </properties>
+</tile>
+<tile id="201">
+    <properties>
+        <property name="ID" value="Hedge" />
+    </properties>
+</tile>
+<tile id="202">
+    <properties>
+        <property name="ID" value="MiddleRock" />
+    </properties>
+</tile>
+</tileset>
diff --git a/resources/maps/Demo2/terrain.xcf b/resources/maps/Demo2/terrain.xcf
diff --git a/resources/maps/Demo2/trees.png b/resources/maps/Demo2/trees.png
diff --git a/resources/maps/Demo2/trees.tsx b/resources/maps/Demo2/trees.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.5" tiledversion="1.6.0" name="trees" tilewidth="64" tileheight="64" tilecount="20" columns="10">
+ <image source="trees.png" width="640" height="128"/>
+</tileset>
diff --git a/resources/maps/Demo2/trees__HD.png b/resources/maps/Demo2/trees__HD.png
diff --git a/resources/maps/Demo2/trees__HD.xcf b/resources/maps/Demo2/trees__HD.xcf