From 1ef86f089688c05f6b36f9390c30b923998c64e1 Mon Sep 17 00:00:00 2001 From: Aruki Date: Fri, 12 Oct 2018 21:19:12 -0600 Subject: [PATCH] Changed Echoes enum properties to choices --- src/Core/Resource/Script/NPropertyMap.cpp | 27 ++++++++ src/Core/Resource/Script/NPropertyMap.h | 3 + .../Resource/Script/Property/IProperty.cpp | 5 ++ src/Core/Resource/Script/Property/IProperty.h | 1 + templates/MP2/Structs/DigitalGuardianData.xml | 4 +- .../MP2/Structs/DigitalGuardianHeadData.xml | 8 +-- templates/MP2/Structs/MysteryFlyerData.xml | 2 +- templates/MP2/Structs/RezbitData.xml | 6 +- templates/MP2/Structs/SandBossData.xml | 6 +- .../MP2/Structs/SpacePirateWeaponData.xml | 2 +- .../MP2/Structs/SplitterMainChassisData.xml | 4 +- templates/MP2/Structs/SwampBossStage2Data.xml | 6 +- templates/MP2/Structs/UnknownStruct10.xml | 2 +- templates/MP2/Structs/UnknownStruct11.xml | 2 +- templates/MP2/Structs/UnknownStruct12.xml | 2 +- templates/MP2/Structs/UnknownStruct13.xml | 4 +- templates/MP2/Structs/UnknownStruct15.xml | 2 +- templates/MP2/Structs/UnknownStruct26.xml | 2 +- templates/MP2/Structs/UnknownStruct28.xml | 6 +- templates/MP2/Structs/UnknownStruct29.xml | 8 +-- templates/MP2/Structs/UnknownStruct31.xml | 2 +- templates/MP2/Structs/UnknownStruct32.xml | 2 +- templates/MP2/Structs/UnknownStruct33.xml | 2 +- templates/MP2/Structs/UnknownStruct34.xml | 2 +- templates/MP2/Structs/UnknownStruct37.xml | 2 +- templates/MP2/Structs/UnknownStruct40.xml | 2 +- templates/MP2/Structs/UnknownStruct43.xml | 4 +- templates/PropertyMap.xml | 64 +++++++++---------- templates/mp2/Enums/Item.xml | 2 +- templates/mp2/Enums/WeaponType.xml | 2 +- templates/mp2/Script/Actor.xml | 2 +- templates/mp2/Script/AmbientAI.xml | 16 ++--- templates/mp2/Script/AreaAttributes.xml | 4 +- templates/mp2/Script/AtomicAlpha.xml | 2 +- templates/mp2/Script/AtomicBeta.xml | 2 +- templates/mp2/Script/Blogg.xml | 2 +- templates/mp2/Script/CameraFilterKeyframe.xml | 2 +- templates/mp2/Script/ChozoGhost.xml | 2 +- templates/mp2/Script/CommandoPirate.xml | 6 +- templates/mp2/Script/ConditionalRelay.xml | 6 +- templates/mp2/Script/DarkSamus.xml | 2 +- templates/mp2/Script/ElitePirate.xml | 2 +- templates/mp2/Script/FlyingPirate.xml | 8 +-- templates/mp2/Script/Grenchler.xml | 8 +-- templates/mp2/Script/GunTurretBase.xml | 2 +- templates/mp2/Script/Ing.xml | 8 +-- templates/mp2/Script/IngSnatchingSwarm.xml | 2 +- templates/mp2/Script/Kralee.xml | 2 +- templates/mp2/Script/Krocuss.xml | 2 +- templates/mp2/Script/Lumite.xml | 4 +- templates/mp2/Script/Metaree.xml | 4 +- templates/mp2/Script/MinorIng.xml | 2 +- templates/mp2/Script/OctapedeSegment.xml | 4 +- templates/mp2/Script/Parasite.xml | 2 +- templates/mp2/Script/Pickup.xml | 2 +- templates/mp2/Script/Puffer.xml | 2 +- templates/mp2/Script/SafeZone.xml | 4 +- templates/mp2/Script/Sandworm.xml | 8 +-- templates/mp2/Script/Shrieker.xml | 6 +- templates/mp2/Script/SnakeWeedSwarm.xml | 2 +- templates/mp2/Script/SpacePirate.xml | 8 +-- templates/mp2/Script/SpankWeed.xml | 2 +- templates/mp2/Script/SpecialFunction.xml | 4 +- templates/mp2/Script/Splinter.xml | 4 +- templates/mp2/Script/SporbBase.xml | 2 +- templates/mp2/Script/SporbNeedle.xml | 2 +- templates/mp2/Script/SwampBossStage2.xml | 2 +- templates/mp2/Script/WispTentacle.xml | 2 +- .../mp2/Structs/BasicSwarmProperties.xml | 2 +- templates/mp2/Structs/ConditionalTest.xml | 8 +-- templates/mp2/Structs/DamageInfo.xml | 2 +- templates/mp2/Structs/LightParameters.xml | 2 +- templates/mp2/Structs/SandBossStructB.xml | 2 +- templates/mp2/Structs/WeaponVulnerability.xml | 2 +- templates/mp2demo/Structs/LightParameters.xml | 2 +- 75 files changed, 194 insertions(+), 158 deletions(-) diff --git a/src/Core/Resource/Script/NPropertyMap.cpp b/src/Core/Resource/Script/NPropertyMap.cpp index 895aa008..95db7921 100644 --- a/src/Core/Resource/Script/NPropertyMap.cpp +++ b/src/Core/Resource/Script/NPropertyMap.cpp @@ -306,6 +306,33 @@ void SetPropertyName(u32 ID, const char* pkTypeName, const char* pkNewName) } } +/** Change the type name associated with a property ID */ +void SetTypeName(u32 ID, const char* pkOldTypeName, const char* pkNewTypeName) +{ + u32 OldTypeHash = CCRC32::StaticHashString(pkOldTypeName); + u32 NewTypeHash = CCRC32::StaticHashString(pkNewTypeName); + + SNameKey OldKey( OldTypeHash, ID ); + auto MapNode = gNameMap.extract(OldKey); + + if (!MapNode.empty()) + { + SNameKey& Key = MapNode.key(); + SNameValue& Value = MapNode.mapped(); + Key.TypeHash = NewTypeHash; + gHashToTypeName[NewTypeHash] = pkNewTypeName; + + for (auto Iter = Value.PropertyList.begin(); Iter != Value.PropertyList.end(); Iter++) + { + IProperty* pProperty = *Iter; + pProperty->RecacheName(); + } + + gNameMap.insert( std::move(MapNode) ); + gMapIsDirty = true; + } +} + /** Registers a property in the name map. Should be called on all properties that use the map */ void RegisterProperty(IProperty* pProperty) { diff --git a/src/Core/Resource/Script/NPropertyMap.h b/src/Core/Resource/Script/NPropertyMap.h index cc89acbc..0db2ba98 100644 --- a/src/Core/Resource/Script/NPropertyMap.h +++ b/src/Core/Resource/Script/NPropertyMap.h @@ -34,6 +34,9 @@ void RetrieveXMLsWithProperty(u32 ID, const char* pkTypeName, std::set& /** Updates the name of a given property in the map */ void SetPropertyName(u32 ID, const char* pkTypeName, const char* pkNewName); +/** Change the type name associated with a property ID */ +void SetTypeName(u32 ID, const char* pkOldTypeName, const char* pkNewTypeName); + /** Registers a property in the name map. Should be called on all properties that use the map */ void RegisterProperty(IProperty* pProperty); diff --git a/src/Core/Resource/Script/Property/IProperty.cpp b/src/Core/Resource/Script/Property/IProperty.cpp index ce38c0c7..a4ea6bf4 100644 --- a/src/Core/Resource/Script/Property/IProperty.cpp +++ b/src/Core/Resource/Script/Property/IProperty.cpp @@ -416,6 +416,11 @@ bool IProperty::HasAccurateName() return mFlags.HasFlag( EPropertyFlag::HasCorrectPropertyName ); } +void IProperty::RecacheName() +{ + mFlags.ClearFlag( EPropertyFlag::HasCachedNameCheck | EPropertyFlag::HasCorrectPropertyName ); +} + /** IPropertyNew Accessors */ EGame IProperty::Game() const { diff --git a/src/Core/Resource/Script/Property/IProperty.h b/src/Core/Resource/Script/Property/IProperty.h index 34207746..704c0411 100644 --- a/src/Core/Resource/Script/Property/IProperty.h +++ b/src/Core/Resource/Script/Property/IProperty.h @@ -202,6 +202,7 @@ public: void ClearDirtyFlag(); bool UsesNameMap(); bool HasAccurateName(); + void RecacheName(); /** Accessors */ EGame Game() const; diff --git a/templates/MP2/Structs/DigitalGuardianData.xml b/templates/MP2/Structs/DigitalGuardianData.xml index 1947323a..e7d7f1bf 100644 --- a/templates/MP2/Structs/DigitalGuardianData.xml +++ b/templates/MP2/Structs/DigitalGuardianData.xml @@ -19,7 +19,7 @@ - + 0xB @@ -66,7 +66,7 @@ - + 0xB diff --git a/templates/MP2/Structs/DigitalGuardianHeadData.xml b/templates/MP2/Structs/DigitalGuardianHeadData.xml index 434bd2e1..fb8361cf 100644 --- a/templates/MP2/Structs/DigitalGuardianHeadData.xml +++ b/templates/MP2/Structs/DigitalGuardianHeadData.xml @@ -103,7 +103,7 @@ - + 0xB @@ -121,7 +121,7 @@ - + 0xB @@ -188,7 +188,7 @@ - + 0xB @@ -206,7 +206,7 @@ - + 0xB diff --git a/templates/MP2/Structs/MysteryFlyerData.xml b/templates/MP2/Structs/MysteryFlyerData.xml index 1682f90f..d9774a1c 100644 --- a/templates/MP2/Structs/MysteryFlyerData.xml +++ b/templates/MP2/Structs/MysteryFlyerData.xml @@ -10,7 +10,7 @@ - + 0xB diff --git a/templates/MP2/Structs/RezbitData.xml b/templates/MP2/Structs/RezbitData.xml index bad272f1..1c32f2f4 100644 --- a/templates/MP2/Structs/RezbitData.xml +++ b/templates/MP2/Structs/RezbitData.xml @@ -79,7 +79,7 @@ - + 0xB @@ -116,7 +116,7 @@ - + 0xB @@ -144,7 +144,7 @@ - + 0xB diff --git a/templates/MP2/Structs/SandBossData.xml b/templates/MP2/Structs/SandBossData.xml index b6d7d2ff..8f3cbcbf 100644 --- a/templates/MP2/Structs/SandBossData.xml +++ b/templates/MP2/Structs/SandBossData.xml @@ -28,7 +28,7 @@ - + 0xB @@ -41,7 +41,7 @@ - + 0xB @@ -65,7 +65,7 @@ - + 0x1 diff --git a/templates/MP2/Structs/SpacePirateWeaponData.xml b/templates/MP2/Structs/SpacePirateWeaponData.xml index 73c47de2..9e22170e 100644 --- a/templates/MP2/Structs/SpacePirateWeaponData.xml +++ b/templates/MP2/Structs/SpacePirateWeaponData.xml @@ -22,7 +22,7 @@ - + 0xB diff --git a/templates/MP2/Structs/SplitterMainChassisData.xml b/templates/MP2/Structs/SplitterMainChassisData.xml index 86fded6f..542daf1f 100644 --- a/templates/MP2/Structs/SplitterMainChassisData.xml +++ b/templates/MP2/Structs/SplitterMainChassisData.xml @@ -17,7 +17,7 @@ - + 0xB @@ -84,7 +84,7 @@ - + 0xB diff --git a/templates/MP2/Structs/SwampBossStage2Data.xml b/templates/MP2/Structs/SwampBossStage2Data.xml index 36dbfb50..8dfbc3fa 100644 --- a/templates/MP2/Structs/SwampBossStage2Data.xml +++ b/templates/MP2/Structs/SwampBossStage2Data.xml @@ -46,7 +46,7 @@ - + 0xB @@ -67,7 +67,7 @@ - + 0xB @@ -148,7 +148,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct10.xml b/templates/MP2/Structs/UnknownStruct10.xml index 46254d91..092e81e8 100644 --- a/templates/MP2/Structs/UnknownStruct10.xml +++ b/templates/MP2/Structs/UnknownStruct10.xml @@ -20,7 +20,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct11.xml b/templates/MP2/Structs/UnknownStruct11.xml index e69245b6..955aebe7 100644 --- a/templates/MP2/Structs/UnknownStruct11.xml +++ b/templates/MP2/Structs/UnknownStruct11.xml @@ -5,7 +5,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct12.xml b/templates/MP2/Structs/UnknownStruct12.xml index f3520be8..58daf148 100644 --- a/templates/MP2/Structs/UnknownStruct12.xml +++ b/templates/MP2/Structs/UnknownStruct12.xml @@ -14,7 +14,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct13.xml b/templates/MP2/Structs/UnknownStruct13.xml index a36cfe9c..484375dd 100644 --- a/templates/MP2/Structs/UnknownStruct13.xml +++ b/templates/MP2/Structs/UnknownStruct13.xml @@ -14,7 +14,7 @@ - + 0xB @@ -37,7 +37,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct15.xml b/templates/MP2/Structs/UnknownStruct15.xml index c84f1bbc..b5377313 100644 --- a/templates/MP2/Structs/UnknownStruct15.xml +++ b/templates/MP2/Structs/UnknownStruct15.xml @@ -17,7 +17,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct26.xml b/templates/MP2/Structs/UnknownStruct26.xml index 04a5048c..08d8d3e5 100644 --- a/templates/MP2/Structs/UnknownStruct26.xml +++ b/templates/MP2/Structs/UnknownStruct26.xml @@ -13,7 +13,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct28.xml b/templates/MP2/Structs/UnknownStruct28.xml index 8da0f708..389b1f81 100644 --- a/templates/MP2/Structs/UnknownStruct28.xml +++ b/templates/MP2/Structs/UnknownStruct28.xml @@ -123,7 +123,7 @@ - + 0xB @@ -136,7 +136,7 @@ - + 0xB @@ -195,7 +195,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct29.xml b/templates/MP2/Structs/UnknownStruct29.xml index a91f2ba9..1d5862cf 100644 --- a/templates/MP2/Structs/UnknownStruct29.xml +++ b/templates/MP2/Structs/UnknownStruct29.xml @@ -19,7 +19,7 @@ - + 0x7 @@ -35,7 +35,7 @@ - + 0x7 @@ -108,7 +108,7 @@ - + 0xB @@ -121,7 +121,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct31.xml b/templates/MP2/Structs/UnknownStruct31.xml index ec6d3125..d830fe64 100644 --- a/templates/MP2/Structs/UnknownStruct31.xml +++ b/templates/MP2/Structs/UnknownStruct31.xml @@ -14,7 +14,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct32.xml b/templates/MP2/Structs/UnknownStruct32.xml index 88c8daf5..43934a7e 100644 --- a/templates/MP2/Structs/UnknownStruct32.xml +++ b/templates/MP2/Structs/UnknownStruct32.xml @@ -35,7 +35,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct33.xml b/templates/MP2/Structs/UnknownStruct33.xml index 0a46a9d6..e158f0bf 100644 --- a/templates/MP2/Structs/UnknownStruct33.xml +++ b/templates/MP2/Structs/UnknownStruct33.xml @@ -5,7 +5,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct34.xml b/templates/MP2/Structs/UnknownStruct34.xml index 85409a84..69ae2556 100644 --- a/templates/MP2/Structs/UnknownStruct34.xml +++ b/templates/MP2/Structs/UnknownStruct34.xml @@ -6,7 +6,7 @@ - + 0x9 diff --git a/templates/MP2/Structs/UnknownStruct37.xml b/templates/MP2/Structs/UnknownStruct37.xml index 8702e8b2..9b2085f7 100644 --- a/templates/MP2/Structs/UnknownStruct37.xml +++ b/templates/MP2/Structs/UnknownStruct37.xml @@ -67,7 +67,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct40.xml b/templates/MP2/Structs/UnknownStruct40.xml index 878c1b15..31c88989 100644 --- a/templates/MP2/Structs/UnknownStruct40.xml +++ b/templates/MP2/Structs/UnknownStruct40.xml @@ -28,7 +28,7 @@ - + 0xB diff --git a/templates/MP2/Structs/UnknownStruct43.xml b/templates/MP2/Structs/UnknownStruct43.xml index 28bd4c0c..dd589948 100644 --- a/templates/MP2/Structs/UnknownStruct43.xml +++ b/templates/MP2/Structs/UnknownStruct43.xml @@ -34,7 +34,7 @@ - + 0xB @@ -62,7 +62,7 @@ - + 0xB diff --git a/templates/PropertyMap.xml b/templates/PropertyMap.xml index 19057170..d314b7a6 100644 --- a/templates/PropertyMap.xml +++ b/templates/PropertyMap.xml @@ -542,11 +542,11 @@ - + - + @@ -2474,11 +2474,11 @@ - + - + @@ -9414,11 +9414,11 @@ - + - + @@ -10463,7 +10463,7 @@ - + @@ -13991,7 +13991,7 @@ - + @@ -15598,11 +15598,11 @@ - + - + @@ -15850,11 +15850,11 @@ - + - + @@ -15947,7 +15947,7 @@ - + @@ -16030,7 +16030,7 @@ - + @@ -16758,11 +16758,11 @@ - + - + @@ -22402,11 +22402,11 @@ - + - + @@ -23271,7 +23271,7 @@ - + @@ -23430,11 +23430,11 @@ - + - + @@ -23834,11 +23834,11 @@ - + - + @@ -24515,7 +24515,7 @@ - + @@ -31734,11 +31734,11 @@ - + - + @@ -32615,7 +32615,7 @@ - + @@ -32943,7 +32943,7 @@ - + @@ -33174,11 +33174,11 @@ - + - + @@ -38506,11 +38506,11 @@ - + - + diff --git a/templates/mp2/Enums/Item.xml b/templates/mp2/Enums/Item.xml index 37c0987d..0538cab2 100644 --- a/templates/mp2/Enums/Item.xml +++ b/templates/mp2/Enums/Item.xml @@ -1,6 +1,6 @@ - + Item 0x0 diff --git a/templates/mp2/Enums/WeaponType.xml b/templates/mp2/Enums/WeaponType.xml index ff9121b6..f9a534f3 100644 --- a/templates/mp2/Enums/WeaponType.xml +++ b/templates/mp2/Enums/WeaponType.xml @@ -1,6 +1,6 @@ - + WeaponType 0x0 diff --git a/templates/mp2/Script/Actor.xml b/templates/mp2/Script/Actor.xml index 517e2cba..8329f3b5 100644 --- a/templates/mp2/Script/Actor.xml +++ b/templates/mp2/Script/Actor.xml @@ -77,7 +77,7 @@ - + 0xB diff --git a/templates/mp2/Script/AmbientAI.xml b/templates/mp2/Script/AmbientAI.xml index 0cb02d46..7d5ba159 100644 --- a/templates/mp2/Script/AmbientAI.xml +++ b/templates/mp2/Script/AmbientAI.xml @@ -26,56 +26,56 @@ - + Never - + Never - + Never - + Never - + Never - + Never - + Never - + Never diff --git a/templates/mp2/Script/AreaAttributes.xml b/templates/mp2/Script/AreaAttributes.xml index 118983e1..6f0173ed 100644 --- a/templates/mp2/Script/AreaAttributes.xml +++ b/templates/mp2/Script/AreaAttributes.xml @@ -18,7 +18,7 @@ Enable Dark World damage and switch to the Dark World map. false - + 0x0 @@ -44,7 +44,7 @@ CMDL - + 0x0 diff --git a/templates/mp2/Script/AtomicAlpha.xml b/templates/mp2/Script/AtomicAlpha.xml index d1cf0a12..e8f4eb66 100644 --- a/templates/mp2/Script/AtomicAlpha.xml +++ b/templates/mp2/Script/AtomicAlpha.xml @@ -32,7 +32,7 @@ - + 0x9 diff --git a/templates/mp2/Script/AtomicBeta.xml b/templates/mp2/Script/AtomicBeta.xml index 588c0907..9f365911 100644 --- a/templates/mp2/Script/AtomicBeta.xml +++ b/templates/mp2/Script/AtomicBeta.xml @@ -32,7 +32,7 @@ - + 0xB diff --git a/templates/mp2/Script/Blogg.xml b/templates/mp2/Script/Blogg.xml index 65249838..8abbc16f 100644 --- a/templates/mp2/Script/Blogg.xml +++ b/templates/mp2/Script/Blogg.xml @@ -37,7 +37,7 @@ - + 0xB diff --git a/templates/mp2/Script/CameraFilterKeyframe.xml b/templates/mp2/Script/CameraFilterKeyframe.xml index 92ce042b..f344b72b 100644 --- a/templates/mp2/Script/CameraFilterKeyframe.xml +++ b/templates/mp2/Script/CameraFilterKeyframe.xml @@ -7,7 +7,7 @@ 0 - + 0x0 diff --git a/templates/mp2/Script/ChozoGhost.xml b/templates/mp2/Script/ChozoGhost.xml index 1573cd41..f70a85f0 100644 --- a/templates/mp2/Script/ChozoGhost.xml +++ b/templates/mp2/Script/ChozoGhost.xml @@ -26,7 +26,7 @@ - + 0x9 diff --git a/templates/mp2/Script/CommandoPirate.xml b/templates/mp2/Script/CommandoPirate.xml index 6f8740a0..8ed64601 100644 --- a/templates/mp2/Script/CommandoPirate.xml +++ b/templates/mp2/Script/CommandoPirate.xml @@ -24,7 +24,7 @@ - + 0xB @@ -96,7 +96,7 @@ - + 0xB @@ -114,7 +114,7 @@ - + 0xB diff --git a/templates/mp2/Script/ConditionalRelay.xml b/templates/mp2/Script/ConditionalRelay.xml index c36ad385..a4ca39ad 100644 --- a/templates/mp2/Script/ConditionalRelay.xml +++ b/templates/mp2/Script/ConditionalRelay.xml @@ -13,21 +13,21 @@ - + 0x0 - + 0x0 - + 0x0 diff --git a/templates/mp2/Script/DarkSamus.xml b/templates/mp2/Script/DarkSamus.xml index 0b702675..c18f000b 100644 --- a/templates/mp2/Script/DarkSamus.xml +++ b/templates/mp2/Script/DarkSamus.xml @@ -218,7 +218,7 @@ - + 0xB diff --git a/templates/mp2/Script/ElitePirate.xml b/templates/mp2/Script/ElitePirate.xml index a3d62b21..54f0cfce 100644 --- a/templates/mp2/Script/ElitePirate.xml +++ b/templates/mp2/Script/ElitePirate.xml @@ -112,7 +112,7 @@ - + 0xB diff --git a/templates/mp2/Script/FlyingPirate.xml b/templates/mp2/Script/FlyingPirate.xml index 77fa7855..0ba0b891 100644 --- a/templates/mp2/Script/FlyingPirate.xml +++ b/templates/mp2/Script/FlyingPirate.xml @@ -29,7 +29,7 @@ - + 0x9 @@ -78,7 +78,7 @@ - + 0x9 @@ -96,7 +96,7 @@ - + 0x9 @@ -125,7 +125,7 @@ - + 0x9 diff --git a/templates/mp2/Script/Grenchler.xml b/templates/mp2/Script/Grenchler.xml index 9bddc4d9..93a5c6a1 100644 --- a/templates/mp2/Script/Grenchler.xml +++ b/templates/mp2/Script/Grenchler.xml @@ -121,7 +121,7 @@ - + 0xB @@ -148,7 +148,7 @@ - + 0xB @@ -182,7 +182,7 @@ - + 0xB @@ -251,7 +251,7 @@ - + 0xB diff --git a/templates/mp2/Script/GunTurretBase.xml b/templates/mp2/Script/GunTurretBase.xml index f7b25421..0af2a4e9 100644 --- a/templates/mp2/Script/GunTurretBase.xml +++ b/templates/mp2/Script/GunTurretBase.xml @@ -9,7 +9,7 @@ - + 0xB diff --git a/templates/mp2/Script/Ing.xml b/templates/mp2/Script/Ing.xml index 373553d8..f9f9aea7 100644 --- a/templates/mp2/Script/Ing.xml +++ b/templates/mp2/Script/Ing.xml @@ -154,7 +154,7 @@ - + 0xB @@ -167,7 +167,7 @@ - + 0xB @@ -226,7 +226,7 @@ - + 0xB @@ -280,7 +280,7 @@ - + 0xB diff --git a/templates/mp2/Script/IngSnatchingSwarm.xml b/templates/mp2/Script/IngSnatchingSwarm.xml index 661bcdb6..5436ef63 100644 --- a/templates/mp2/Script/IngSnatchingSwarm.xml +++ b/templates/mp2/Script/IngSnatchingSwarm.xml @@ -73,7 +73,7 @@ - + 0xB diff --git a/templates/mp2/Script/Kralee.xml b/templates/mp2/Script/Kralee.xml index c986ea96..b6607fcf 100644 --- a/templates/mp2/Script/Kralee.xml +++ b/templates/mp2/Script/Kralee.xml @@ -39,7 +39,7 @@ - + 0x9 diff --git a/templates/mp2/Script/Krocuss.xml b/templates/mp2/Script/Krocuss.xml index 54025530..36750261 100644 --- a/templates/mp2/Script/Krocuss.xml +++ b/templates/mp2/Script/Krocuss.xml @@ -39,7 +39,7 @@ - + 0x9 diff --git a/templates/mp2/Script/Lumite.xml b/templates/mp2/Script/Lumite.xml index fa9ff77c..99362fca 100644 --- a/templates/mp2/Script/Lumite.xml +++ b/templates/mp2/Script/Lumite.xml @@ -40,7 +40,7 @@ - + 0xB @@ -61,7 +61,7 @@ - + 0xB diff --git a/templates/mp2/Script/Metaree.xml b/templates/mp2/Script/Metaree.xml index 6a75017d..32b92f38 100644 --- a/templates/mp2/Script/Metaree.xml +++ b/templates/mp2/Script/Metaree.xml @@ -17,7 +17,7 @@ - + 0xB @@ -43,7 +43,7 @@ - + 0xB diff --git a/templates/mp2/Script/MinorIng.xml b/templates/mp2/Script/MinorIng.xml index 8e46febb..aa1593d4 100644 --- a/templates/mp2/Script/MinorIng.xml +++ b/templates/mp2/Script/MinorIng.xml @@ -27,7 +27,7 @@ - + 0xB diff --git a/templates/mp2/Script/OctapedeSegment.xml b/templates/mp2/Script/OctapedeSegment.xml index 2e735f8b..726906ee 100644 --- a/templates/mp2/Script/OctapedeSegment.xml +++ b/templates/mp2/Script/OctapedeSegment.xml @@ -39,7 +39,7 @@ - + 0x9 @@ -147,7 +147,7 @@ - + 0x9 diff --git a/templates/mp2/Script/Parasite.xml b/templates/mp2/Script/Parasite.xml index f4308bd5..c8d37c14 100644 --- a/templates/mp2/Script/Parasite.xml +++ b/templates/mp2/Script/Parasite.xml @@ -39,7 +39,7 @@ - + 0x9 diff --git a/templates/mp2/Script/Pickup.xml b/templates/mp2/Script/Pickup.xml index ead04967..c843a842 100644 --- a/templates/mp2/Script/Pickup.xml +++ b/templates/mp2/Script/Pickup.xml @@ -18,7 +18,7 @@ 0.0 - + 1 diff --git a/templates/mp2/Script/Puffer.xml b/templates/mp2/Script/Puffer.xml index a22a8387..ecfb0849 100644 --- a/templates/mp2/Script/Puffer.xml +++ b/templates/mp2/Script/Puffer.xml @@ -32,7 +32,7 @@ - + 0x9 diff --git a/templates/mp2/Script/SafeZone.xml b/templates/mp2/Script/SafeZone.xml index 22ab571f..6ae778e7 100644 --- a/templates/mp2/Script/SafeZone.xml +++ b/templates/mp2/Script/SafeZone.xml @@ -101,14 +101,14 @@ - + 0x14 - + 0x12 diff --git a/templates/mp2/Script/Sandworm.xml b/templates/mp2/Script/Sandworm.xml index feae7b27..c7db42f6 100644 --- a/templates/mp2/Script/Sandworm.xml +++ b/templates/mp2/Script/Sandworm.xml @@ -91,7 +91,7 @@ - + 0xB @@ -119,7 +119,7 @@ - + 0xB @@ -129,7 +129,7 @@ - + 0xB @@ -182,7 +182,7 @@ - + 0xB diff --git a/templates/mp2/Script/Shrieker.xml b/templates/mp2/Script/Shrieker.xml index 218b7e5e..4ceff39a 100644 --- a/templates/mp2/Script/Shrieker.xml +++ b/templates/mp2/Script/Shrieker.xml @@ -33,7 +33,7 @@ - + 0xB @@ -54,7 +54,7 @@ - + 0xB @@ -78,7 +78,7 @@ - + 0xB diff --git a/templates/mp2/Script/SnakeWeedSwarm.xml b/templates/mp2/Script/SnakeWeedSwarm.xml index fcea11ec..942d9d8f 100644 --- a/templates/mp2/Script/SnakeWeedSwarm.xml +++ b/templates/mp2/Script/SnakeWeedSwarm.xml @@ -53,7 +53,7 @@ - + 0x9 diff --git a/templates/mp2/Script/SpacePirate.xml b/templates/mp2/Script/SpacePirate.xml index 17c8586d..4333a897 100644 --- a/templates/mp2/Script/SpacePirate.xml +++ b/templates/mp2/Script/SpacePirate.xml @@ -27,7 +27,7 @@ - + 0xB @@ -98,7 +98,7 @@ - + 0xB @@ -111,7 +111,7 @@ - + 0xB @@ -132,7 +132,7 @@ - + 0xB diff --git a/templates/mp2/Script/SpankWeed.xml b/templates/mp2/Script/SpankWeed.xml index 4e6c1904..c8270b1c 100644 --- a/templates/mp2/Script/SpankWeed.xml +++ b/templates/mp2/Script/SpankWeed.xml @@ -11,7 +11,7 @@ - + 0x9 diff --git a/templates/mp2/Script/SpecialFunction.xml b/templates/mp2/Script/SpecialFunction.xml index 1bd9a46d..ccbb2a94 100644 --- a/templates/mp2/Script/SpecialFunction.xml +++ b/templates/mp2/Script/SpecialFunction.xml @@ -10,7 +10,7 @@ - + 0x0 @@ -104,7 +104,7 @@ 0 - + 0 diff --git a/templates/mp2/Script/Splinter.xml b/templates/mp2/Script/Splinter.xml index cf1f5745..0a80c24f 100644 --- a/templates/mp2/Script/Splinter.xml +++ b/templates/mp2/Script/Splinter.xml @@ -50,7 +50,7 @@ - + 0xB @@ -80,7 +80,7 @@ - + 0xB diff --git a/templates/mp2/Script/SporbBase.xml b/templates/mp2/Script/SporbBase.xml index 3e8bd60d..dc7c62dc 100644 --- a/templates/mp2/Script/SporbBase.xml +++ b/templates/mp2/Script/SporbBase.xml @@ -94,7 +94,7 @@ - + 0xB diff --git a/templates/mp2/Script/SporbNeedle.xml b/templates/mp2/Script/SporbNeedle.xml index 9ee36309..cb47c72c 100644 --- a/templates/mp2/Script/SporbNeedle.xml +++ b/templates/mp2/Script/SporbNeedle.xml @@ -21,7 +21,7 @@ - + 0x9 diff --git a/templates/mp2/Script/SwampBossStage2.xml b/templates/mp2/Script/SwampBossStage2.xml index 9246c389..67f787d9 100644 --- a/templates/mp2/Script/SwampBossStage2.xml +++ b/templates/mp2/Script/SwampBossStage2.xml @@ -32,7 +32,7 @@ - + 0x9 diff --git a/templates/mp2/Script/WispTentacle.xml b/templates/mp2/Script/WispTentacle.xml index fa386626..5840727d 100644 --- a/templates/mp2/Script/WispTentacle.xml +++ b/templates/mp2/Script/WispTentacle.xml @@ -21,7 +21,7 @@ - + 0x9 diff --git a/templates/mp2/Structs/BasicSwarmProperties.xml b/templates/mp2/Structs/BasicSwarmProperties.xml index cae54468..ae758139 100644 --- a/templates/mp2/Structs/BasicSwarmProperties.xml +++ b/templates/mp2/Structs/BasicSwarmProperties.xml @@ -5,7 +5,7 @@ - + 0xB diff --git a/templates/mp2/Structs/ConditionalTest.xml b/templates/mp2/Structs/ConditionalTest.xml index 303c0926..34cf4709 100644 --- a/templates/mp2/Structs/ConditionalTest.xml +++ b/templates/mp2/Structs/ConditionalTest.xml @@ -3,7 +3,7 @@ ConditionalTest - + 0x1 @@ -11,15 +11,15 @@ - - + + 0x0 - + 0x0 diff --git a/templates/mp2/Structs/DamageInfo.xml b/templates/mp2/Structs/DamageInfo.xml index 461c5028..6867bff5 100644 --- a/templates/mp2/Structs/DamageInfo.xml +++ b/templates/mp2/Structs/DamageInfo.xml @@ -3,7 +3,7 @@ DamageInfo - + 0.0 diff --git a/templates/mp2/Structs/LightParameters.xml b/templates/mp2/Structs/LightParameters.xml index 31d74cf8..f75f3033 100644 --- a/templates/mp2/Structs/LightParameters.xml +++ b/templates/mp2/Structs/LightParameters.xml @@ -28,7 +28,7 @@ true - + 0x1 diff --git a/templates/mp2/Structs/SandBossStructB.xml b/templates/mp2/Structs/SandBossStructB.xml index 1dd3101b..d18510a1 100644 --- a/templates/mp2/Structs/SandBossStructB.xml +++ b/templates/mp2/Structs/SandBossStructB.xml @@ -5,7 +5,7 @@ - + 0xB diff --git a/templates/mp2/Structs/WeaponVulnerability.xml b/templates/mp2/Structs/WeaponVulnerability.xml index 7e1efe49..7604901e 100644 --- a/templates/mp2/Structs/WeaponVulnerability.xml +++ b/templates/mp2/Structs/WeaponVulnerability.xml @@ -7,7 +7,7 @@ % 100.0 - + 0x0 diff --git a/templates/mp2demo/Structs/LightParameters.xml b/templates/mp2demo/Structs/LightParameters.xml index 949353b3..b04055e7 100644 --- a/templates/mp2demo/Structs/LightParameters.xml +++ b/templates/mp2demo/Structs/LightParameters.xml @@ -28,7 +28,7 @@ true - + 0x1