Merge pull request #14 from deavid/next

Release v0.2.3-rc1 from Next
deavid · Jun 15, 2024 · e348bb3 · e348bb3
2 parents 8a0eff6 + 1e2da97
commit e348bb3
Show file tree

Hide file tree

Showing 64 changed files with 2,628 additions and 348 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+### Version 0.2.3 - 2024-06-??
+
+**Features:**
+
+* **TBD**:
+    * TBD
+
+**Fixes:**
+  * TBD  
+
 ### Version 0.2.2 - 2024-06-02
 
 **Features:**

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 workspace = { members = ["tools/ghost_radio"] }
 [package]
 name = "unhaunter"
-version = "0.2.2"
+version = "0.2.3-rc1"
 edition = "2021"
 default-run = "unhaunter_game"
 description = "2D isometric Game about investigating paranormal hauntings"

diff --git a/README.md b/README.md
@@ -205,6 +205,32 @@ You can profile the build process to identify further optimizations using:
 
 **Note:** This requires a nightly Rust toolchain.
 
+## Building WASM locally:
+
+https://bevy-cheatbook.github.io/platforms/wasm.html
+
+Install deps
+ 
+```bash
+   rustup target install wasm32-unknown-unknown
+   cargo install wasm-server-runner
+```
+ 
+Run with:
+ 
+```bash 
+   cargo run --target wasm32-unknown-unknown --release
+   wasm-pack build --release --target web
+```
+ 
+This will build in pkg/
+ 
+And to test:
+ 
+ ```bash
+   python3 -m http.server 
+```
+
 ## Community
 
 Unhaunter has a Matrix room for discussion and collaboration. Access is by invitation only. To join, please contact deavid (@deavidsedice:matrix.org) on Matrix.

