AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 16:24:55 +00:00
Code Issues Projects Releases Wiki Activity

atdna fixes

Browse Source
This commit is contained in:
Phillip Stephens
2019-08-26 20:02:31 -07:00
parent 27a47fad5a
commit 3ca09f60db
14 changed files with 162 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
DataSpec/DNAMP1/ScriptObjects/Oculus.cpp
View File

@@ -5,23 +5,23 @@ namespace DataSpec::DNAMP1 {
template <class Op>
void Oculus::Enumerate(typename Op::StreamT& s) {
IScriptObject::Enumerate<Op>(s);
Do<Op>({"name"}, name, s);
Do<Op>({"location"}, location, s);
Do<Op>({"orientation"}, orientation, s);
Do<Op>({"scale"}, scale, s);
Do<Op>({"patternedInfo"}, patternedInfo, s);
Do<Op>({"actorParameters"}, actorParameters, s);
Do<Op>({"unknown1"}, unknown1, s);
Do<Op>({"unknown2"}, unknown2, s);
Do<Op>({"unknown3"}, unknown3, s);
Do<Op>({"unknown4"}, unknown4, s);
Do<Op>({"unknown5"}, unknown5, s);
Do<Op>({"unknown6"}, unknown6, s);
Do<Op>({"damageVulnerabilty"}, damageVulnerabilty, s);
Do<Op>({"unknown7"}, unknown7, s);
Do<Op>({"damageInfo"}, damageInfo, s);
Do<Op>(athena::io::PropId{"name"}, name, s);
Do<Op>(athena::io::PropId{"location"}, location, s);
Do<Op>(athena::io::PropId{"orientation"}, orientation, s);
Do<Op>(athena::io::PropId{"scale"}, scale, s);
Do<Op>(athena::io::PropId{"patternedInfo"}, patternedInfo, s);
Do<Op>(athena::io::PropId{"actorParameters"}, actorParameters, s);
Do<Op>(athena::io::PropId{"unknown1"}, unknown1, s);
Do<Op>(athena::io::PropId{"unknown2"}, unknown2, s);
Do<Op>(athena::io::PropId{"unknown3"}, unknown3, s);
Do<Op>(athena::io::PropId{"unknown4"}, unknown4, s);
Do<Op>(athena::io::PropId{"unknown5"}, unknown5, s);
Do<Op>(athena::io::PropId{"unknown6"}, unknown6, s);
Do<Op>(athena::io::PropId{"damageVulnerabilty"}, damageVulnerabilty, s);
Do<Op>(athena::io::PropId{"unknown7"}, unknown7, s);
Do<Op>(athena::io::PropId{"damageInfo"}, damageInfo, s);
if (propertyCount == 16)
Do<Op>({"unknown8"}, unknown8, s);
Do<Op>(athena::io::PropId{"unknown8"}, unknown8, s);
else
unknown8 = 0.f;
}

100
DataSpec/DNAMP1/ScriptObjects/Ridley.cpp
View File

@@ -5,60 +5,60 @@ namespace DataSpec::DNAMP1 {
template <class Op>
void Ridley::Enumerate(typename Op::StreamT& s) {
IScriptObject::Enumerate<Op>(s);
Do<Op>({"name"}, name, s);
Do<Op>({"location"}, location, s);
Do<Op>({"orientation"}, orientation, s);
Do<Op>({"scale"}, scale, s);
Do<Op>({"patternedInfo"}, patternedInfo, s);
Do<Op>({"actorParameters"}, actorParameters, s);
Do<Op>({"model1"}, model1, s);
Do<Op>({"model2"}, model2, s);
Do<Op>(athena::io::PropId{"name"}, name, s);
Do<Op>(athena::io::PropId{"location"}, location, s);
Do<Op>(athena::io::PropId{"orientation"}, orientation, s);
Do<Op>(athena::io::PropId{"scale"}, scale, s);
Do<Op>(athena::io::PropId{"patternedInfo"}, patternedInfo, s);
Do<Op>(athena::io::PropId{"actorParameters"}, actorParameters, s);
Do<Op>(athena::io::PropId{"model1"}, model1, s);
Do<Op>(athena::io::PropId{"model2"}, model2, s);
if (propertyCount == 48) {
Do<Op>({"model3"}, model3, s);
Do<Op>({"model4"}, model4, s);
Do<Op>({"model5"}, model5, s);
Do<Op>({"model6"}, model6, s);
Do<Op>({"model7"}, model7, s);
Do<Op>({"model8"}, model8, s);
Do<Op>({"model9"}, model9, s);
Do<Op>({"model10"}, model10, s);
Do<Op>({"model11"}, model11, s);
Do<Op>({"model12"}, model12, s);
Do<Op>(athena::io::PropId{"model3"}, model3, s);
Do<Op>(athena::io::PropId{"model4"}, model4, s);
Do<Op>(athena::io::PropId{"model5"}, model5, s);
Do<Op>(athena::io::PropId{"model6"}, model6, s);
Do<Op>(athena::io::PropId{"model7"}, model7, s);
Do<Op>(athena::io::PropId{"model8"}, model8, s);
Do<Op>(athena::io::PropId{"model9"}, model9, s);
Do<Op>(athena::io::PropId{"model10"}, model10, s);
Do<Op>(athena::io::PropId{"model11"}, model11, s);
Do<Op>(athena::io::PropId{"model12"}, model12, s);
}
Do<Op>({"particle"}, particle, s);
Do<Op>({"unknown1"}, unknown1, s);
Do<Op>({"unknown2"}, unknown2, s);
Do<Op>({"unknown3"}, unknown3, s);
Do<Op>({"unknown4"}, unknown4, s);
Do<Op>({"wpsc1"}, wpsc1, s);
Do<Op>({"damageInfo1"}, damageInfo1, s);
Do<Op>({"ridleyStruct1"}, ridleyStruct1, s);
Do<Op>({"soundID1"}, soundID1, s);
Do<Op>({"wpsc2"}, wpsc2, s);
Do<Op>(athena::io::PropId{"particle"}, particle, s);
Do<Op>(athena::io::PropId{"unknown1"}, unknown1, s);
Do<Op>(athena::io::PropId{"unknown2"}, unknown2, s);
Do<Op>(athena::io::PropId{"unknown3"}, unknown3, s);
Do<Op>(athena::io::PropId{"unknown4"}, unknown4, s);
Do<Op>(athena::io::PropId{"wpsc1"}, wpsc1, s);
Do<Op>(athena::io::PropId{"damageInfo1"}, damageInfo1, s);
Do<Op>(athena::io::PropId{"ridleyStruct1"}, ridleyStruct1, s);
Do<Op>(athena::io::PropId{"soundID1"}, soundID1, s);
Do<Op>(athena::io::PropId{"wpsc2"}, wpsc2, s);
if (propertyCount == 40)
Do<Op>({"wpsc3"}, wpsc3, s);
Do<Op>({"damageInfo2"}, damageInfo2, s);
Do<Op>({"ridleyStruct2_1"}, ridleyStruct2_1, s);
Do<Op>({"wpsc4"}, wpsc4, s);
Do<Op>({"damageInfo3"}, damageInfo3, s);
Do<Op>({"ridleyStruct2_2"}, ridleyStruct2_2, s);
Do<Op>({"soundID2"}, soundID2, s);
Do<Op>({"damageInfo4"}, damageInfo4, s);
Do<Op>({"ridleyStruct2_3"}, ridleyStruct2_3, s);
Do<Op>({"unknown5"}, unknown5, s);
Do<Op>({"unknown6"}, unknown6, s);
Do<Op>({"damageInfo5"}, damageInfo5, s);
Do<Op>({"unknown7"}, unknown7, s);
Do<Op>({"damageInfo6"}, damageInfo6, s);
Do<Op>({"unknown8"}, unknown8, s);
Do<Op>({"damageInfo7"}, damageInfo7, s);
Do<Op>({"unknown9"}, unknown9, s);
Do<Op>({"elsc"}, elsc, s);
Do<Op>({"unknown10"}, unknown10, s);
Do<Op>({"soundID3"}, soundID3, s);
Do<Op>({"damageInfo8"}, damageInfo8, s);
Do<Op>(athena::io::PropId{"wpsc3"}, wpsc3, s);
Do<Op>(athena::io::PropId{"damageInfo2"}, damageInfo2, s);
Do<Op>(athena::io::PropId{"ridleyStruct2_1"}, ridleyStruct2_1, s);
Do<Op>(athena::io::PropId{"wpsc4"}, wpsc4, s);
Do<Op>(athena::io::PropId{"damageInfo3"}, damageInfo3, s);
Do<Op>(athena::io::PropId{"ridleyStruct2_2"}, ridleyStruct2_2, s);
Do<Op>(athena::io::PropId{"soundID2"}, soundID2, s);
Do<Op>(athena::io::PropId{"damageInfo4"}, damageInfo4, s);
Do<Op>(athena::io::PropId{"ridleyStruct2_3"}, ridleyStruct2_3, s);
Do<Op>(athena::io::PropId{"unknown5"}, unknown5, s);
Do<Op>(athena::io::PropId{"unknown6"}, unknown6, s);
Do<Op>(athena::io::PropId{"damageInfo5"}, damageInfo5, s);
Do<Op>(athena::io::PropId{"unknown7"}, unknown7, s);
Do<Op>(athena::io::PropId{"damageInfo6"}, damageInfo6, s);
Do<Op>(athena::io::PropId{"unknown8"}, unknown8, s);
Do<Op>(athena::io::PropId{"damageInfo7"}, damageInfo7, s);
Do<Op>(athena::io::PropId{"unknown9"}, unknown9, s);
Do<Op>(athena::io::PropId{"elsc"}, elsc, s);
Do<Op>(athena::io::PropId{"unknown10"}, unknown10, s);
Do<Op>(athena::io::PropId{"soundID3"}, soundID3, s);
Do<Op>(athena::io::PropId{"damageInfo8"}, damageInfo8, s);
if (propertyCount == 40)
Do<Op>({"damageInfo9"}, damageInfo9, s);
Do<Op>(athena::io::PropId{"damageInfo9"}, damageInfo9, s);
}
const char* Ridley::DNAType() { return "urde::DNAMP1::Ridley"; }

52
DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.cpp
View File

@@ -5,34 +5,34 @@ namespace DataSpec::DNAMP1 {
template <class Op>
void WorldTeleporter::Enumerate(typename Op::StreamT& s) {
IScriptObject::Enumerate<Op>(s);
Do<Op>({"name"}, name, s);
Do<Op>({"active"}, active, s);
Do<Op>({"mlvl"}, mlvl, s);
Do<Op>({"mrea"}, mrea, s);
Do<Op>({"animationParameters"}, animationParameters, s);
Do<Op>({"playerScale"}, playerScale, s);
Do<Op>({"platformModel"}, platformModel, s);
Do<Op>({"platformScale"}, platformScale, s);
Do<Op>({"blackgroundModel"}, backgroundModel, s);
Do<Op>({"backgroundScale"}, backgroundScale, s);
Do<Op>({"upElevator"}, upElevator, s);
Do<Op>({"elevatorSound"}, elevatorSound, s);
Do<Op>({"volume"}, volume, s);
Do<Op>({"panning"}, panning, s);
Do<Op>({"showText"}, showText, s);
Do<Op>({"font"}, font, s);
Do<Op>({"strg"}, strg, s);
Do<Op>({"fadeWhite"}, fadeWhite, s);
Do<Op>({"charFadeInTime"}, charFadeInTime, s);
Do<Op>({"charsPerSecond"}, charsPerSecond, s);
Do<Op>({"showDelay"}, showDelay, s);
Do<Op>(athena::io::PropId{"name"}, name, s);
Do<Op>(athena::io::PropId{"active"}, active, s);
Do<Op>(athena::io::PropId{"mlvl"}, mlvl, s);
Do<Op>(athena::io::PropId{"mrea"}, mrea, s);
Do<Op>(athena::io::PropId{"animationParameters"}, animationParameters, s);
Do<Op>(athena::io::PropId{"playerScale"}, playerScale, s);
Do<Op>(athena::io::PropId{"platformModel"}, platformModel, s);
Do<Op>(athena::io::PropId{"platformScale"}, platformScale, s);
Do<Op>(athena::io::PropId{"blackgroundModel"}, backgroundModel, s);
Do<Op>(athena::io::PropId{"backgroundScale"}, backgroundScale, s);
Do<Op>(athena::io::PropId{"upElevator"}, upElevator, s);
Do<Op>(athena::io::PropId{"elevatorSound"}, elevatorSound, s);
Do<Op>(athena::io::PropId{"volume"}, volume, s);
Do<Op>(athena::io::PropId{"panning"}, panning, s);
Do<Op>(athena::io::PropId{"showText"}, showText, s);
Do<Op>(athena::io::PropId{"font"}, font, s);
Do<Op>(athena::io::PropId{"strg"}, strg, s);
Do<Op>(athena::io::PropId{"fadeWhite"}, fadeWhite, s);
Do<Op>(athena::io::PropId{"charFadeInTime"}, charFadeInTime, s);
Do<Op>(athena::io::PropId{"charsPerSecond"}, charsPerSecond, s);
Do<Op>(athena::io::PropId{"showDelay"}, showDelay, s);
if (propertyCount == 26) {
Do<Op>({"audioStream"}, audioStream, s);
Do<Op>({"unknown13"}, unknown13, s);
Do<Op>({"unknown14"}, unknown14, s);
Do<Op>({"unknown15"}, unknown15, s);
Do<Op>({"unknown16"}, unknown16, s);
Do<Op>(athena::io::PropId{"audioStream"}, audioStream, s);
Do<Op>(athena::io::PropId{"unknown13"}, unknown13, s);
Do<Op>(athena::io::PropId{"unknown14"}, unknown14, s);
Do<Op>(athena::io::PropId{"unknown15"}, unknown15, s);
Do<Op>(athena::io::PropId{"unknown16"}, unknown16, s);
} else {
unknown13 = false;
unknown14 = 0.0;