wip

assets/items.json

@@ -8,84 +8,5 @@
     "name": "cereal",
     "label": "Cereal"
   },
-  {
-    "name": "flour",
-    "label": "Flour"
-  },
-  {
-    "name": "bread",
-    "label": "Bread"
-  },
-  {
-    "name": "vegetable",
-    "label": "Vegetable"
-  },
-  {
-    "name": "carcass",
-    "label": "Carcass"
-  },
-  {
-    "name": "raw-meat",
-    "label": "Raw meat"
-  },
-  {
-    "name": "meat",
-    "label": "Meat"
-  },
-  {
-    "name": "tree-log",
-    "label": "Tree Log"
-  },
-  {
-    "name": "wood-plank",
-    "label": "Wood Plank"
-  },
-  {
-    "name": "iron-ore",
-    "label": "Iron Ore"
-  },
-  {
-    "name": "metal",
-    "label": "Metal"
-  },
-  {
-    "name": "gold",
-    "label": "Gold"
-  },
-  {
-    "name": "high-tech-product",
-    "label": "High Tech Product"
-  },
-  {
-    "name": "furniture",
-    "label": "Furniture"
-  },
-  {
-    "name": "flower",
-    "label": "Flower"
-  },
-  {
-    "name": "wool",
-    "label": "Wool"
-  },
-  {
-    "name": "cloth",
-    "label": "Cloth"
-  },
-  {
-    "name": "oil",
-    "label": "Oil"
-  },
-  {
-    "name": "coal",
-    "label": "Coal"
-  },
-  {
-    "name": "electricity",
-    "label": "Electricity"
-  },
-  {
-    "name": "polyester",
-    "label": "Polyester"
-  }
+
 ]

assets_gui/src/companies.rs

@@ -1,9 +1,9 @@
 use common::saveload::Encoder;
-use prototypes::GoodsCompanyDescriptionJSON;
+use prototypes::GoodsCompanyPrototypeJSON;
 use std::io;
 
 pub struct Companies {
-    pub companies: Vec<GoodsCompanyDescriptionJSON>,
+    pub companies: Vec<GoodsCompanyPrototypeJSON>,
     pub changed: bool,
 }
 

base/data.lua

@@ -0,0 +1 @@
+require("items")

base/items.lua

@@ -0,0 +1,113 @@
+data:extend {
+    {
+        type = "item",
+        name = "job-opening",
+        label = "Job opening",
+        optout_exttrade = true
+    },
+    {
+        type = "item",
+        name = "cereal",
+        label = "Cereal"
+    },
+    {
+        type = "item",
+        name = "flour",
+        label = "Flour"
+    },
+    {
+        type = "item",
+        name = "bread",
+        label = "Bread"
+    },
+    {
+        type = "item",
+        name = "vegetable",
+        label = "Vegetable"
+    },
+    {
+        type = "item",
+        name = "carcass",
+        label = "Carcass"
+    },
+    {
+        type = "item",
+        name = "raw-meat",
+        label = "Raw meat"
+    },
+    {
+        type = "item",
+        name = "meat",
+        label = "Meat"
+    },
+    {
+        type = "item",
+        name = "tree-log",
+        label = "Tree Log"
+    },
+    {
+        type = "item",
+        name = "wood-plank",
+        label = "Wood Plank"
+    },
+    {
+        type = "item",
+        name = "iron-ore",
+        label = "Iron Ore"
+    },
+    {
+        type = "item",
+        name = "metal",
+        label = "Metal"
+    },
+    {
+        type = "item",
+        name = "gold",
+        label = "Gold"
+    },
+    {
+        type = "item",
+        name = "high-tech-product",
+        label = "High Tech Product"
+    },
+    {
+        type = "item",
+        name = "furniture",
+        label = "Furniture"
+    },
+    {
+        type = "item",
+        name = "flower",
+        label = "Flower"
+    },
+    {
+        type = "item",
+        name = "wool",
+        label = "Wool"
+    },
+    {
+        type = "item",
+        name = "cloth",
+        label = "Cloth"
+    },
+    {
+        type = "item",
+        name = "oil",
+        label = "Oil"
+    },
+    {
+        type = "item",
+        name = "coal",
+        label = "Coal"
+    },
+    {
+        type = "item",
+        name = "electricity",
+        label = "Electricity"
+    },
+    {
+        type = "item",
+        name = "polyester",
+        label = "Polyester"
+    }
+}