diff --git a/assets/img/gear_spritesheetA_48x48.aseprite b/assets/img/gear_spritesheetA_48x48.aseprite
diff --git a/assets/img/gear_spritesheetA_48x48.png b/assets/img/gear_spritesheetA_48x48.png
diff --git a/assets/img/salt_particle.png b/assets/img/salt_particle.png
diff --git a/assets/img/salt_pile.png b/assets/img/salt_pile.png
diff --git a/assets/img/smoke.png b/assets/img/smoke.png
diff --git a/assets/maps/tiled_maps.tiled-session b/assets/maps/tiled_maps.tiled-session
@@ -3,34 +3,34 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "atut02_glass_house.tmx",
+    "activeFile": "tut01_basics.tmx",
     "expandedProjectPaths": [
         "."
     ],
     "fileStates": {
         "/home/deavid/tiled/unhaunter_test2.tsx": {
             "scaleInDock": 1
         },
-        "atut01_basics.tmx": {
+        "tut01_basics.tmx": {
             "expandedGroupLayers": [
                 2
             ],
-            "scale": 1,
-            "selectedLayer": 4,
+            "scale": 3,
+            "selectedLayer": 5,
             "viewCenter": {
-                "x": 1535.5,
-                "y": 767.5
+                "x": 1536.1666666666665,
+                "y": 115.49999999999999
             }
         },
-        "atut02_glass_house.tmx": {
+        "tut02_glass_house.tmx": {
             "expandedGroupLayers": [
                 2
             ],
             "scale": 4,
             "selectedLayer": 9,
             "viewCenter": {
-                "x": 620.625,
-                "y": 244.625
+                "x": 596.125,
+                "y": 322.375
             }
         },
         "character1.tsx": {
@@ -68,8 +68,8 @@
             "scale": 4,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 1534.875,
-                "y": 801.375
+                "x": 1535.875,
+                "y": 767.875
             }
         },
         "map_school1.tmx": {
@@ -79,8 +79,8 @@
             "scale": 1,
             "selectedLayer": 8,
             "viewCenter": {
-                "x": 1189.5,
-                "y": 945.5
+                "x": 1536,
+                "y": 767.5
             }
         },
         "topdown.tsx": {
@@ -152,16 +152,17 @@
         "map_school1.tmx",
         "map_house1.tmx",
         "map_house2.tmx",
-        "atut02_glass_house.tmx"
+        "tut02_glass_house.tmx",
+        "tut01_basics.tmx"
     ],
     "project": "tiled_maps.tiled-project",
     "property.type": "string",
     "recentFiles": [
         "map_school1.tmx",
         "map_house1.tmx",
         "map_house2.tmx",
-        "atut02_glass_house.tmx",
-        "atut01_basics.tmx",
+        "tut02_glass_house.tmx",
+        "tut01_basics.tmx",
         "unhaunter_spritesheet2.tsx",
         "unhaunter_spritesheetA_6x6x10.tsx",
         "unhaunter_custom_tileset.tsx",

diff --git a/assets/maps/atut01_basics.tmx → assets/maps/tut01_basics.tmx b/assets/maps/atut01_basics.tmx → assets/maps/tut01_basics.tmx
@@ -670,13 +670,13 @@
   <layer id="10" name="FloorDecor" width="128" height="128">
    <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,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,2147483940,0,0,2147483709,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,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,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,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,2147483698,2147483698,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,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,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,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,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,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,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,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,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,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,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,271,0,0,0,2147483930,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,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,2147483697,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,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,271,0,0,0,2147483930,0,0,62,0,0,0,2147483937,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,2147483933,0,0,185,182,0,0,0,0,0,0,0,0,182,0,0,184,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,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,2147483831,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,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,
@@ -934,7 +934,7 @@
   <layer id="9" name="Switches" width="128" height="128">
    <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,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,2147483913,0,0,0,0,0,0,0,0,0,0,0,2147483913,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,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,2147483913,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,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,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,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,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,265,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,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,

diff --git a/assets/maps/atut02_glass_house.tmx → assets/maps/tut02_glass_house.tmx b/assets/maps/atut02_glass_house.tmx → assets/maps/tut02_glass_house.tmx
diff --git a/assets/sounds/quartz_crack.ogg b/assets/sounds/quartz_crack.ogg
diff --git a/assets/sounds/sage_activation.ogg b/assets/sounds/sage_activation.ogg
diff --git a/assets/sounds/salt_drop.ogg b/assets/sounds/salt_drop.ogg
diff --git a/src/behavior.rs b/src/behavior.rs
@@ -422,6 +422,7 @@ trait AutoSerialize: Serialize + for<'a> Deserialize<'a> + Default {
         let t = format!("\"{text}\"");
         serde_json::from_str(&t).context("Auto deserialize error")
     }
+    #[allow(dead_code)]
     fn to_text(&self) -> anyhow::Result<String> {
         // FIXME: This is not used at all.
         serde_json::to_string(self)
@@ -792,7 +793,7 @@ impl SpriteConfig {
         p.object.weight = NotNan::new(self.properties.get_float("object:weight")).unwrap();
         p.object.name = self.properties.get_string("object:name");
         if p.object.name.is_empty() {
-            p.object.name = self.variant.clone();
+            p.object.name.clone_from(&self.variant.clone());
         }
     }
 

diff --git a/src/board.rs b/src/board.rs
@@ -213,7 +213,7 @@ impl Position {
         BoardPosition {
             x: self.x.round() as i64,
             y: self.y.round() as i64,
-            z: self.z.round() as i64,
+            z: 0,
         }
     }
     pub fn rotate_by_dir(&self, dir: &Direction) -> Self {
@@ -1076,12 +1076,6 @@ pub fn boardfield_update(
     }
 }
 
-pub const DARK_GAMMA: f32 = 1.0;
-pub const LIGHT_GAMMA: f32 = 1.1;
-
-// pub const DARK_GAMMA: f32 = 1.5;
-// pub const LIGHT_GAMMA: f32 = 2.5;
-
 pub fn compute_color_exposure(
     rel_exposure: f32,
     dither: f32,

diff --git a/src/colors.rs b/src/colors.rs
@@ -17,3 +17,6 @@ pub const BUTTON_END_MISSION_BGCOLOR: Color = Color::rgba(0.224, 0.129, 0.122, 1
 pub const BUTTON_END_MISSION_FGCOLOR: Color = Color::rgba(0.388, 0.200, 0.169, 1.0);
 pub const BUTTON_END_MISSION_TXTCOLOR: Color = Color::rgba(0.851, 0.522, 0.275, 1.0);
 pub const DIALOG_TEXT_COLOR: Color = Color::rgba(1.0, 1.0, 1.0, 0.7);
+
+pub const MENU_ITEM_COLOR_ON: Color = Color::ORANGE_RED;
+pub const MENU_ITEM_COLOR_OFF: Color = Color::GRAY;