diff --git a/DataSpec/DNAMP1/DNAMP1.cpp b/DataSpec/DNAMP1/DNAMP1.cpp index 900e4dbed..96834c58a 100644 --- a/DataSpec/DNAMP1/DNAMP1.cpp +++ b/DataSpec/DNAMP1/DNAMP1.cpp @@ -33,6 +33,7 @@ #include "Tweaks/CTweakCameraBob.hpp" #include "Tweaks/CTweakSlideShow.hpp" #include "Tweaks/CTweakGame.hpp" +#include "Tweaks/CTweakTargeting.hpp" namespace DataSpec { @@ -385,6 +386,8 @@ ResExtractor PAKBridge::LookupExtractor(const PAK& pak, const PAK::En return {ExtractTweak, {_S(".yaml")}}; if (!name.compare("Game")) return {ExtractTweak, {_S(".yaml")}}; + if (!name.compare("Targeting")) + return {ExtractTweak, {_S(".yaml")}}; } break; } diff --git a/DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp b/DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp index b79e87f6e..f157942f0 100644 --- a/DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp +++ b/DataSpec/DNAMP1/Tweaks/CTweakTargeting.hpp @@ -10,6 +10,143 @@ namespace DNAMP1 struct CTweakTargeting : public ITweakTargeting { DECL_YAML + Value x4_; + Value x8_; + Value xc_; + Value x10_; + Value x14_; + Value x18_; + Value x1c_; + Value x20_; + Value x24_; + Value x28_; + Value x2c_; + Value x30_; + Value x3c_; + Value x48_; + Value x4c_; + Value x50_; + Value x54_; + Value x58_; + Value x5c_; + Value x60_; + Value x6c_; + Value x78_; + Value x84_; + Value x90_; + Value x94_; + Value x98_; + Value x9c_; + Value xa0_; + Value xa4_; + Value xa8_; + Value xac_; + Value xb0_; + Value xb4_; + Value xb8_; + Value xbc_; + Value xc0_; + Value xc4_; + Value xc8_; + Value xcc_; + Value xd0_; + Value xd4_; + Value xd8_; + Value xdc_; + Value xe0_; + Value xe4_; + Value xe8_; + Value xec_; + Value xf0_; + Value xf4_; + Value xf8_entryCount; + struct UnkVec : BigYAML + { + DECL_YAML + Value count; + Vector floats; + }; + Vector xf8_; + Value x108_entryCount; + Vector x108_; + Value x118_; + Value x11c_; + Value x120_; + Value x124_; + Value x128_; + Value x12c_; + Value x130_; + Value x134_; + Value x138_; + Value x13c_; + Value x140_; + Value x144_; + Value x148_; + Value x14c_; + Value x150_; + Value x154_; + Value x158_; + Value x15c_; + Value x160_; + Value x164_; + Value x168_; + Value x16c_; + Value x170_; + Value x174_; + Value x178_; + Value x17c_; + Value x180_; + Value x184_; + Value x188_; + Value x18c_; + Value x190_; + Value x194_; + Value x198_; + Value x19c_; + Value x1a0_; + Value x1a4_; + Value x1a8_; + Value x1ac_; + Value x1b0_; + Value x1b4_; + Value x1b8_; + Value x1bc_; + Value x1c0_; + Value x1c4_; + Value x1c8_; + Value x1cc_; + Value x1d0_; + Value x1d4_; + Value x1d8_; + Value x1dc_; + Value x1e0_; + Value x1e4_; + Value x1e8_; + Value x1ec_; + Value x1f0_; + Value x1f4_; + Value x1f8_; + Value x1fc_; + Value x200_; + Value x204_; + Value x208_; + Value x20c_; + Value x210_; + Value x214_; + Value x218_; + Value x21c_; + Value x220_; + Value x224_; + + CTweakTargeting() = default; + CTweakTargeting(athena::io::IStreamReader& r) + { + this->read(r); + x124_ = -1.f * ((2 * M_PIF) * (0.003f * x124_)); + x140_ = (2.f * M_PIF) * (0.003f * x140_); + x144_ = (2.f * M_PIF) * (0.003f * x144_); + x208_ = (2.f * M_PIF) * (0.003f * x208_); + } }; } }