Implement lookup, add content data from mimex

Author: object-Object

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "submodules/mimex-data"]
+	path = submodules/mimex-data
+	url = https://github.com/cardillan/mimex-data

Cargo.lock

@@ -7,6 +7,7 @@ edition = "2024"
 base64 = "0.22.1"
 binrw = "0.15.0"
 cesu8 = "1.1.0"
+csv = "1.3.1"
 flate2 = { version = "1.1.2", features = ["zlib-rs"], default-features = false }
 indexmap = "2.10.0"
 itertools = "0.14.0"
@@ -17,7 +18,7 @@ num-traits = "0.2.19"
 rand = "0.9.2"
 regex = "1.11.1"
 seekable_reader = "0.1.2"
-serde = "1.0.219"
+serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.141"
 strum = "0.27.2"
 strum_macros = "0.27.2"

Cargo.toml

@@ -51,6 +51,11 @@ pub enum Instruction {
         if_true: Value,
         if_false: Value,
     },
+    Lookup {
+        content_type: ContentType,
+        result: Value,
+        id: Value,
+    },
     PackColor {
         result: Value,
         r: Value,
@@ -257,3 +262,5 @@ macro_rules! optional_args {
 }
 
 pub(super) use optional_args;
+
+use crate::types::ContentType;

src/logic/ast.rs

@@ -1,7 +1,7 @@
 // -*- mode: Rust; -*-
 
 use super::ast::*;
-use crate::types::colors::{COLORS, to_double_bits};
+use crate::types::{colors::{COLORS, to_double_bits}, ContentType};
 
 grammar;
 
@@ -21,6 +21,7 @@ match {
     "set",
     "op",
     "select",
+    "lookup",
     "packcolor",
     "unpackcolor",
     "noop",
@@ -99,6 +100,25 @@ match {
     "acos",
     "atan",
 
+    "item",
+    "block",
+    "mech_UNUSED",
+    "bullet",
+    "liquid",
+    "status",
+    "unit",
+    "weather",
+    "effect_UNUSED",
+    "sector",
+    "loadout_UNUSED",
+    "typeid_UNUSED",
+    "error",
+    "planet",
+    "ammo_UNUSED",
+    "team",
+    "unitCommand",
+    "unitStance",
+
     // https://github.com/Anuken/Arc/blob/071fdffaf220cd57cf971a0ee58db2f321f92ee1/arc-core/src/arc/util/Strings.java#L495
     // for example, -+1.--0. is a valid number literal
     r"(?x)
@@ -191,6 +211,9 @@ Instruction: Instruction = {
     "select" <result:Value> <op:ConditionOp2> <x:Value> <y:Value> <if_true:Value> <if_false:Value> =>
         Instruction::Select { <> },
 
+    "lookup" <content_type:ContentType> <result:Value> <id:Value> =>
+        Instruction::Lookup { <> },
+
     "packcolor" <result:Value> <r:Value> <g:Value> <b:Value> <a:Value> =>
         Instruction::PackColor { <> },
 
@@ -330,6 +353,27 @@ LogicOp2: LogicOp = {
     "logn"      => LogicOp::Logn,
 };
 
+ContentType: ContentType = {
+    "item"           => ContentType::Item,
+    "block"          => ContentType::Block,
+    "mech_UNUSED"    => ContentType::Mech,
+    "bullet"         => ContentType::Bullet,
+    "liquid"         => ContentType::Liquid,
+    "status"         => ContentType::Status,
+    "unit"           => ContentType::Unit,
+    "weather"        => ContentType::Weather,
+    "effect_UNUSED"  => ContentType::Effect,
+    "sector"         => ContentType::Sector,
+    "loadout_UNUSED" => ContentType::Loadout,
+    "typeid_UNUSED"  => ContentType::TypeID,
+    "error"          => ContentType::Error,
+    "planet"         => ContentType::Planet,
+    "ammo_UNUSED"    => ContentType::Ammo,
+    "team"           => ContentType::Team,
+    "unitCommand"    => ContentType::UnitCommand,
+    "unitStance"     => ContentType::UnitStance,
+}
+
 Value: Value = {
     <s:STRING> =>
         Value::String(s[1..s.len() - 1].replace(r"\n", "\n")),
@@ -396,6 +440,7 @@ Symbol = {
     "set",
     "op",
     "select",
+    "lookup",
     "packcolor",
     "unpackcolor",
     "noop",
@@ -473,4 +518,23 @@ Symbol = {
     "asin",
     "acos",
     "atan",
+
+    "item",
+    "block",
+    "mech_UNUSED",
+    "bullet",
+    "liquid",
+    "status",
+    "unit",
+    "weather",
+    "effect_UNUSED",
+    "sector",
+    "loadout_UNUSED",
+    "typeid_UNUSED",
+    "error",
+    "planet",
+    "ammo_UNUSED",
+    "team",
+    "unitCommand",
+    "unitStance",
 };

src/logic/grammar.lalrpop

@@ -1,7 +1,11 @@
 pub mod ast;
 mod vm;
 
-lalrpop_util::lalrpop_mod!(grammar, "/logic/grammar.rs");
+lalrpop_util::lalrpop_mod!(
+    #[allow(deprecated)]
+    grammar,
+    "/logic/grammar.rs"
+);
 
 pub use grammar::LogicParser;
 pub use vm::*;

src/logic/mod.rs

@@ -7,7 +7,7 @@ use super::{
     LogicVM, VMLoadError, VMLoadResult,
     processor::{Processor, ProcessorBuilder},
 };
-use crate::types::{Object, ProcessorConfig, SchematicTile};
+use crate::types::{Object, ProcessorConfig, SchematicTile, content};
 
 const MESSAGE_MAX_LEN: usize = 220;
 const MESSAGE_MAX_LINES: usize = 24;
@@ -79,6 +79,7 @@ impl Block {
                         privileged: false,
                         running_processors: Rc::clone(&vm.running_processors),
                         time: Rc::clone(&vm.time),
+                        globals: &vm.globals,
                         config,
                     }
                     .build()?,
@@ -93,6 +94,7 @@ impl Block {
                         privileged: false,
                         running_processors: Rc::clone(&vm.running_processors),
                         time: Rc::clone(&vm.time),
+                        globals: &vm.globals,
                         config,
                     }
                     .build()?,
@@ -107,6 +109,7 @@ impl Block {
                         privileged: false,
                         running_processors: Rc::clone(&vm.running_processors),
                         time: Rc::clone(&vm.time),
+                        globals: &vm.globals,
                         config,
                     }
                     .build()?,
@@ -121,6 +124,7 @@ impl Block {
                         privileged: true,
                         running_processors: Rc::clone(&vm.running_processors),
                         time: Rc::clone(&vm.time),
+                        globals: &vm.globals,
                         config,
                     }
                     .build()?,
@@ -148,7 +152,10 @@ impl Block {
                     block: block.clone(),
                     config: config.clone(),
                 },
-                1,
+                content::blocks::FROM_NAME
+                    .get(block.as_str())
+                    .map(|v| v.size)
+                    .unwrap_or(1),
             )),
         }
     }

src/logic/vm/blocks.rs

@@ -6,14 +6,18 @@ use noise::{NoiseFn, Simplex};
 use super::{
     LogicVM, VMLoadError, VMLoadResult,
     processor::{MAX_TEXT_BUFFER, ProcessorState},
-    variables::{LValue, LVar, RAD_DEG},
+    variables::{Content, LValue, LVar, RAD_DEG},
 };
 use crate::{
     logic::{
         ast::{self, ConditionOp, LogicOp},
         vm::variables::{F64_DEG_RAD, F64_RAD_DEG},
     },
-    types::colors::{f32_to_double_bits, f64_from_double_bits},
+    types::{
+        ContentType, Team,
+        colors::{f32_to_double_bits, f64_from_double_bits},
+        content,
+    },
 };
 
 const MAX_IPT: usize = 1000;
@@ -27,18 +31,23 @@ lazy_static! {
 pub fn parse_instruction(
     instruction: ast::Instruction,
     variables: &mut HashMap<String, LVar>,
+    globals: &HashMap<String, LVar>,
     labels: &HashMap<String, usize>,
     privileged: bool,
     num_instructions: usize,
 ) -> VMLoadResult<Box<dyn Instruction>> {
     // helpers
 
     let mut lvar = |value| match value {
-        ast::Value::Variable(name) => variables.get(&name).cloned().unwrap_or_else(|| {
-            let var = LVar::new_variable();
-            variables.insert(name, LVar::clone(&var));
-            var
-        }),
+        ast::Value::Variable(name) => {
+            if let Some(var) = globals.get(&name).or_else(|| variables.get(&name)) {
+                var.clone()
+            } else {
+                let var = LVar::new_variable();
+                variables.insert(name, LVar::clone(&var));
+                var
+            }
+        }
         ast::Value::String(value) => LVar::Constant(LValue::String(value.into())),
         ast::Value::Number(value) => LVar::Constant(value.into()),
         ast::Value::None => LVar::Constant(LValue::Null),
@@ -101,6 +110,15 @@ pub fn parse_instruction(
             if_true: lvar(if_true),
             if_false: lvar(if_false),
         }),
+        ast::Instruction::Lookup {
+            content_type,
+            result,
+            id,
+        } => Box::new(Lookup {
+            content_type,
+            result: lvar(result),
+            id: lvar(id),
+        }),
         ast::Instruction::PackColor { result, r, g, b, a } => Box::new(PackColor {
             result: lvar(result),
             r: lvar(r),
@@ -186,6 +204,8 @@ impl Print {
                 })
             }
             LValue::String(s) => Cow::Borrowed(s),
+            LValue::Content(content) => Cow::Borrowed(content.name()),
+            LValue::Team(team) => team.name(),
         }
     }
 }
@@ -368,6 +388,46 @@ impl SimpleInstruction for Select {
     }
 }
 
+struct Lookup {
+    content_type: ContentType,
+    result: LVar,
+    id: LVar,
+}
+
+impl SimpleInstruction for Lookup {
+    fn execute(&self, state: &mut ProcessorState, _: &LogicVM) {
+        let id = self.id.get(state).num() as i32;
+
+        let result = match self.content_type {
+            ContentType::Block => content::blocks::FROM_LOGIC_ID
+                .get(&id)
+                .map(|v| Content::Block(v))
+                .into(),
+
+            ContentType::Item => content::items::FROM_LOGIC_ID
+                .get(&id)
+                .map(|v| Content::Item(v))
+                .into(),
+
+            ContentType::Liquid => content::liquids::FROM_LOGIC_ID
+                .get(&id)
+                .map(|v| Content::Liquid(v))
+                .into(),
+
+            ContentType::Unit => content::units::FROM_LOGIC_ID
+                .get(&id)
+                .map(|v| Content::Unit(v))
+                .into(),
+
+            ContentType::Team => id.try_into().ok().map(Team::from_id).into(),
+
+            _ => LValue::Null,
+        };
+
+        self.result.set(state, result);
+    }
+}
+
 struct PackColor {
     result: LVar,
     r: LVar,