common/src/lib.rs

@@ -231,6 +231,16 @@ pub fn fastset_with_capacity<V>(cap: usize) -> FastSet<V> {
     FastSet::with_capacity_and_hasher(cap, Default::default())
 }
 
+pub type TransparentMap<K, V> = std::collections::HashMap<K, V, TransparentHasherU64>;
+
+pub fn transparentmap_with_capacity<K, V>(cap: usize) -> TransparentMap<K, V> {
+    TransparentMap::with_capacity_and_hasher(cap, Default::default())
+}
+
+pub fn transparentmap<K, V>() -> TransparentMap<K, V> {
+    TransparentMap::with_hasher(Default::default())
+}
+
 #[derive(Default)]
 pub struct TransparentHasherU64(u64);
 

common/src/timestep.rs

@@ -4,7 +4,7 @@ pub const UP_DT: Duration = Duration::from_millis(20);
 
 /// A timestep that can be used to update the game state.
 /// It will try to keep a constant update rate.
-/// Based on https://gafferongames.com/post/fix_your_timestep/
+/// Based on <https://gafferongames.com/post/fix_your_timestep/>
 pub struct Timestep {
     last_time: Instant,
     acc: Duration,

geom/Cargo.toml

@@ -8,7 +8,8 @@ edition = "2021"
 
 [dependencies]
 ordered-float = { workspace = true }
-serde = { version = "1.0", features = ["derive"] }
+serde         = { version = "1.0", features = ["derive"] }
 fnv           = "1.0.3"
-inline_tweak = "1.0.8"
-flat_spatial = { workspace = true }
+inline_tweak  = "1.0.8"
+flat_spatial  = { workspace = true }
+mlua          = "0.9.4"

geom/src/aabb3.rs

@@ -137,7 +137,7 @@ impl AABB3 {
 
     /// as ray is defined by O + tD, return the t values for the entering and exiting intersections
     /// Returns a 2-tuple of (t_near, t_far)
-    /// Adapted from https://gist.github.com/DomNomNom/46bb1ce47f68d255fd5d
+    /// Adapted from <https://gist.github.com/DomNomNom/46bb1ce47f68d255fd5d>
     /// If the ray origin is inside the box, t_near will be zero
     #[inline]
     pub fn raycast(&self, ray: Ray3) -> Option<(f32, f32)> {

geom/src/v2.rs

@@ -1,4 +1,5 @@
 use crate::{Circle, Intersect, Polygon, Radians, Shape, Vec3, Vec3d, AABB, OBB};
+use mlua::{FromLua, Value};
 use serde::{Deserialize, Deserializer, Serialize};
 use std::fmt::{Debug, Display, Formatter};
 use std::hash::{Hash, Hasher};
@@ -1170,6 +1171,29 @@ impl From<[f64; 2]> for Vec2d {
     }
 }
 
+impl<'a> FromLua<'a> for Vec2 {
+    fn from_lua(value: Value<'a>, _: &'a mlua::Lua) -> mlua::Result<Self> {
+        let t = match value {
+            Value::Vector(v) => return Ok(Self { x: v.x(), y: v.y() }),
+            Value::Table(t) => t,
+            _ => {
+                return Err(mlua::Error::FromLuaConversionError {
+                    from: value.type_name(),
+                    to: "Vec2",
+                    message: Some("expected a table or vector".to_string()),
+                })
+            }
+        };
+        if let Ok(x) = t.get(1) {
+            return Ok(Self { x, y: t.get(2)? });
+        }
+
+        let x = t.get("x")?;
+        let y = t.get("y")?;
+        Ok(Vec2::new(x, y))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;