mirror/iw4L
1
0
Fork 0
mirror of https://github.com/vladtrc/iw4L synced 2026-10-26 02:11:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bind localized string table lookups by row

Browse Source
This commit is contained in:
Bulat Fatykh
2026-10-01 16:41:40 +03:00
parent ff7369ffa6
commit 74f0dbef96
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/sim/src/script/host/natives/math.rs
+5 -9
View File
@@ -1,6 +1,6 @@
use super::super::args::{arg, float, int, kind, optional, string, vector};
use super::super::arrays::{array_values, new_array};
use super::super::tables::{table, table_lookup, table_search};
use super::super::tables::{table, table_lookup, table_lookup_by_row, table_search};
use super::iw4::atoi;
use crate::script::{ArrayKey, Namespace, NativeRegistry, Runtime, Value};
use bevy_ecs::prelude::World;
@@ -285,14 +285,10 @@ pub(crate) fn register(registry: &mut NativeRegistry) {
Ok(Value::LocalizedString(table_lookup(world, args)?.into()))
});
registry.register(Function, "tablelookupbyrow", |world, _, args| {
let tables = world.resource::<Runtime>().tables.clone();
let name = string(args, 0)?;
let (row, column) = (int(args, 1)?, int(args, 2)?);
let value = table(&tables, &name)
.filter(|_| row >= 0 && column >= 0)
.and_then(|t| t.cell(row as usize, column as usize))
.unwrap_or("");
Ok(Value::string(value))
Ok(Value::String(table_lookup_by_row(world, args)?))
});
registry.register(Function, "tablelookupistringbyrow", |world, _, args| {
Ok(Value::LocalizedString(table_lookup_by_row(world, args)?))
});
registry.register(Function, "tablelookuprownum", |world, _, args| {
let tables = world.resource::<Runtime>().tables.clone();
crates/sim/src/script/host/tables.rs
+12
View File
@@ -3,6 +3,7 @@ use super::entities::table_key;
use crate::script::{Runtime, StringTable, Value};
use bevy_ecs::prelude::World;
use std::collections::BTreeMap;
use std::sync::Arc;
pub(super) fn table<'a>(
tables: &'a BTreeMap<String, StringTable>,
@@ -48,3 +49,14 @@ pub(crate) fn table_lookup(world: &World, args: &[Value]) -> Result<String, Stri
.unwrap_or("")
.to_owned())
}
pub(crate) fn table_lookup_by_row(world: &World, args: &[Value]) -> Result<Arc<str>, String> {
let tables = world.resource::<Runtime>().tables.clone();
let name = string(args, 0)?;
let (row, column) = (int(args, 1)?, int(args, 2)?);
Ok(table(&tables, &name)
.filter(|_| row >= 0 && column >= 0)
.and_then(|t| t.cell(row as usize, column as usize))
.unwrap_or("")
.into())
}