Compare commits
No commits in common. "main" and "v0.5.0" have entirely different histories.
7 changed files with 190 additions and 218 deletions
89
Cargo.lock
generated
89
Cargo.lock
generated
|
|
@ -58,12 +58,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "anstyle-wincon"
|
||||
version = "3.0.7"
|
||||
version = "3.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
|
||||
checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"once_cell",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
|
|
@ -102,9 +101,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
|||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.8.0"
|
||||
version = "2.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
|
||||
checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
|
||||
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
|
|
@ -129,9 +128,9 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
|
|||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.10"
|
||||
version = "1.2.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
|
||||
checksum = "ad0cf6e91fde44c773c6ee7ec6bba798504641a8bc2eb7e37a04ffbf4dfaa55a"
|
||||
dependencies = [
|
||||
"shlex",
|
||||
]
|
||||
|
|
@ -144,9 +143,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.26"
|
||||
version = "4.5.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
|
||||
checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
|
|
@ -154,9 +153,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.26"
|
||||
version = "4.5.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
|
||||
checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
|
|
@ -645,7 +644,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "idmangler-cli"
|
||||
version = "0.5.0"
|
||||
version = "0.4.3"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"idmangler-lib",
|
||||
|
|
@ -717,9 +716,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
|
|||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.77"
|
||||
version = "0.3.76"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
|
||||
checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -745,9 +744,9 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
|
|||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.25"
|
||||
version = "0.4.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
|
||||
checksum = "3d6ea2a48c204030ee31a7d7fc72c93294c92fe87ecb1789881c9543516e1a0d"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
|
|
@ -763,9 +762,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
|||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.8.3"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
|
||||
checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
|
||||
dependencies = [
|
||||
"adler2",
|
||||
]
|
||||
|
|
@ -928,9 +927,9 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.93"
|
||||
version = "1.0.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
|
||||
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -1062,12 +1061,6 @@ dependencies = [
|
|||
"untrusted",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.18"
|
||||
|
|
@ -1229,9 +1222,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.96"
|
||||
version = "2.0.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
|
||||
checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1295,18 +1288,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "2.0.11"
|
||||
version = "2.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
|
||||
checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "2.0.11"
|
||||
version = "2.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
|
||||
checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1505,21 +1498,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.100"
|
||||
version = "0.2.99"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
|
||||
checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
"rustversion",
|
||||
"wasm-bindgen-macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.100"
|
||||
version = "0.2.99"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
|
||||
checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
|
|
@ -1531,9 +1523,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.50"
|
||||
version = "0.4.49"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
|
||||
checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
|
|
@ -1544,9 +1536,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.100"
|
||||
version = "0.2.99"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
|
||||
checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
|
|
@ -1554,9 +1546,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.100"
|
||||
version = "0.2.99"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
|
||||
checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1567,18 +1559,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.100"
|
||||
version = "0.2.99"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
|
||||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.77"
|
||||
version = "0.3.76"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
|
||||
checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
[package]
|
||||
name = "idmangler-cli"
|
||||
authors = ["endernon"]
|
||||
version = "0.5.0"
|
||||
version = "0.4.3"
|
||||
edition = "2021"
|
||||
readme = "README.md"
|
||||
license = "MIT"
|
||||
description = "A cli tool to generate fake wynntils items"
|
||||
|
||||
[dependencies]
|
||||
clap = { version = "4.5.26", features = ["derive"] }
|
||||
clap = { version = "4.5.20", features = ["derive"] }
|
||||
idmangler-lib = { version = "0.5.0", features = ["serde"] }
|
||||
reqwest = { version = "0.12.9", features = ["blocking", "json"] }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0.135"
|
||||
serde_json5 = "0.1.0"
|
||||
thiserror = "2.0.11"
|
||||
thiserror = "2.0.9"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ mkdir -p product
|
|||
|
||||
cp ./target/x86_64-pc-windows-gnu/release/idmangler-cli.exe ./product/idmangler-cli.exe
|
||||
cp ./target/x86_64-unknown-linux-gnu/release/idmangler-cli ./product/idmangler-cli
|
||||
cp -r ./example_configs ./product/
|
||||
cp -u -p ./example_configs ./product/
|
||||
|
||||
pkgversion=$(cargo metadata --format-version=1 --no-deps | jq '.packages[] | select(.name == "idmangler-cli") | .version')
|
||||
echo "package version is:"
|
||||
|
|
@ -16,5 +16,5 @@ echo "$balls2"
|
|||
|
||||
cd product
|
||||
|
||||
zip "idmangler-windows-x64-${balls2}.zip" ./example_configs/ idmangler-cli.exe
|
||||
zip "idmangler-linux-x64-${balls2}.zip" ./example_configs/ idmangler-cli
|
||||
zip "idmangler-windows-x64-${balls2}.zip" example_configs idmangler-cli.exe
|
||||
zip "idmangler-linux-x64-${balls2}.zip" example_configs idmangler-cli
|
||||
|
|
|
|||
266
src/encode.rs
266
src/encode.rs
|
|
@ -1,156 +1,29 @@
|
|||
use crate::errorfr::Errorfr;
|
||||
use crate::jsonstruct::{CraftedTypesFr, Durability, Identificationer, ItemTypeDeser, PowderFr, RequirementsDeser, Shinyjson, Shinystruct};
|
||||
use crate::jsonstruct::{CraftedTypesFr, Durability, FuncParams, Identificationer, ItemTypeDeser, PowderFr, RequirementsDeser, Shinyjson, Shinystruct};
|
||||
use idmangler_lib::encoding::DataEncoder;
|
||||
use idmangler_lib::{
|
||||
block::{CraftedConsumableTypeData, CraftedGearTypeData, DurabilityData, EndData, IdentificationData, NameData, PowderData, RequirementsData, RerollData, ShinyData, StartData, TypeData},
|
||||
types::{ClassType, Element, ItemType, Powder, RollType, SkillType, Stat},
|
||||
};
|
||||
use std::collections::HashMap;
|
||||
use idmangler_lib::types::EncodingVersion;
|
||||
|
||||
/// FuncParams struct, used for the three most important parameters for encoding.
|
||||
/// Also, all the encode functions are stored here, seeing as I require these three params most of the time when encoding.
|
||||
#[derive(PartialEq, Eq, Hash, Debug)]
|
||||
pub struct FuncParams<'a> {
|
||||
pub fr_out: &'a mut Vec<u8>,
|
||||
pub fr_debug_mode: &'a bool,
|
||||
pub fr_ver: EncodingVersion,
|
||||
}
|
||||
impl FuncParams<'_> {
|
||||
/// ENCODE: StartData
|
||||
/// (REQUIRED)
|
||||
pub fn encode_startdata(&mut self) -> Result<(), Errorfr> {
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding StartData")
|
||||
}
|
||||
// ENCODE: StartData
|
||||
StartData(self.fr_ver).encode(self.fr_ver, self.fr_out).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: TypeData
|
||||
/// (REQUIRED)
|
||||
pub fn encode_typedata(&mut self, item_type_deser: ItemTypeDeser) -> Result<(), Errorfr> {
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding TypeData: {:?}", item_type_deser);
|
||||
}
|
||||
// ENCODE: TypeData
|
||||
TypeData(ItemType::from(item_type_deser)).encode(self.fr_ver, self.fr_out).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: NameData
|
||||
pub fn encode_namedata(&mut self, real_name: &str) -> Result<(), Errorfr> {
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding NameData: {:?}", &real_name)
|
||||
}
|
||||
NameData(real_name.trim().to_string()).encode(self.fr_ver, self.fr_out).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: IdentificationData
|
||||
pub fn encode_iddata(&mut self, real_ids: &Vec<Identificationer>, idsmap: HashMap<String, u8>) -> Result<(), Errorfr> {
|
||||
let mut idvec = Vec::new();
|
||||
for eachid in real_ids {
|
||||
let id_id = idsmap.get(eachid.id.trim());
|
||||
let id_base = eachid.base;
|
||||
let id_roll = eachid.roll;
|
||||
|
||||
idvec.push(Stat {
|
||||
kind: match id_id {
|
||||
Some(ide) => *ide,
|
||||
None => std::panic!("There is a mismatched ID, and this message has replaced where the line is meant to be"),
|
||||
},
|
||||
base: Some(id_base),
|
||||
roll: match id_roll {
|
||||
Some(rolle) => RollType::Value(rolle),
|
||||
None => RollType::PreIdentified,
|
||||
},
|
||||
});
|
||||
}
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding IdentificationData: {:?}", &idvec)
|
||||
}
|
||||
IdentificationData {
|
||||
identifications: idvec,
|
||||
extended_encoding: true,
|
||||
}
|
||||
.encode(self.fr_ver, self.fr_out)
|
||||
.unwrap();
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: PowderData
|
||||
pub fn encode_powderdata(&mut self, real_powders: &Vec<PowderFr>) -> Result<(), Errorfr> {
|
||||
let mut powdervec = Vec::new();
|
||||
for eachpowder in real_powders {
|
||||
let powderamount: u8 = eachpowder.amount.unwrap_or(1);
|
||||
// match for the powder type
|
||||
for _ in 0..powderamount {
|
||||
let eletype = match eachpowder.r#type.to_ascii_lowercase() {
|
||||
'e' => Element::Earth,
|
||||
't' => Element::Thunder,
|
||||
'w' => Element::Water,
|
||||
'f' => Element::Fire,
|
||||
'a' => Element::Air,
|
||||
_ => return Err(Errorfr::JsonUnknownPowderElement),
|
||||
};
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(eletype);
|
||||
}
|
||||
powdervec.push(Powder::new(eletype, 6).map_err(|_| Errorfr::JsonUnknownPowderTier)?);
|
||||
// 6 is the tier. Wynntils ONLY really uses tier 6 so theres no point keeping others.
|
||||
}
|
||||
}
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(&powdervec);
|
||||
}
|
||||
|
||||
let powderlimitfr: u8 = powdervec.len() as u8; // min of the current number of powders and 255 (if you have over 255 powders stuff breaks)
|
||||
|
||||
PowderData {
|
||||
powder_slots: powderlimitfr,
|
||||
powders: powdervec,
|
||||
}
|
||||
.encode(self.fr_ver, self.fr_out)
|
||||
.unwrap();
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: RerollData
|
||||
pub fn encode_rerolldata(&mut self, rerollcount: u8) -> Result<(), Errorfr> {
|
||||
if rerollcount != 0 {
|
||||
RerollData(rerollcount).encode(self.fr_ver, self.fr_out).unwrap();
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(rerollcount);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: ShinyData
|
||||
pub fn encode_shinydata(&mut self, shiny: &Shinyjson, json_shiny: &Vec<Shinystruct>) -> Result<(), Errorfr> {
|
||||
let mut realshinykey: u8;
|
||||
let _shinykey = &shiny.key;
|
||||
let shinyvalue = shiny.value;
|
||||
realshinykey = 1;
|
||||
for i in json_shiny {
|
||||
if i.key == shiny.key {
|
||||
realshinykey = i.id;
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(&shiny.key);
|
||||
}
|
||||
}
|
||||
}
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(&realshinykey);
|
||||
dbg!(&shinyvalue);
|
||||
}
|
||||
ShinyData { id: realshinykey, val: shinyvalue }.encode(self.fr_ver, self.fr_out).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: EndData
|
||||
/// (REQUIRED)
|
||||
pub fn encode_enddata(&mut self) -> Result<(), Errorfr> {
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding EndData")
|
||||
}
|
||||
EndData.encode(self.fr_ver, self.fr_out).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: CraftedConsumableTypeData or CraftedGearTypeData based on Type
|
||||
pub fn encode_typedata_custom(&mut self, crafted_type: &str) -> Result<(), Errorfr> {
|
||||
let frfr_type = CraftedTypesFr::try_from(crafted_type)?;
|
||||
match frfr_type {
|
||||
|
|
@ -169,18 +42,6 @@ impl FuncParams<'_> {
|
|||
}
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: DamageData
|
||||
/// (CRAFTED ONLY)
|
||||
pub fn encode_damagedata(&mut self) -> Result<(), Errorfr> {
|
||||
unimplemented!();
|
||||
}
|
||||
/// ENCODE: DefenseData
|
||||
/// (CRAFTED ONLY)
|
||||
pub fn encode_defensedata(&mut self) -> Result<(), Errorfr> {
|
||||
unimplemented!();
|
||||
}
|
||||
/// ENCODE: DurabilityData
|
||||
/// (CRAFTED ONLY)
|
||||
pub fn encode_duradata(&mut self, real_dura: &Durability) -> Result<(), Errorfr> {
|
||||
let effect_strength_fr: u8; // but actually it should be 0 to 100, not 0 to 255. But i dunno how to use u7 data type.
|
||||
if let Some(effstr) = real_dura.effect_strength {
|
||||
|
|
@ -241,7 +102,6 @@ impl FuncParams<'_> {
|
|||
.unwrap();
|
||||
Ok(())
|
||||
}
|
||||
/// ENCODE: RequirementsData
|
||||
pub fn encode_reqdata(&mut self, real_reqdata: RequirementsDeser) -> Result<(), Errorfr> {
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding RequirementData.Level: {:?}", real_reqdata.level.clone())
|
||||
|
|
@ -272,5 +132,125 @@ impl FuncParams<'_> {
|
|||
.unwrap();
|
||||
Ok(())
|
||||
}
|
||||
pub fn encode_namedata(&mut self, real_name: &str) -> Result<(), Errorfr> {
|
||||
// ENCODE: NameData
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding NameData: {:?}", &real_name)
|
||||
}
|
||||
NameData(real_name.trim().to_string()).encode(self.fr_ver, self.fr_out).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
pub fn encode_iddata(&mut self, real_ids: &Vec<Identificationer>, idsmap: HashMap<String, u8>) -> Result<(), Errorfr> {
|
||||
let mut idvec = Vec::new();
|
||||
for eachid in real_ids {
|
||||
let id_id = idsmap.get(eachid.id.trim());
|
||||
let id_base = eachid.base;
|
||||
let id_roll = eachid.roll;
|
||||
|
||||
idvec.push(Stat {
|
||||
kind: match id_id {
|
||||
Some(ide) => *ide,
|
||||
None => std::panic!("There is a mismatched ID, and this message has replaced where the line is meant to be"),
|
||||
},
|
||||
base: Some(id_base),
|
||||
roll: match id_roll {
|
||||
Some(rolle) => RollType::Value(rolle),
|
||||
None => RollType::PreIdentified,
|
||||
},
|
||||
});
|
||||
|
||||
// println!("{:?} {:?} {:?}",id_id,id_base,id_roll)
|
||||
}
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding IdentificationData: {:?}", &idvec)
|
||||
}
|
||||
// ENCODE: IdentificationsData
|
||||
IdentificationData {
|
||||
identifications: idvec,
|
||||
extended_encoding: true,
|
||||
}
|
||||
.encode(self.fr_ver, self.fr_out)
|
||||
.unwrap();
|
||||
Ok(())
|
||||
}
|
||||
pub fn encode_powderdata(&mut self, real_powders: &Vec<PowderFr>) -> Result<(), Errorfr> {
|
||||
let mut powdervec = Vec::new();
|
||||
for eachpowder in real_powders {
|
||||
let powderamount: u8 = eachpowder.amount.unwrap_or(1);
|
||||
// match for the powder type
|
||||
for _ in 0..powderamount {
|
||||
let eletype = match eachpowder.r#type.to_ascii_lowercase() {
|
||||
'e' => Element::Earth,
|
||||
't' => Element::Thunder,
|
||||
'w' => Element::Water,
|
||||
'f' => Element::Fire,
|
||||
'a' => Element::Air,
|
||||
_ => return Err(Errorfr::JsonUnknownPowderElement),
|
||||
};
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(eletype);
|
||||
}
|
||||
powdervec.push(Powder::new(eletype, 6).map_err(|_| Errorfr::JsonUnknownPowderTier)?);
|
||||
// 6 is the tier. Wynntils ONLY really uses tier 6 so theres no point keeping others.
|
||||
}
|
||||
}
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(&powdervec);
|
||||
}
|
||||
|
||||
let powderlimitfr: u8 = powdervec.len() as u8; // min of the current number of powders and 255 (if you have over 255 powders stuff breaks)
|
||||
|
||||
// ENCODE: PowderData
|
||||
// only occurs if the powders array is present and the powder limit is also present
|
||||
//
|
||||
PowderData {
|
||||
powder_slots: powderlimitfr,
|
||||
powders: powdervec,
|
||||
}
|
||||
.encode(self.fr_ver, self.fr_out)
|
||||
.unwrap();
|
||||
Ok(())
|
||||
}
|
||||
pub fn encode_rerolldata(&mut self, rerollcount: u8) -> Result<(), Errorfr> {
|
||||
if rerollcount != 0 {
|
||||
// ENCODE: RerollData if applicable
|
||||
RerollData(rerollcount).encode(self.fr_ver, self.fr_out).unwrap();
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(rerollcount);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
pub fn encode_shinydata(&mut self, shiny: &Shinyjson, json_shiny: &Vec<Shinystruct>) -> Result<(), Errorfr> {
|
||||
let mut realshinykey: u8;
|
||||
let _shinykey = &shiny.key;
|
||||
let shinyvalue = shiny.value;
|
||||
realshinykey = 1;
|
||||
for i in json_shiny {
|
||||
if i.key == shiny.key {
|
||||
realshinykey = i.id;
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(&shiny.key);
|
||||
}
|
||||
}
|
||||
}
|
||||
if *self.fr_debug_mode {
|
||||
dbg!(&realshinykey);
|
||||
dbg!(&shinyvalue);
|
||||
}
|
||||
// ENCODE: ShinyData (if applicable)
|
||||
ShinyData { id: realshinykey, val: shinyvalue }.encode(self.fr_ver, self.fr_out).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
pub fn encode_enddata(&mut self) -> Result<(), Errorfr> {
|
||||
if *self.fr_debug_mode {
|
||||
println!("Encoding EndData")
|
||||
}
|
||||
// ENCODE: EndData
|
||||
EndData.encode(self.fr_ver, self.fr_out).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
pub fn encode_damagedata(&mut self) -> Result<(), Errorfr> {
|
||||
unimplemented!();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ pub struct GearJsonItemInnerStruct {
|
|||
raw: i32
|
||||
}
|
||||
|
||||
/// Function to generate a perfect item.
|
||||
/// It returns Result\<Vec\<Identificationer\>, Errorfr\>
|
||||
pub fn gen_perfect(name: &str, frjson: &HashMap<String, GearJsonItem>) -> Result<Vec<Identificationer>, Errorfr> {
|
||||
let mut a: Vec<Identificationer> = Vec::new();
|
||||
let name = name.to_lowercase();
|
||||
|
|
|
|||
|
|
@ -203,6 +203,14 @@ pub struct Shinyjson {
|
|||
pub value: i64,
|
||||
}
|
||||
|
||||
// struct for general parameters for most encode functions
|
||||
#[derive(PartialEq, Eq, Hash, Debug)]
|
||||
pub struct FuncParams<'a> {
|
||||
pub fr_out: &'a mut Vec<u8>,
|
||||
pub fr_debug_mode: &'a bool,
|
||||
pub fr_ver: EncodingVersion,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone)]
|
||||
pub struct DamageDeser {
|
||||
pub attack_speed: AttackSpeed,
|
||||
|
|
|
|||
21
src/main.rs
21
src/main.rs
|
|
@ -7,15 +7,13 @@ mod gearjson;
|
|||
mod jsondl;
|
||||
mod jsonstruct;
|
||||
use crate::errorfr::Errorfr;
|
||||
use crate::encode::FuncParams;
|
||||
use crate::jsondl::*;
|
||||
use crate::jsonstruct::*;
|
||||
use crate::gearjson::gen_perfect;
|
||||
use clap::Parser;
|
||||
use idmangler_lib::{encoding::string::encode_string, types::EncodingVersion};
|
||||
use reqwest::Url;
|
||||
use std::{collections::HashMap, env, fs, io::Write, path::PathBuf};
|
||||
|
||||
use crate::gearjson::gen_perfect;
|
||||
|
||||
#[derive(Parser, Debug, Clone)]
|
||||
#[command(version, about, long_about = None, arg_required_else_help(true))]
|
||||
|
|
@ -125,15 +123,10 @@ fn main_2() -> Result<(), Errorfr> {
|
|||
|
||||
let mut loaded_config_clone = loaded_config.clone();
|
||||
|
||||
let mut funcparamsfr: FuncParams = FuncParams {
|
||||
fr_out: &mut out,
|
||||
fr_debug_mode: &debug_mode,
|
||||
fr_ver: ver,
|
||||
};
|
||||
|
||||
// ENCODE: A Lot Of Stuff
|
||||
// Also print any mapped errors
|
||||
let cooking = cook(&mut funcparamsfr, &mut loaded_config_clone, loaded_idkeys, loaded_shinystats, namefr, executable_path);
|
||||
let cooking = cook(&mut out, &debug_mode, ver, &mut loaded_config_clone, loaded_idkeys, loaded_shinystats, namefr, executable_path);
|
||||
if let Err(e) = cooking {
|
||||
println!("{}", e); // print error if there is an error
|
||||
} else {
|
||||
|
|
@ -144,8 +137,12 @@ fn main_2() -> Result<(), Errorfr> {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
fn cook(fr_params: &mut FuncParams, json_config: &mut Jsonconfig, idsmap: HashMap<String, u8>, json_shiny: Vec<Shinystruct>, namefr: String, executable_path: &str) -> Result<String, Errorfr> {
|
||||
|
||||
fn cook(out: &mut Vec<u8>, debug_mode: &bool, ver: EncodingVersion, json_config: &mut Jsonconfig, idsmap: HashMap<String, u8>, json_shiny: Vec<Shinystruct>, namefr: String, executable_path: &str) -> Result<String, Errorfr> {
|
||||
let mut fr_params = FuncParams {
|
||||
fr_out: out,
|
||||
fr_debug_mode: debug_mode,
|
||||
fr_ver: ver,
|
||||
};
|
||||
|
||||
// ENCODE: StartData and TypeData, ALWAYS
|
||||
fr_params.encode_startdata()?;
|
||||
|
|
@ -252,7 +249,7 @@ fn cook(fr_params: &mut FuncParams, json_config: &mut Jsonconfig, idsmap: HashMa
|
|||
// ENCODE: EndData, ALWAYS
|
||||
fr_params.encode_enddata()?;
|
||||
|
||||
let mut final_string: String = encode_string(fr_params.fr_out);
|
||||
let mut final_string: String = encode_string(out);
|
||||
|
||||
// add NameAfter. not actually an encode.
|
||||
match json_config.item_type {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue