chore: Code cleaneup

.gitignore

@@ -8,13 +8,4 @@
 *.zip
 *.ts
 !*.d.ts
-database/weapon_formulas.rs
-!database/compactor.py
-!database/perk_rerouter.py
-zdata.json
-database/weapon.json
-database/weapon_test.json
-database/enhanced_handler.rs
-/zPythonStuff
-/zPveReverser
-data.json
+/boboswaggins_kitchen

.vscode/settings.json

@@ -4,4 +4,5 @@
         "IS_RA": "true"
     },
     "rust-analyzer.check.command": "clippy",
+    "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
 }

Cargo.toml

@@ -4,6 +4,7 @@ edition = "2021"
 version = "1.0.2"
 rust-version = "1.65"
 repository = "https://github.com/d2foundry/oracle_engine/"
+# build = "build-script-src/main.rs"
 build = "build.rs"
 
 [build-dependencies]
@@ -12,6 +13,7 @@ serde = { version = "^1.0", features = ["derive"]}
 reqwest = { version = "^0.11", features = ["json", "blocking"] }
 serde_json = "^1.0"
 ron = "^0.8"
+thiserror = "1.0.48"
 
 [dev-dependencies]
 num-traits = "0.2"
@@ -20,12 +22,12 @@ num-traits = "0.2"
 [dependencies]
 serde = { version = "^1.0", features = ["derive"]}
 
-serde-wasm-bindgen = { version = "^0.5"}
+serde-wasm-bindgen = { version = "^0.6"}
 console_error_panic_hook = { version = "0.1.7"}
 wasm-bindgen = { version = "^0.2"}
 
 num_enum = "0.7.0"
-lol_alloc = "0.4.0"
+lol_alloc = { version = "0.4.0", default-features = false}
 piecewise-linear = "0.1.0"
 
 
@@ -34,4 +36,5 @@ crate-type = ["cdylib"]
 
 [profile.release]
 lto = true
+strip = true
 opt-level = "z"

README.md

@@ -8,22 +8,22 @@
 
 Oracle Engine is [Foundry](https://d2foundry.gg)'s Rust and WebAssembly based Destiny 2 calculation API, originally forked from the [D2 Calculation API](https://github.com/D2-Insight/D2_Calculation_API). This repo is what holds the weapon formulas, stat calculations, perk info, etc. that we use to display on Foundry.  
 
-This is also where we plan on having our project board for keeping track of our tasks on a lower level. We hope that this will give insight on what we are spending our time on and what is in the near future. 
+This is also where we plan on having our project board for keeping track of our tasks on a lower level. We hope that this will give insight on what we are spending our time on and what is in the near future.
 
-If you wish to interact with us on a closer basis, our [Discord Server](https://discord.gg/dzW2DZBBQH) is where you can find us and have discussions with like minded guardians. We look forward to seeing you there! 
+If you wish to interact with us on a closer basis, our [Discord Server](https://discord.gg/dzW2DZBBQH) is where you can find us and have discussions with like minded guardians. We look forward to seeing you there!
 
-## Building Oracle Engine for Foundry
+## Building Oracle Engine
 
-Run `cargo build` to install the dependencies required by Oracle Engine. 
+Run `cargo build` to install the dependencies required by Oracle Engine.
 
 In order to build the WebAssembly (wasm) pack you will need to download wasm-pack from this [site](https://rustwasm.github.io/wasm-pack/installer/) or via this cURL command:
 
-`curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh`
+`cargo install wasm-pack`
 
 Once you have this installed you can build the app via this wasm-pack command.
 
 `wasm-pack build --release --target web`
 
 ## Contributing
 
-Looking to help contribute to Foundry? We welcome you to contribute to our project! Please see our [CONTRIBUTING.md](./CONTRIBUTING.md) to learn the various ways you can help us. Thank you for having an interest in contributing! 
+Looking to help contribute to Foundry? We welcome you to contribute to our project! Please see our [CONTRIBUTING.md](./CONTRIBUTING.md) to learn the various ways you can help us. Thank you for having an interest in contributing!

build.rs

@@ -99,7 +99,7 @@ impl UuidTimestamp for StatQuadraticFormula {
 }
 
 #[derive(Debug, Clone, Serialize, Default)]
-pub struct DamageMods {
+pub struct DamageModFormula {
     pub pve: f64,
     pub minor: f64,
     pub elite: f64,
@@ -109,9 +109,9 @@ pub struct DamageMods {
     pub vehicle: f64,
     pub timestamp: u64,
 }
-impl From<&Map<String, Value>> for DamageMods {
+impl From<&Map<String, Value>> for DamageModFormula {
     fn from(_val: &Map<String, Value>) -> Self {
-        DamageMods {
+        DamageModFormula {
             pve: 1.0,
             minor: _val
                 .get("minor")
@@ -147,10 +147,10 @@ impl From<&Map<String, Value>> for DamageMods {
         }
     }
 }
-impl DamageMods {
+impl DamageModFormula {
     pub fn add_pve_mult(self, mult: f64) -> Self {
         // not super memory efficient but it works
-        DamageMods {
+        DamageModFormula {
             pve: mult,
             minor: self.minor,
             elite: self.elite,
@@ -162,7 +162,7 @@ impl DamageMods {
         }
     }
 }
-impl UuidTimestamp for DamageMods {
+impl UuidTimestamp for DamageModFormula {
     fn uuid(&self) -> f64 {
         (self.pve - 12.0) * 6729.0
             + self.minor * 18342.0
@@ -294,7 +294,7 @@ impl UuidTimestamp for AmmoFormula {
 }
 
 #[derive(Debug, Clone, Serialize, Default)]
-pub struct FiringData {
+pub struct FiringDataFormula {
     pub damage: f64,
     pub crit_mult: f64,
     pub burst_delay: f64,
@@ -304,9 +304,9 @@ pub struct FiringData {
     pub charge: bool,
     pub timestamp: u64,
 }
-impl From<&Map<String, Value>> for FiringData {
+impl From<&Map<String, Value>> for FiringDataFormula {
     fn from(_val: &Map<String, Value>) -> Self {
-        FiringData {
+        FiringDataFormula {
             damage: _val["damage"].as_f64().unwrap_or_default(),
             crit_mult: _val["crit_mult"].as_f64().unwrap_or_default(),
             burst_delay: _val["burst_delay"].as_f64().unwrap_or_default(),
@@ -326,7 +326,7 @@ impl From<&Map<String, Value>> for FiringData {
         }
     }
 }
-impl UuidTimestamp for FiringData {
+impl UuidTimestamp for FiringDataFormula {
     fn uuid(&self) -> f64 {
         (self.damage * 821.88
             + self.crit_mult * 388.1
@@ -358,7 +358,7 @@ fn write_variable(
 ) {
     let res = writeln!(
         writer,
-        "#[doc=r#\"{}\"#]\n#[allow(dead_code)]\n#[allow(clippy::approx_constant)]\npub const {}: {} = {};",
+        "#[doc=r#\"{}\"#]\n#[allow(dead_code)]\n#[allow(clippy::approx_constant)]\npub(crate) const {}: {} = {};",
         doc, name, datatype, value
     );
     if res.is_err() {
@@ -380,9 +380,7 @@ fn main() {
     let mut formula_file = std::fs::File::create(formula_dst).unwrap();
 
     //write imports in file
-    let res = writeln!(
-        formula_file,
-        "use crate::types::rs_types::{{StatQuadraticFormula, RangeFormula, HandlingFormula, ReloadFormula, DamageMods, AmmoFormula, DataPointers, FiringData, WeaponPath}};");
+    let res = writeln!(formula_file, "use crate::types::prelude::*;");
     if res.is_err() {
         panic!("cargo:warning=error writing imports");
     }
@@ -496,8 +494,8 @@ fn construct_weapon_formulas(formula_file: &mut File, cached: &mut CachedBuildDa
     let mut range_data: Vec<RangeFormula> = vec![RangeFormula::default()];
     let mut reload_data: Vec<ReloadFormula> = vec![ReloadFormula::default()];
     let mut ammo_data: Vec<AmmoFormula> = vec![AmmoFormula::default()];
-    let mut firing_data: Vec<FiringData> = vec![FiringData::default()];
-    let mut scalar_data: Vec<DamageMods> = vec![DamageMods::default()];
+    let mut firing_data: Vec<FiringDataFormula> = vec![FiringDataFormula::default()];
+    let mut scalar_data: Vec<DamageModFormula> = vec![DamageModFormula::default()];
 
     let mut updated_weapon_defs: Vec<(WeaponPath, DataPointers)> = Vec::new();
     for (weapon_id, inner_values) in new_jdata.as_object().unwrap() {
@@ -647,7 +645,7 @@ fn construct_weapon_formulas(formula_file: &mut File, cached: &mut CachedBuildDa
                     handling_data.push(handling);
                 }
 
-                let b_scalar: DamageMods = cat
+                let b_scalar: DamageModFormula = cat
                     .get("combatant_scalars")
                     .unwrap_or_else(|| {
                         err_list.push(format!(
@@ -686,7 +684,7 @@ fn construct_weapon_formulas(formula_file: &mut File, cached: &mut CachedBuildDa
                     ammo_data.push(ammo);
                 }
 
-                let mut firing: FiringData = (&fam).into();
+                let mut firing: FiringDataFormula = (&fam).into();
                 firing.burst_delay *= 1.0 / 30.0;
                 firing.inner_burst_delay *= 1.0 / 30.0;
                 firing.crit_mult = 1.5 + (firing.crit_mult / 51.0);
@@ -752,14 +750,14 @@ fn construct_weapon_formulas(formula_file: &mut File, cached: &mut CachedBuildDa
     write_variable(
         formula_file,
         "SCALAR_DATA",
-        &format!("[DamageMods; {}]", scalar_data.len()),
+        &format!("[DamageModFormula; {}]", scalar_data.len()),
         format!("{:?}", scalar_data),
         "Array of combatant scalar formulas",
     );
     write_variable(
         formula_file,
         "FIRING_DATA",
-        &format!("[FiringData; {}]", firing_data.len()),
+        &format!("[FiringDataFormula; {}]", firing_data.len()),
         format!("{:?}", firing_data),
         "Array of firing data formulas",
     );

src/abilities/mod.rs

@@ -1,5 +1,4 @@
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-#[derive(Default)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
 pub enum AbilityType {
     GRENADE,
     MELEE,
@@ -14,8 +13,8 @@ pub enum AbilityType {
     UNKNOWN,
 }
 
-
-#[derive(Debug, Clone, Default)]
+#[allow(dead_code)]
+#[derive(Debug, Clone, Copy, Default)]
 pub struct AbilityDamageProfile {
     impact: f64,
     secondary: f64,

src/activity/damage_calc.rs

@@ -1,32 +1,29 @@
-#![allow(dead_code)]
 use super::Activity;
-use crate::{enemies::EnemyType, logging, types::rs_types::DamageMods};
+use crate::logging;
 use piecewise_linear::PiecewiseLinearFunction;
-use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone)]
 pub struct DifficultyData {
-    name: String,
+    // name: String,
     cap: i32,
     table: PiecewiseLinearFunction<f64>,
 }
 
 const WEAPON_DELTA_EXPONENT: f64 = 0.00672;
 
-#[derive(Debug, Clone)]
-#[derive(Default)]
+#[derive(Debug, Clone, Copy, Default, serde::Deserialize)]
 pub enum DifficultyOptions {
     #[default]
-    NORMAL = 1,
-    RAID = 2,
-    MASTER = 3,
+    Normal = 1,
+    Raid = 2,
+    Master = 3,
 }
 
 impl DifficultyOptions {
     pub fn get_difficulty_data(&self) -> DifficultyData {
         match self {
-            DifficultyOptions::NORMAL => DifficultyData {
-                name: "Normal".to_string(),
+            DifficultyOptions::Normal => DifficultyData {
+                // name: "Normal".to_string(),
                 cap: 50,
                 table: PiecewiseLinearFunction::try_from(vec![
                     (-99.0, 0.4018),
@@ -41,10 +38,10 @@ impl DifficultyOptions {
                     (-10.0, 0.7800),
                     (0.0, 1.0),
                 ])
-                .unwrap(),
+                .expect("Failed to create PiecewiseLinearFunction in difficulty data"),
             },
-            DifficultyOptions::MASTER => DifficultyData {
-                name: "Master".to_string(),
+            DifficultyOptions::Master => DifficultyData {
+                // name: "Master".to_string(),
                 cap: 20,
                 table: PiecewiseLinearFunction::try_from(vec![
                     (-99.0, 0.4018),
@@ -59,10 +56,10 @@ impl DifficultyOptions {
                     (-10.0, 0.6800),
                     (0.0, 0.8500),
                 ])
-                .unwrap(),
+                .expect("Failed to create PiecewiseLinearFunction in difficulty data"),
             },
-            DifficultyOptions::RAID => DifficultyData {
-                name: "Raid & Dungeon".to_string(),
+            DifficultyOptions::Raid => DifficultyData {
+                // name: "Raid & Dungeon".to_string(),
                 cap: 20,
                 table: PiecewiseLinearFunction::try_from(vec![
                     (-99.0, 0.4018),
@@ -77,18 +74,18 @@ impl DifficultyOptions {
                     (-10.0, 0.73),
                     (0.0, 0.925),
                 ])
-                .unwrap(),
+                .expect("Failed to create PiecewiseLinearFunction in difficulty data"),
             },
         }
     }
 }
 impl From<i32> for DifficultyOptions {
     fn from(i: i32) -> Self {
         match i {
-            1 => DifficultyOptions::NORMAL,
-            2 => DifficultyOptions::RAID,
-            3 => DifficultyOptions::MASTER,
-            _ => DifficultyOptions::NORMAL,
+            1 => DifficultyOptions::Normal,
+            2 => DifficultyOptions::Raid,
+            3 => DifficultyOptions::Master,
+            _ => DifficultyOptions::Normal,
         }
     }
 }
@@ -111,7 +108,7 @@ pub(super) fn get_gear_delta_mult(_activity: &Activity) -> f64 {
     } else {
         difficulty_data.table.y_at_x(0.0)
     }
-    .unwrap();
+    .expect("Failed to get gear delta mult");
 
     crate::logging::log(
         format!("gear_delta_mult: {}", gear_delta_mult).as_str(),