remove powderlimit field entirely and make it automatically find based on num of powders (it's useless anyway)

This commit is contained in:
endernon 2025-01-01 14:21:10 +00:00
parent 501bacc7f3
commit b4f61b9eb1
3 changed files with 2 additions and 4 deletions

View file

@ -19,7 +19,6 @@
{"id": "rawSpellDamage", "base":222 , "roll":130 }, {"id": "rawSpellDamage", "base":222 , "roll":130 },
{"id": "spellDamage", "base":10 , "roll":130 } {"id": "spellDamage", "base":10 , "roll":130 }
], ],
"powder_limit": 10,
"powders": [ "powders": [
{"type":"E", "tier":6}, {"type":"E", "tier":6},
{"type":"T", "tier":6}, {"type":"T", "tier":6},

View file

@ -215,13 +215,13 @@ fn cook(
dbg!(&powdervec); dbg!(&powdervec);
} }
let real_powderlimit = json_config.powder_limit.ok_or(PowderLimitNotPresent)?; let powderlimitfr: u8 = powdervec.len() as u8;
// ENCODE: PowderData // ENCODE: PowderData
// only occurs if the powders array is present and the powder limit is also present // only occurs if the powders array is present and the powder limit is also present
// //
PowderData { PowderData {
powder_slots: real_powderlimit, powder_slots: powderlimitfr,
powders: powdervec, powders: powdervec,
} }
.encode(ver, out) .encode(ver, out)

View file

@ -20,7 +20,6 @@ pub struct Jsonconfig {
pub name: Option<String>, pub name: Option<String>,
pub shiny: Option<Shinyjson>, pub shiny: Option<Shinyjson>,
pub ids: Option<Vec<Identificationer>>, pub ids: Option<Vec<Identificationer>>,
pub powder_limit: Option<u8>,
pub powders: Option<Vec<Powder>>, pub powders: Option<Vec<Powder>>,
pub rerolls: Option<u8>, pub rerolls: Option<u8>,
} }