From 5a5676481586cb0622816c2fd16218ecc34cb0fe Mon Sep 17 00:00:00 2001 From: Aruki Date: Sat, 13 Oct 2018 21:40:09 -0600 Subject: [PATCH] Merged in new property names; fixed games being able to rename UnknownStruct* templates in other games --- src/Core/Resource/Script/NPropertyMap.cpp | 4 +- .../Property/CPropertyNameGenerator.cpp | 4 +- .../Resource/Script/Property/CSoundProperty.h | 2 +- .../WorldEditor/CTemplateEditDialog.cpp | 5 + templates/DKCR/Game.xml | 92 +- templates/DKCR/Structs/BouncyTireData.xml | 4 +- .../Structs/BouncyTireJumpHeights.xml} | 2 +- ...icCreature.xml => GenericCreatureData.xml} | 2 +- .../Structs/PatternedAITypedef.xml} | 2 +- .../Structs/PlayerAlternateSkin.xml} | 2 +- .../{CrouchData.xml => PlayerCrouchData.xml} | 2 +- .../Structs/PlayerCrushData.xml} | 2 +- ...ingData.xml => PlayerHeadTrackingData.xml} | 2 +- .../{MeleeData.xml => PlayerMeleeData.xml} | 2 +- .../Structs/PlayerMultiKillRewardData.xml} | 2 +- ...nutGunData.xml => PlayerPeanutGunData.xml} | 2 +- ...ata.xml => PlayerRiseFromTheGraveData.xml} | 2 +- .../{ShieldData.xml => PlayerShieldData.xml} | 2 +- ...nData.xml => PlayerTarInteractionData.xml} | 2 +- templates/DKCR/Structs/UnknownStruct140.xml | 2 +- templates/MP3/Game.xml | 12 +- .../Structs/PatternedAITypedef.xml} | 2 +- templates/MP3/Structs/UnknownStruct46.xml | 243 ----- templates/PropertyMap.xml | 862 ++++++++++-------- templates/dkcr/Script/BirdBoss.xml | 2 +- templates/dkcr/Script/ForestBoss.xml | 2 +- templates/dkcr/Script/GenericCreature.xml | 4 +- templates/dkcr/Script/JungleBoss1.xml | 2 +- templates/dkcr/Script/Kong.xml | 4 +- templates/dkcr/Script/MineCart.xml | 4 +- templates/dkcr/Script/Mole.xml | 2 +- templates/dkcr/Script/PilotChicken.xml | 2 +- templates/dkcr/Script/PirateCrab.xml | 2 +- templates/dkcr/Script/PlayerActor.xml | 2 +- templates/dkcr/Script/Rambi.xml | 2 +- templates/dkcr/Script/RobotChicken.xml | 2 +- templates/dkcr/Script/RobotChickenFlyer.xml | 2 +- templates/dkcr/Script/RocketBarrel.xml | 2 +- .../dkcr/Script/VerticalRocketBarrel.xml | 2 +- templates/dkcr/Script/VolcanoBossBodyPart.xml | 2 +- templates/dkcr/Structs/ForestBossStructC.xml | 2 +- templates/dkcr/Structs/UnknownStruct44.xml | 18 +- templates/mp3/Script/AtomicAlpha.xml | 2 +- templates/mp3/Script/AuroraUnit1.xml | 2 +- templates/mp3/Script/AuroraUnit2.xml | 2 +- templates/mp3/Script/BeastRider.xml | 2 +- templates/mp3/Script/Berserker.xml | 2 +- templates/mp3/Script/BlinkWolf.xml | 2 +- templates/mp3/Script/CombatTrooper.xml | 2 +- templates/mp3/Script/DarkSamus.xml | 6 +- templates/mp3/Script/DarkSamusEcho.xml | 2 +- templates/mp3/Script/DefenseMechanoid.xml | 6 +- templates/mp3/Script/EyePod.xml | 2 +- templates/mp3/Script/FargullHatcher.xml | 2 +- templates/mp3/Script/FlyingPirate.xml | 2 +- templates/mp3/Script/Friendly.xml | 2 +- templates/mp3/Script/Gandrayda.xml | 2 +- templates/mp3/Script/GellSac.xml | 2 +- templates/mp3/Script/GhorLowerBody.xml | 2 +- templates/mp3/Script/GhorUpperBody.xml | 2 +- templates/mp3/Script/GragnolFlyer.xml | 2 +- templates/mp3/Script/GunTurretBase.xml | 2 +- templates/mp3/Script/GunTurretTop.xml | 2 +- templates/mp3/Script/Korakk.xml | 6 +- templates/mp3/Script/KorbaMaw.xml | 2 +- templates/mp3/Script/Metaree.xml | 2 +- templates/mp3/Script/MetroidHatcher.xml | 6 +- templates/mp3/Script/MetroidHopper.xml | 2 +- templates/mp3/Script/MetroidPhazeoid.xml | 2 +- templates/mp3/Script/MinorIng.xml | 2 +- templates/mp3/Script/MysteryFlyer.xml | 2 +- templates/mp3/Script/NoseTurret.xml | 2 +- templates/mp3/Script/Parasite.xml | 2 +- templates/mp3/Script/Phaazoid.xml | 2 +- templates/mp3/Script/PhazonHarvester.xml | 2 +- templates/mp3/Script/PhazonLeech.xml | 2 +- templates/mp3/Script/PhazonPuffer.xml | 2 +- templates/mp3/Script/PhazonTentacle.xml | 2 +- templates/mp3/Script/PillBug.xml | 2 +- templates/mp3/Script/PirateDrone.xml | 2 +- templates/mp3/Script/Puffer.xml | 2 +- templates/mp3/Script/ReptilicusHunter.xml | 2 +- templates/mp3/Script/Ridley1.xml | 6 +- templates/mp3/Script/Rundas.xml | 6 +- templates/mp3/Script/SamusForm.xml | 2 +- templates/mp3/Script/SeedBoss1.xml | 2 +- templates/mp3/Script/SeedBoss1Orb.xml | 2 +- templates/mp3/Script/SeedBoss2BotSwarm.xml | 2 +- templates/mp3/Script/SeedBoss2GiantForm.xml | 2 +- templates/mp3/Script/SeedBoss2PrimeBot.xml | 6 +- templates/mp3/Script/SeedBoss3.xml | 6 +- templates/mp3/Script/ShellBug.xml | 2 +- templates/mp3/Script/Ship.xml | 2 +- templates/mp3/Script/SpacePirate.xml | 2 +- templates/mp3/Script/Sprite.xml | 2 +- templates/mp3/Script/SteamBot.xml | 2 +- templates/mp3/Script/SteamDrone.xml | 2 +- templates/mp3/Script/SteamLord.xml | 2 +- templates/mp3/Script/SwarmBot.xml | 2 +- 99 files changed, 642 insertions(+), 820 deletions(-) rename templates/{dkcr/Structs/BouncyTireStruct.xml => DKCR/Structs/BouncyTireJumpHeights.xml} (91%) rename templates/DKCR/Structs/{GenericCreature.xml => GenericCreatureData.xml} (99%) rename templates/{dkcr/Structs/PatternedAI.xml => DKCR/Structs/PatternedAITypedef.xml} (99%) rename templates/{dkcr/Structs/UnknownStruct46.xml => DKCR/Structs/PlayerAlternateSkin.xml} (94%) rename templates/DKCR/Structs/{CrouchData.xml => PlayerCrouchData.xml} (96%) rename templates/{dkcr/Structs/GenericCreatureStructF.xml => DKCR/Structs/PlayerCrushData.xml} (98%) rename templates/DKCR/Structs/{HeadTrackingData.xml => PlayerHeadTrackingData.xml} (95%) rename templates/DKCR/Structs/{MeleeData.xml => PlayerMeleeData.xml} (96%) rename templates/{dkcr/Structs/MinecartStructD.xml => DKCR/Structs/PlayerMultiKillRewardData.xml} (91%) rename templates/DKCR/Structs/{PeanutGunData.xml => PlayerPeanutGunData.xml} (95%) rename templates/DKCR/Structs/{RiseFromTheGraveData.xml => PlayerRiseFromTheGraveData.xml} (93%) rename templates/DKCR/Structs/{ShieldData.xml => PlayerShieldData.xml} (96%) rename templates/DKCR/Structs/{TarInteractionData.xml => PlayerTarInteractionData.xml} (97%) rename templates/{mp3/Structs/PatternedAI.xml => MP3/Structs/PatternedAITypedef.xml} (99%) delete mode 100644 templates/MP3/Structs/UnknownStruct46.xml diff --git a/src/Core/Resource/Script/NPropertyMap.cpp b/src/Core/Resource/Script/NPropertyMap.cpp index 68d87101..39c4fb7e 100644 --- a/src/Core/Resource/Script/NPropertyMap.cpp +++ b/src/Core/Resource/Script/NPropertyMap.cpp @@ -231,8 +231,8 @@ const char* GetPropertyName(u32 ID, const char* pkTypeName) } -/** Returns whether the specified name is in the map. */ -bool IsValidPropertyName(u32 ID, const char* pkTypeName) +/** Returns whether the specified ID is in the map. */ +bool IsValidPropertyID(u32 ID, const char* pkTypeName) { SNameKey Key = CreateKey(ID, pkTypeName); auto MapFind = gNameMap.find(Key); diff --git a/src/Core/Resource/Script/Property/CPropertyNameGenerator.cpp b/src/Core/Resource/Script/Property/CPropertyNameGenerator.cpp index 12a86760..dc92ffbe 100644 --- a/src/Core/Resource/Script/Property/CPropertyNameGenerator.cpp +++ b/src/Core/Resource/Script/Property/CPropertyNameGenerator.cpp @@ -52,7 +52,7 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r mIsRunning = true; mFinishedRunning = false; - // Convert valid type pairs into hashes. + // Convert the type pair map. // Also, replace the normal type name list with whatever is in the ID pairs list we were given. if (!rkParams.ValidIdPairs.empty()) { @@ -267,5 +267,5 @@ bool CPropertyNameGenerator::IsValidPropertyID(u32 ID, const char* pkType) return false; } else - return NPropertyMap::IsValidPropertyName(ID, pkType); + return NPropertyMap::IsValidPropertyID(ID, pkType); } diff --git a/src/Core/Resource/Script/Property/CSoundProperty.h b/src/Core/Resource/Script/Property/CSoundProperty.h index 8052f5b8..be1b22c1 100644 --- a/src/Core/Resource/Script/Property/CSoundProperty.h +++ b/src/Core/Resource/Script/Property/CSoundProperty.h @@ -18,7 +18,7 @@ public: Arc.SerializePrimitive( ValueRef(pData), 0 ); } - virtual TString ValueAsString(void* pData) + virtual TString ValueAsString(void* pData) const { return TString::FromInt32( Value(pData), 0, 10 ); } diff --git a/src/Editor/WorldEditor/CTemplateEditDialog.cpp b/src/Editor/WorldEditor/CTemplateEditDialog.cpp index cd1539bb..821a9304 100644 --- a/src/Editor/WorldEditor/CTemplateEditDialog.cpp +++ b/src/Editor/WorldEditor/CTemplateEditDialog.cpp @@ -189,9 +189,14 @@ void CTemplateEditDialog::UpdateTypeName(const TString& kNewTypeName, bool Allow { if (mOriginalTypeName != kNewTypeName || mOriginalAllowTypeNameOverride != AllowOverride) { + bool WasUnknown = mOriginalTypeName.Contains("Unknown") || mOriginalTypeName.Contains("Struct"); + // Get a list of properties to update. for (int GameIdx = 0; GameIdx < (int) EGame::Max; GameIdx++) { + if (WasUnknown && (EGame) GameIdx != mpProperty->Game()) + continue; + CGameTemplate* pGame = NGameList::GetGameTemplate( (EGame) GameIdx ); if (pGame) diff --git a/templates/DKCR/Game.xml b/templates/DKCR/Game.xml index 71c105b3..9fdbe537 100644 --- a/templates/DKCR/Game.xml +++ b/templates/DKCR/Game.xml @@ -712,8 +712,8 @@ - BouncyTireStruct - + BouncyTireJumpHeights + CableEnum @@ -799,10 +799,6 @@ CounterConditions - - CrouchData - - DKBarrelGlueData @@ -888,8 +884,8 @@ - GenericCreature - + GenericCreatureData + GenericCreatureStructA @@ -911,10 +907,6 @@ GenericCreatureStructE - - GenericCreatureStructF - - GenericCreatureStructG @@ -931,10 +923,6 @@ GuiWidgetProperties - - HeadTrackingData - - HealthInfo @@ -983,10 +971,6 @@ LightParameters - - MeleeData - - MinecartStructA @@ -999,10 +983,6 @@ MinecartStructC - - MinecartStructD - - ModifyContactRules @@ -1092,12 +1072,8 @@ - PatternedAI - - - - PeanutGunData - + PatternedAITypedef + PeanutProperties @@ -1119,10 +1095,50 @@ PlatformMotionProperties + + PlayerAlternateSkin + + + + PlayerCrouchData + + + + PlayerCrushData + + + + PlayerHeadTrackingData + + PlayerItem + + PlayerMeleeData + + + + PlayerMultiKillRewardData + + + + PlayerPeanutGunData + + + + PlayerRiseFromTheGraveData + + + + PlayerShieldData + + + + PlayerTarInteractionData + + ProjectileBounceData @@ -1167,10 +1183,6 @@ RetronomeMessage - - RiseFromTheGraveData - - RobotChickenEnum @@ -1219,10 +1231,6 @@ Shape - - ShieldData - - SkinSwap @@ -1287,10 +1295,6 @@ TandemBeam - - TarInteractionData - - TeleportData @@ -2323,10 +2327,6 @@ UnknownStruct45 - - UnknownStruct46 - - UnknownStruct47 diff --git a/templates/DKCR/Structs/BouncyTireData.xml b/templates/DKCR/Structs/BouncyTireData.xml index 9da73ffd..d95e949e 100644 --- a/templates/DKCR/Structs/BouncyTireData.xml +++ b/templates/DKCR/Structs/BouncyTireData.xml @@ -19,8 +19,8 @@ 3.1401999 - - + + 9.0 diff --git a/templates/dkcr/Structs/BouncyTireStruct.xml b/templates/DKCR/Structs/BouncyTireJumpHeights.xml similarity index 91% rename from templates/dkcr/Structs/BouncyTireStruct.xml rename to templates/DKCR/Structs/BouncyTireJumpHeights.xml index 9115aaff..fa42b57b 100644 --- a/templates/dkcr/Structs/BouncyTireStruct.xml +++ b/templates/DKCR/Structs/BouncyTireJumpHeights.xml @@ -1,7 +1,7 @@ - BouncyTireStruct + BouncyTireJumpHeights 4.6402001 diff --git a/templates/DKCR/Structs/GenericCreature.xml b/templates/DKCR/Structs/GenericCreatureData.xml similarity index 99% rename from templates/DKCR/Structs/GenericCreature.xml rename to templates/DKCR/Structs/GenericCreatureData.xml index 55232419..82ed6db7 100644 --- a/templates/DKCR/Structs/GenericCreature.xml +++ b/templates/DKCR/Structs/GenericCreatureData.xml @@ -1,7 +1,7 @@ - GenericCreature + GenericCreatureData 0xDDB5F41 diff --git a/templates/dkcr/Structs/PatternedAI.xml b/templates/DKCR/Structs/PatternedAITypedef.xml similarity index 99% rename from templates/dkcr/Structs/PatternedAI.xml rename to templates/DKCR/Structs/PatternedAITypedef.xml index 0898ce5b..3724b0af 100644 --- a/templates/dkcr/Structs/PatternedAI.xml +++ b/templates/DKCR/Structs/PatternedAITypedef.xml @@ -1,7 +1,7 @@ - PatternedAI + PatternedAITypedef 150.0 diff --git a/templates/dkcr/Structs/UnknownStruct46.xml b/templates/DKCR/Structs/PlayerAlternateSkin.xml similarity index 94% rename from templates/dkcr/Structs/UnknownStruct46.xml rename to templates/DKCR/Structs/PlayerAlternateSkin.xml index 40d23536..645fa4ae 100644 --- a/templates/dkcr/Structs/UnknownStruct46.xml +++ b/templates/DKCR/Structs/PlayerAlternateSkin.xml @@ -1,7 +1,7 @@ - UnknownStruct46 + PlayerAlternateSkin 0 diff --git a/templates/DKCR/Structs/CrouchData.xml b/templates/DKCR/Structs/PlayerCrouchData.xml similarity index 96% rename from templates/DKCR/Structs/CrouchData.xml rename to templates/DKCR/Structs/PlayerCrouchData.xml index 020925d3..2c8e897d 100644 --- a/templates/DKCR/Structs/CrouchData.xml +++ b/templates/DKCR/Structs/PlayerCrouchData.xml @@ -1,7 +1,7 @@ - CrouchData + PlayerCrouchData 0.80000001 diff --git a/templates/dkcr/Structs/GenericCreatureStructF.xml b/templates/DKCR/Structs/PlayerCrushData.xml similarity index 98% rename from templates/dkcr/Structs/GenericCreatureStructF.xml rename to templates/DKCR/Structs/PlayerCrushData.xml index 206fe18a..3572b387 100644 --- a/templates/dkcr/Structs/GenericCreatureStructF.xml +++ b/templates/DKCR/Structs/PlayerCrushData.xml @@ -1,7 +1,7 @@ - GenericCreatureStructF + PlayerCrushData 0.1 diff --git a/templates/DKCR/Structs/HeadTrackingData.xml b/templates/DKCR/Structs/PlayerHeadTrackingData.xml similarity index 95% rename from templates/DKCR/Structs/HeadTrackingData.xml rename to templates/DKCR/Structs/PlayerHeadTrackingData.xml index 4d160860..10301a8d 100644 --- a/templates/DKCR/Structs/HeadTrackingData.xml +++ b/templates/DKCR/Structs/PlayerHeadTrackingData.xml @@ -1,7 +1,7 @@ - HeadTrackingData + PlayerHeadTrackingData Always diff --git a/templates/DKCR/Structs/MeleeData.xml b/templates/DKCR/Structs/PlayerMeleeData.xml similarity index 96% rename from templates/DKCR/Structs/MeleeData.xml rename to templates/DKCR/Structs/PlayerMeleeData.xml index 3ed1c0c3..117743c8 100644 --- a/templates/DKCR/Structs/MeleeData.xml +++ b/templates/DKCR/Structs/PlayerMeleeData.xml @@ -1,7 +1,7 @@ - MeleeData + PlayerMeleeData false diff --git a/templates/dkcr/Structs/MinecartStructD.xml b/templates/DKCR/Structs/PlayerMultiKillRewardData.xml similarity index 91% rename from templates/dkcr/Structs/MinecartStructD.xml rename to templates/DKCR/Structs/PlayerMultiKillRewardData.xml index 870287f1..ce7ee47b 100644 --- a/templates/dkcr/Structs/MinecartStructD.xml +++ b/templates/DKCR/Structs/PlayerMultiKillRewardData.xml @@ -1,7 +1,7 @@ - MinecartStructD + PlayerMultiKillRewardData diff --git a/templates/DKCR/Structs/PeanutGunData.xml b/templates/DKCR/Structs/PlayerPeanutGunData.xml similarity index 95% rename from templates/DKCR/Structs/PeanutGunData.xml rename to templates/DKCR/Structs/PlayerPeanutGunData.xml index 8e214044..b2355149 100644 --- a/templates/DKCR/Structs/PeanutGunData.xml +++ b/templates/DKCR/Structs/PlayerPeanutGunData.xml @@ -1,7 +1,7 @@ - PeanutGunData + PlayerPeanutGunData false diff --git a/templates/DKCR/Structs/RiseFromTheGraveData.xml b/templates/DKCR/Structs/PlayerRiseFromTheGraveData.xml similarity index 93% rename from templates/DKCR/Structs/RiseFromTheGraveData.xml rename to templates/DKCR/Structs/PlayerRiseFromTheGraveData.xml index ad44f6c7..9117d6c0 100644 --- a/templates/DKCR/Structs/RiseFromTheGraveData.xml +++ b/templates/DKCR/Structs/PlayerRiseFromTheGraveData.xml @@ -1,7 +1,7 @@ - RiseFromTheGraveData + PlayerRiseFromTheGraveData diff --git a/templates/DKCR/Structs/ShieldData.xml b/templates/DKCR/Structs/PlayerShieldData.xml similarity index 96% rename from templates/DKCR/Structs/ShieldData.xml rename to templates/DKCR/Structs/PlayerShieldData.xml index 5d71e0f6..7b6f926a 100644 --- a/templates/DKCR/Structs/ShieldData.xml +++ b/templates/DKCR/Structs/PlayerShieldData.xml @@ -1,7 +1,7 @@ - ShieldData + PlayerShieldData 1 diff --git a/templates/DKCR/Structs/TarInteractionData.xml b/templates/DKCR/Structs/PlayerTarInteractionData.xml similarity index 97% rename from templates/DKCR/Structs/TarInteractionData.xml rename to templates/DKCR/Structs/PlayerTarInteractionData.xml index 465c459f..fcb4beb3 100644 --- a/templates/DKCR/Structs/TarInteractionData.xml +++ b/templates/DKCR/Structs/PlayerTarInteractionData.xml @@ -1,7 +1,7 @@ - TarInteractionData + PlayerTarInteractionData false diff --git a/templates/DKCR/Structs/UnknownStruct140.xml b/templates/DKCR/Structs/UnknownStruct140.xml index 00d28745..1d430ebb 100644 --- a/templates/DKCR/Structs/UnknownStruct140.xml +++ b/templates/DKCR/Structs/UnknownStruct140.xml @@ -8,7 +8,7 @@ 0 - + diff --git a/templates/MP3/Game.xml b/templates/MP3/Game.xml index b001ffd0..b99942bc 100644 --- a/templates/MP3/Game.xml +++ b/templates/MP3/Game.xml @@ -1304,8 +1304,8 @@ - PatternedAI - + PatternedAITypedef + PhaazoidData @@ -1347,6 +1347,10 @@ PlayerActorStruct + + PlayerAlternateSkin + + PlayerInventoryItem @@ -1719,10 +1723,6 @@ UnknownStruct45 - - UnknownStruct46 - - UnknownStruct47 diff --git a/templates/mp3/Structs/PatternedAI.xml b/templates/MP3/Structs/PatternedAITypedef.xml similarity index 99% rename from templates/mp3/Structs/PatternedAI.xml rename to templates/MP3/Structs/PatternedAITypedef.xml index 069a27b3..80c33018 100644 --- a/templates/mp3/Structs/PatternedAI.xml +++ b/templates/MP3/Structs/PatternedAITypedef.xml @@ -1,7 +1,7 @@ - PatternedAI + PatternedAITypedef 150.0 diff --git a/templates/MP3/Structs/UnknownStruct46.xml b/templates/MP3/Structs/UnknownStruct46.xml deleted file mode 100644 index d43fb33d..00000000 --- a/templates/MP3/Structs/UnknownStruct46.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - UnknownStruct46 - - - false - - - false - - - false - - - 0.66000003 - - - 0.1 - - - 0.1 - - - 1.0 - - - 5.0 - - - 0.5 - - - - - - - - Never - - - - - - - Never - - - - - - - Never - - - - - - - - - 5.0 - - - - - - - - - - 1.0 - - - 0.1 - - - 0.1 - - - 0.2 - - - 0.5 - - - 1.0 - - - 0.40000001 - - - 0.60000002 - - - 0.5 - - - 1.0 - - - 50.0 - - - -50.0 - - - 25.0 - - - 5.0 - - - 0.0 - - - 15.0 - - - 5.0 - - - 10.0 - - - - - Never - - - - - 0.0 - - - 25.0 - - - 1.0 - - - - 15.0 - - - 0.5 - - - 0.5 - - - 1.0 - - - 0.0 - - - 15.0 - - - 1.0 - - - 2.0 - - - 0.0 - - - false - - - false - - - false - - - 3.0 - - - 10.0 - - - 5.0 - - - 1.0 - - - - ELSC - - - - - PART - - - - - CAUD - - - - 5 - - - 4.0 - - - 0.1 - - - 0.021 - - - 0.1 - - - 0.021 - - - 3.0 - - - -3.0 - - - 1.0 - - - 3.0 - - - 10.0 - - - 0.5 - - - - diff --git a/templates/PropertyMap.xml b/templates/PropertyMap.xml index d07816c2..3da31a3d 100644 --- a/templates/PropertyMap.xml +++ b/templates/PropertyMap.xml @@ -271,7 +271,7 @@ - + @@ -287,7 +287,7 @@ - + @@ -367,7 +367,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -439,7 +439,7 @@ - + @@ -771,7 +771,7 @@ - + @@ -839,7 +839,7 @@ - + @@ -971,7 +971,7 @@ - + @@ -1087,7 +1087,7 @@ - + @@ -1103,7 +1103,7 @@ - + @@ -1275,7 +1275,7 @@ - + @@ -1311,7 +1311,7 @@ - + @@ -1323,7 +1323,7 @@ - + @@ -1591,7 +1591,7 @@ - + @@ -1703,7 +1703,7 @@ - + @@ -1839,7 +1839,7 @@ - + @@ -1923,7 +1923,7 @@ - + @@ -2051,7 +2051,7 @@ - + @@ -2395,7 +2395,7 @@ - + @@ -2567,11 +2567,11 @@ - + - + @@ -2703,7 +2703,7 @@ - + @@ -2739,7 +2739,7 @@ - + @@ -2795,7 +2795,7 @@ - + @@ -2803,7 +2803,7 @@ - + @@ -2851,7 +2851,7 @@ - + @@ -2859,7 +2859,7 @@ - + @@ -2871,7 +2871,7 @@ - + @@ -2885,6 +2885,10 @@ + + + + @@ -2919,7 +2923,7 @@ - + @@ -3043,7 +3047,7 @@ - + @@ -3171,7 +3175,7 @@ - + @@ -3347,7 +3351,7 @@ - + @@ -3471,7 +3475,7 @@ - + @@ -3503,11 +3507,11 @@ - + - + @@ -3561,6 +3565,10 @@ + + + + @@ -3743,7 +3751,7 @@ - + @@ -3795,7 +3803,7 @@ - + @@ -3823,7 +3831,7 @@ - + @@ -3843,7 +3851,7 @@ - + @@ -3919,7 +3927,7 @@ - + @@ -4019,7 +4027,7 @@ - + @@ -4179,7 +4187,7 @@ - + @@ -4203,7 +4211,7 @@ - + @@ -4267,7 +4275,7 @@ - + @@ -4283,7 +4291,7 @@ - + @@ -4411,7 +4419,7 @@ - + @@ -4591,7 +4599,7 @@ - + @@ -4639,7 +4647,7 @@ - + @@ -4719,7 +4727,7 @@ - + @@ -4895,7 +4903,7 @@ - + @@ -4919,7 +4927,7 @@ - + @@ -5147,7 +5155,7 @@ - + @@ -5191,7 +5199,7 @@ - + @@ -5231,7 +5239,7 @@ - + @@ -5251,7 +5259,7 @@ - + @@ -5263,7 +5271,7 @@ - + @@ -5351,7 +5359,7 @@ - + @@ -5417,6 +5425,10 @@ + + + + @@ -5507,7 +5519,7 @@ - + @@ -5847,7 +5859,7 @@ - + @@ -5895,7 +5907,7 @@ - + @@ -6223,7 +6235,7 @@ - + @@ -6239,7 +6251,7 @@ - + @@ -6323,7 +6335,7 @@ - + @@ -6435,7 +6447,7 @@ - + @@ -6515,7 +6527,7 @@ - + @@ -6527,7 +6539,7 @@ - + @@ -6575,7 +6587,7 @@ - + @@ -6717,6 +6729,10 @@ + + + + @@ -6747,7 +6763,7 @@ - + @@ -6759,7 +6775,7 @@ - + @@ -6787,7 +6803,7 @@ - + @@ -6921,6 +6937,10 @@ + + + + @@ -7035,7 +7055,7 @@ - + @@ -7115,7 +7135,7 @@ - + @@ -7303,7 +7323,7 @@ - + @@ -7491,7 +7511,7 @@ - + @@ -7599,7 +7619,7 @@ - + @@ -7627,7 +7647,7 @@ - + @@ -7735,7 +7755,7 @@ - + @@ -7787,7 +7807,7 @@ - + @@ -7899,7 +7919,7 @@ - + @@ -8035,7 +8055,7 @@ - + @@ -8123,7 +8143,7 @@ - + @@ -8219,7 +8239,7 @@ - + @@ -8391,7 +8411,7 @@ - + @@ -8415,7 +8435,7 @@ - + @@ -8451,7 +8471,7 @@ - + @@ -8479,7 +8499,7 @@ - + @@ -8549,6 +8569,14 @@ + + + + + + + + @@ -8575,7 +8603,7 @@ - + @@ -8815,7 +8843,7 @@ - + @@ -9083,7 +9111,7 @@ - + @@ -9379,7 +9407,7 @@ - + @@ -9413,22 +9441,10 @@ - - - - - - - - - - - - @@ -9439,7 +9455,7 @@ - + @@ -9507,7 +9523,7 @@ - + @@ -9875,7 +9891,7 @@ - + @@ -9883,7 +9899,7 @@ - + @@ -9959,7 +9975,7 @@ - + @@ -10031,7 +10047,7 @@ - + @@ -10063,7 +10079,7 @@ - + @@ -10091,7 +10107,7 @@ - + @@ -10191,7 +10207,7 @@ - + @@ -10231,7 +10247,7 @@ - + @@ -10307,7 +10323,7 @@ - + @@ -10723,7 +10739,7 @@ - + @@ -10839,7 +10855,7 @@ - + @@ -10951,7 +10967,7 @@ - + @@ -11071,7 +11087,7 @@ - + @@ -11267,7 +11283,7 @@ - + @@ -11371,7 +11387,7 @@ - + @@ -11499,7 +11515,7 @@ - + @@ -11519,11 +11535,11 @@ - + - + @@ -11551,7 +11567,7 @@ - + @@ -11635,7 +11651,7 @@ - + @@ -11689,6 +11705,10 @@ + + + + @@ -11835,7 +11855,7 @@ - + @@ -11851,7 +11871,7 @@ - + @@ -12043,7 +12063,7 @@ - + @@ -12171,7 +12191,7 @@ - + @@ -12303,7 +12323,7 @@ - + @@ -12427,7 +12447,7 @@ - + @@ -12467,7 +12487,7 @@ - + @@ -12551,7 +12571,7 @@ - + @@ -12575,7 +12595,7 @@ - + @@ -12599,7 +12619,7 @@ - + @@ -12639,7 +12659,7 @@ - + @@ -12691,7 +12711,7 @@ - + @@ -12747,7 +12767,7 @@ - + @@ -12759,7 +12779,7 @@ - + @@ -12871,7 +12891,7 @@ - + @@ -12903,7 +12923,7 @@ - + @@ -13059,7 +13079,7 @@ - + @@ -13495,7 +13515,7 @@ - + @@ -13511,7 +13531,7 @@ - + @@ -13701,6 +13721,10 @@ + + + + @@ -13847,7 +13871,7 @@ - + @@ -14115,7 +14139,7 @@ - + @@ -14151,7 +14175,7 @@ - + @@ -14199,7 +14223,7 @@ - + @@ -14219,7 +14243,7 @@ - + @@ -14291,7 +14315,7 @@ - + @@ -14323,7 +14347,7 @@ - + @@ -14407,7 +14431,7 @@ - + @@ -14655,7 +14679,7 @@ - + @@ -14725,6 +14749,10 @@ + + + + @@ -15291,7 +15319,7 @@ - + @@ -15475,7 +15503,7 @@ - + @@ -15511,7 +15539,7 @@ - + @@ -15675,7 +15703,7 @@ - + @@ -15861,6 +15889,10 @@ + + + + @@ -15971,7 +16003,7 @@ - + @@ -15987,7 +16019,7 @@ - + @@ -16183,7 +16215,7 @@ - + @@ -16203,7 +16235,7 @@ - + @@ -16295,7 +16327,7 @@ - + @@ -16315,7 +16347,7 @@ - + @@ -16355,7 +16387,7 @@ - + @@ -16391,7 +16423,7 @@ - + @@ -16451,7 +16483,7 @@ - + @@ -16479,7 +16511,7 @@ - + @@ -16539,7 +16571,7 @@ - + @@ -16607,7 +16639,7 @@ - + @@ -16619,7 +16651,7 @@ - + @@ -16719,7 +16751,7 @@ - + @@ -16743,7 +16775,7 @@ - + @@ -16807,7 +16839,7 @@ - + @@ -16955,7 +16987,7 @@ - + @@ -17055,7 +17087,7 @@ - + @@ -17083,7 +17115,7 @@ - + @@ -17319,7 +17351,7 @@ - + @@ -17335,7 +17367,7 @@ - + @@ -17423,7 +17455,7 @@ - + @@ -17591,7 +17623,7 @@ - + @@ -17651,7 +17683,7 @@ - + @@ -17799,7 +17831,7 @@ - + @@ -17943,7 +17975,7 @@ - + @@ -18007,7 +18039,7 @@ - + @@ -18091,7 +18123,7 @@ - + @@ -18299,7 +18331,7 @@ - + @@ -18387,7 +18419,7 @@ - + @@ -18427,7 +18459,7 @@ - + @@ -18435,7 +18467,7 @@ - + @@ -18455,7 +18487,7 @@ - + @@ -18467,7 +18499,7 @@ - + @@ -18515,7 +18547,7 @@ - + @@ -18663,7 +18695,7 @@ - + @@ -18679,7 +18711,7 @@ - + @@ -18839,7 +18871,7 @@ - + @@ -19015,7 +19047,7 @@ - + @@ -19247,7 +19279,7 @@ - + @@ -19351,7 +19383,7 @@ - + @@ -19443,7 +19475,7 @@ - + @@ -19479,7 +19511,7 @@ - + @@ -19607,7 +19639,7 @@ - + @@ -19671,7 +19703,7 @@ - + @@ -19679,7 +19711,7 @@ - + @@ -19727,7 +19759,7 @@ - + @@ -19971,7 +20003,7 @@ - + @@ -20011,7 +20043,7 @@ - + @@ -20039,7 +20071,7 @@ - + @@ -20079,7 +20111,7 @@ - + @@ -20175,7 +20207,7 @@ - + @@ -20415,7 +20447,7 @@ - + @@ -20423,12 +20455,16 @@ - + + + + + @@ -20443,7 +20479,7 @@ - + @@ -20503,7 +20539,7 @@ - + @@ -20707,7 +20743,7 @@ - + @@ -20719,7 +20755,7 @@ - + @@ -20763,7 +20799,7 @@ - + @@ -20781,6 +20817,10 @@ + + + + @@ -20965,6 +21005,10 @@ + + + + @@ -21179,7 +21223,7 @@ - + @@ -21247,7 +21291,7 @@ - + @@ -21443,7 +21487,7 @@ - + @@ -21479,7 +21523,7 @@ - + @@ -21503,7 +21547,7 @@ - + @@ -21523,7 +21567,7 @@ - + @@ -21803,7 +21847,7 @@ - + @@ -22155,7 +22199,7 @@ - + @@ -22235,7 +22279,7 @@ - + @@ -22275,7 +22319,7 @@ - + @@ -22359,7 +22403,7 @@ - + @@ -22739,7 +22783,7 @@ - + @@ -22763,7 +22807,7 @@ - + @@ -22795,7 +22839,7 @@ - + @@ -22839,7 +22883,7 @@ - + @@ -22851,7 +22895,7 @@ - + @@ -22875,7 +22919,7 @@ - + @@ -22891,7 +22935,7 @@ - + @@ -22901,6 +22945,10 @@ + + + + @@ -23063,7 +23111,7 @@ - + @@ -23095,7 +23143,7 @@ - + @@ -23123,7 +23171,7 @@ - + @@ -23131,7 +23179,7 @@ - + @@ -23311,7 +23359,7 @@ - + @@ -23491,7 +23539,7 @@ - + @@ -23675,7 +23723,7 @@ - + @@ -23707,7 +23755,7 @@ - + @@ -23715,7 +23763,7 @@ - + @@ -23807,7 +23855,7 @@ - + @@ -23995,7 +24043,7 @@ - + @@ -24067,7 +24115,7 @@ - + @@ -24103,7 +24151,7 @@ - + @@ -24235,7 +24283,7 @@ - + @@ -24251,7 +24299,7 @@ - + @@ -24259,7 +24307,7 @@ - + @@ -24275,7 +24323,7 @@ - + @@ -24343,7 +24391,7 @@ - + @@ -24411,7 +24459,7 @@ - + @@ -24699,7 +24747,7 @@ - + @@ -24711,7 +24759,7 @@ - + @@ -24939,7 +24987,7 @@ - + @@ -25079,7 +25127,7 @@ - + @@ -25183,7 +25231,7 @@ - + @@ -25219,7 +25267,7 @@ - + @@ -25231,7 +25279,7 @@ - + @@ -25335,7 +25383,7 @@ - + @@ -25527,7 +25575,7 @@ - + @@ -25559,19 +25607,19 @@ - + - + - + - + @@ -25587,7 +25635,7 @@ - + @@ -25607,7 +25655,7 @@ - + @@ -25619,7 +25667,7 @@ - + @@ -25711,7 +25759,7 @@ - + @@ -25939,7 +25987,7 @@ - + @@ -26043,7 +26091,7 @@ - + @@ -26119,7 +26167,7 @@ - + @@ -26135,7 +26183,7 @@ - + @@ -26143,11 +26191,11 @@ - + - + @@ -26231,7 +26279,7 @@ - + @@ -26251,7 +26299,7 @@ - + @@ -26359,7 +26407,7 @@ - + @@ -26419,7 +26467,7 @@ - + @@ -26451,7 +26499,7 @@ - + @@ -26539,7 +26587,7 @@ - + @@ -26753,6 +26801,10 @@ + + + + @@ -26763,7 +26815,7 @@ - + @@ -26807,7 +26859,7 @@ - + @@ -26831,7 +26883,7 @@ - + @@ -26839,7 +26891,7 @@ - + @@ -26863,7 +26915,7 @@ - + @@ -27423,7 +27475,7 @@ - + @@ -27435,7 +27487,7 @@ - + @@ -27751,7 +27803,7 @@ - + @@ -27783,7 +27835,7 @@ - + @@ -27835,7 +27887,7 @@ - + @@ -27859,7 +27911,7 @@ - + @@ -28143,7 +28195,7 @@ - + @@ -28419,7 +28471,7 @@ - + @@ -28447,7 +28499,7 @@ - + @@ -28495,7 +28547,7 @@ - + @@ -28507,7 +28559,7 @@ - + @@ -28515,7 +28567,7 @@ - + @@ -28639,7 +28691,7 @@ - + @@ -28807,7 +28859,7 @@ - + @@ -28855,7 +28907,7 @@ - + @@ -28891,7 +28943,7 @@ - + @@ -28907,11 +28959,11 @@ - + - + @@ -28955,7 +29007,7 @@ - + @@ -28971,11 +29023,11 @@ - + - + @@ -29143,7 +29195,7 @@ - + @@ -29177,6 +29229,10 @@ + + + + @@ -29191,7 +29247,7 @@ - + @@ -29207,7 +29263,7 @@ - + @@ -29283,7 +29339,7 @@ - + @@ -29311,7 +29367,7 @@ - + @@ -29523,7 +29579,7 @@ - + @@ -29531,7 +29587,7 @@ - + @@ -29719,7 +29775,7 @@ - + @@ -29971,11 +30027,11 @@ - + - + @@ -30019,7 +30075,7 @@ - + @@ -30083,7 +30139,7 @@ - + @@ -30127,7 +30183,7 @@ - + @@ -30255,7 +30311,7 @@ - + @@ -30355,7 +30411,7 @@ - + @@ -30587,7 +30643,7 @@ - + @@ -30607,7 +30663,7 @@ - + @@ -30667,11 +30723,11 @@ - + - + @@ -30695,7 +30751,7 @@ - + @@ -30827,7 +30883,7 @@ - + @@ -30951,7 +31007,7 @@ - + @@ -31091,7 +31147,7 @@ - + @@ -31231,7 +31287,7 @@ - + @@ -31267,7 +31323,7 @@ - + @@ -31275,7 +31331,7 @@ - + @@ -31407,7 +31463,7 @@ - + @@ -31467,7 +31523,7 @@ - + @@ -31811,7 +31867,7 @@ - + @@ -32047,7 +32103,7 @@ - + @@ -32199,7 +32255,7 @@ - + @@ -32283,7 +32339,7 @@ - + @@ -32539,7 +32595,7 @@ - + @@ -32587,11 +32643,11 @@ - + - + @@ -32671,7 +32727,7 @@ - + @@ -32799,11 +32855,11 @@ - + - + @@ -32959,7 +33015,7 @@ - + @@ -32991,7 +33047,7 @@ - + @@ -33219,7 +33275,7 @@ - + @@ -33263,7 +33319,7 @@ - + @@ -33471,7 +33527,7 @@ - + @@ -33627,7 +33683,7 @@ - + @@ -33707,7 +33763,7 @@ - + @@ -33831,7 +33887,7 @@ - + @@ -33891,7 +33947,7 @@ - + @@ -34015,7 +34071,7 @@ - + @@ -34195,7 +34251,7 @@ - + @@ -34207,7 +34263,7 @@ - + @@ -34395,7 +34451,7 @@ - + @@ -34679,7 +34735,7 @@ - + @@ -34715,7 +34771,7 @@ - + @@ -34847,7 +34903,7 @@ - + @@ -35011,7 +35067,7 @@ - + @@ -35107,7 +35163,7 @@ - + @@ -35275,7 +35331,7 @@ - + @@ -35387,7 +35443,7 @@ - + @@ -35459,7 +35515,7 @@ - + @@ -35559,7 +35615,7 @@ - + @@ -35627,7 +35683,7 @@ - + @@ -35635,7 +35691,7 @@ - + @@ -35699,7 +35755,7 @@ - + @@ -35815,7 +35871,7 @@ - + @@ -35899,7 +35955,7 @@ - + @@ -35939,7 +35995,7 @@ - + @@ -36003,7 +36059,7 @@ - + @@ -36143,7 +36199,7 @@ - + @@ -36383,7 +36439,7 @@ - + @@ -36417,6 +36473,10 @@ + + + + @@ -36547,7 +36607,7 @@ - + @@ -36587,7 +36647,7 @@ - + @@ -36623,7 +36683,7 @@ - + @@ -36687,7 +36747,7 @@ - + @@ -36743,7 +36803,7 @@ - + @@ -36759,7 +36819,7 @@ - + @@ -37035,7 +37095,7 @@ - + @@ -37131,7 +37191,7 @@ - + @@ -37187,7 +37247,7 @@ - + @@ -37335,7 +37395,7 @@ - + @@ -37407,7 +37467,7 @@ - + @@ -37463,7 +37523,7 @@ - + @@ -37475,7 +37535,7 @@ - + @@ -37523,7 +37583,7 @@ - + @@ -37639,11 +37699,11 @@ - + - + @@ -37683,7 +37743,7 @@ - + @@ -37807,7 +37867,7 @@ - + @@ -37819,7 +37879,7 @@ - + @@ -37851,7 +37911,7 @@ - + @@ -38003,7 +38063,7 @@ - + @@ -38087,7 +38147,7 @@ - + @@ -38175,7 +38235,7 @@ - + @@ -38355,7 +38415,7 @@ - + @@ -38411,7 +38471,7 @@ - + diff --git a/templates/dkcr/Script/BirdBoss.xml b/templates/dkcr/Script/BirdBoss.xml index 065f7024..87cb0f30 100644 --- a/templates/dkcr/Script/BirdBoss.xml +++ b/templates/dkcr/Script/BirdBoss.xml @@ -22,7 +22,7 @@ - + diff --git a/templates/dkcr/Script/ForestBoss.xml b/templates/dkcr/Script/ForestBoss.xml index dc4580f3..7e484a91 100644 --- a/templates/dkcr/Script/ForestBoss.xml +++ b/templates/dkcr/Script/ForestBoss.xml @@ -22,7 +22,7 @@ - + diff --git a/templates/dkcr/Script/GenericCreature.xml b/templates/dkcr/Script/GenericCreature.xml index b414b0e7..86238365 100644 --- a/templates/dkcr/Script/GenericCreature.xml +++ b/templates/dkcr/Script/GenericCreature.xml @@ -20,7 +20,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/templates/dkcr/Script/JungleBoss1.xml b/templates/dkcr/Script/JungleBoss1.xml index 8e5d221d..bd120834 100644 --- a/templates/dkcr/Script/JungleBoss1.xml +++ b/templates/dkcr/Script/JungleBoss1.xml @@ -23,7 +23,7 @@ - + diff --git a/templates/dkcr/Script/Kong.xml b/templates/dkcr/Script/Kong.xml index 1ad685ee..daccbdbe 100644 --- a/templates/dkcr/Script/Kong.xml +++ b/templates/dkcr/Script/Kong.xml @@ -7,7 +7,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/templates/dkcr/Script/MineCart.xml b/templates/dkcr/Script/MineCart.xml index 73e69a1a..11cc8216 100644 --- a/templates/dkcr/Script/MineCart.xml +++ b/templates/dkcr/Script/MineCart.xml @@ -18,7 +18,7 @@ - + 0.69999999 @@ -33,7 +33,7 @@ - + diff --git a/templates/dkcr/Script/Mole.xml b/templates/dkcr/Script/Mole.xml index 1116f797..587a84d3 100644 --- a/templates/dkcr/Script/Mole.xml +++ b/templates/dkcr/Script/Mole.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/dkcr/Script/PilotChicken.xml b/templates/dkcr/Script/PilotChicken.xml index f3c00b2c..92049c2c 100644 --- a/templates/dkcr/Script/PilotChicken.xml +++ b/templates/dkcr/Script/PilotChicken.xml @@ -22,7 +22,7 @@ - + diff --git a/templates/dkcr/Script/PirateCrab.xml b/templates/dkcr/Script/PirateCrab.xml index c1bd7e1b..2ca4dca7 100644 --- a/templates/dkcr/Script/PirateCrab.xml +++ b/templates/dkcr/Script/PirateCrab.xml @@ -30,7 +30,7 @@ - + diff --git a/templates/dkcr/Script/PlayerActor.xml b/templates/dkcr/Script/PlayerActor.xml index d72f50ca..ace94257 100644 --- a/templates/dkcr/Script/PlayerActor.xml +++ b/templates/dkcr/Script/PlayerActor.xml @@ -89,7 +89,7 @@ - + diff --git a/templates/dkcr/Script/Rambi.xml b/templates/dkcr/Script/Rambi.xml index 7ada3e12..7587cc33 100644 --- a/templates/dkcr/Script/Rambi.xml +++ b/templates/dkcr/Script/Rambi.xml @@ -7,7 +7,7 @@ - + diff --git a/templates/dkcr/Script/RobotChicken.xml b/templates/dkcr/Script/RobotChicken.xml index 265aa8ec..bf88f09f 100644 --- a/templates/dkcr/Script/RobotChicken.xml +++ b/templates/dkcr/Script/RobotChicken.xml @@ -22,7 +22,7 @@ - + diff --git a/templates/dkcr/Script/RobotChickenFlyer.xml b/templates/dkcr/Script/RobotChickenFlyer.xml index 91153da3..2b41f01f 100644 --- a/templates/dkcr/Script/RobotChickenFlyer.xml +++ b/templates/dkcr/Script/RobotChickenFlyer.xml @@ -22,7 +22,7 @@ - + diff --git a/templates/dkcr/Script/RocketBarrel.xml b/templates/dkcr/Script/RocketBarrel.xml index 2cf881f8..5c8f0073 100644 --- a/templates/dkcr/Script/RocketBarrel.xml +++ b/templates/dkcr/Script/RocketBarrel.xml @@ -18,7 +18,7 @@ - + 0.5 diff --git a/templates/dkcr/Script/VerticalRocketBarrel.xml b/templates/dkcr/Script/VerticalRocketBarrel.xml index fe7995de..ea845d01 100644 --- a/templates/dkcr/Script/VerticalRocketBarrel.xml +++ b/templates/dkcr/Script/VerticalRocketBarrel.xml @@ -18,7 +18,7 @@ - + 0.5 diff --git a/templates/dkcr/Script/VolcanoBossBodyPart.xml b/templates/dkcr/Script/VolcanoBossBodyPart.xml index 2c00d5c6..6429bc7a 100644 --- a/templates/dkcr/Script/VolcanoBossBodyPart.xml +++ b/templates/dkcr/Script/VolcanoBossBodyPart.xml @@ -23,7 +23,7 @@ - + diff --git a/templates/dkcr/Structs/ForestBossStructC.xml b/templates/dkcr/Structs/ForestBossStructC.xml index ddf60a44..816a9eb0 100644 --- a/templates/dkcr/Structs/ForestBossStructC.xml +++ b/templates/dkcr/Structs/ForestBossStructC.xml @@ -34,7 +34,7 @@ 1.0 - + diff --git a/templates/dkcr/Structs/UnknownStruct44.xml b/templates/dkcr/Structs/UnknownStruct44.xml index 8c5231b3..8525a68d 100644 --- a/templates/dkcr/Structs/UnknownStruct44.xml +++ b/templates/dkcr/Structs/UnknownStruct44.xml @@ -20,24 +20,24 @@ - - + + - + - - + + - - - + + + - + diff --git a/templates/mp3/Script/AtomicAlpha.xml b/templates/mp3/Script/AtomicAlpha.xml index 5597a3b0..13c46587 100644 --- a/templates/mp3/Script/AtomicAlpha.xml +++ b/templates/mp3/Script/AtomicAlpha.xml @@ -8,7 +8,7 @@ - + WPSC diff --git a/templates/mp3/Script/AuroraUnit1.xml b/templates/mp3/Script/AuroraUnit1.xml index a7fe47be..ee59a171 100644 --- a/templates/mp3/Script/AuroraUnit1.xml +++ b/templates/mp3/Script/AuroraUnit1.xml @@ -7,7 +7,7 @@ AuroraUnit1 - + 360.0 diff --git a/templates/mp3/Script/AuroraUnit2.xml b/templates/mp3/Script/AuroraUnit2.xml index 9377b607..d0adfd06 100644 --- a/templates/mp3/Script/AuroraUnit2.xml +++ b/templates/mp3/Script/AuroraUnit2.xml @@ -7,7 +7,7 @@ AuroraUnit2 - + 360.0 diff --git a/templates/mp3/Script/BeastRider.xml b/templates/mp3/Script/BeastRider.xml index 12a4507c..66ddc8e3 100644 --- a/templates/mp3/Script/BeastRider.xml +++ b/templates/mp3/Script/BeastRider.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/Berserker.xml b/templates/mp3/Script/Berserker.xml index 27b6ae09..1cd7d4e8 100644 --- a/templates/mp3/Script/Berserker.xml +++ b/templates/mp3/Script/Berserker.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/BlinkWolf.xml b/templates/mp3/Script/BlinkWolf.xml index f7ec5b30..0379ac04 100644 --- a/templates/mp3/Script/BlinkWolf.xml +++ b/templates/mp3/Script/BlinkWolf.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/CombatTrooper.xml b/templates/mp3/Script/CombatTrooper.xml index 9a1a2c3b..ccf45b29 100644 --- a/templates/mp3/Script/CombatTrooper.xml +++ b/templates/mp3/Script/CombatTrooper.xml @@ -8,7 +8,7 @@ - + 1.0 diff --git a/templates/mp3/Script/DarkSamus.xml b/templates/mp3/Script/DarkSamus.xml index 8bd03803..db4469f9 100644 --- a/templates/mp3/Script/DarkSamus.xml +++ b/templates/mp3/Script/DarkSamus.xml @@ -9,11 +9,11 @@ - + - + - + diff --git a/templates/mp3/Script/DarkSamusEcho.xml b/templates/mp3/Script/DarkSamusEcho.xml index 80c8e4b6..fd0ab170 100644 --- a/templates/mp3/Script/DarkSamusEcho.xml +++ b/templates/mp3/Script/DarkSamusEcho.xml @@ -7,7 +7,7 @@ DarkSamusEcho - + 360.0 diff --git a/templates/mp3/Script/DefenseMechanoid.xml b/templates/mp3/Script/DefenseMechanoid.xml index 862293ac..4cfd50b2 100644 --- a/templates/mp3/Script/DefenseMechanoid.xml +++ b/templates/mp3/Script/DefenseMechanoid.xml @@ -9,11 +9,11 @@ - + - + - + diff --git a/templates/mp3/Script/EyePod.xml b/templates/mp3/Script/EyePod.xml index c1b51e8b..6be70b1b 100644 --- a/templates/mp3/Script/EyePod.xml +++ b/templates/mp3/Script/EyePod.xml @@ -9,7 +9,7 @@ - + diff --git a/templates/mp3/Script/FargullHatcher.xml b/templates/mp3/Script/FargullHatcher.xml index a5ab0722..d566557b 100644 --- a/templates/mp3/Script/FargullHatcher.xml +++ b/templates/mp3/Script/FargullHatcher.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/FlyingPirate.xml b/templates/mp3/Script/FlyingPirate.xml index 22d9b4d6..0b7913b6 100644 --- a/templates/mp3/Script/FlyingPirate.xml +++ b/templates/mp3/Script/FlyingPirate.xml @@ -7,7 +7,7 @@ FlyingPirate - + 360.0 diff --git a/templates/mp3/Script/Friendly.xml b/templates/mp3/Script/Friendly.xml index 61d5849c..02f82f91 100644 --- a/templates/mp3/Script/Friendly.xml +++ b/templates/mp3/Script/Friendly.xml @@ -8,7 +8,7 @@ - + 1.0 diff --git a/templates/mp3/Script/Gandrayda.xml b/templates/mp3/Script/Gandrayda.xml index b4deadf9..9411000a 100644 --- a/templates/mp3/Script/Gandrayda.xml +++ b/templates/mp3/Script/Gandrayda.xml @@ -7,7 +7,7 @@ Gandrayda - + diff --git a/templates/mp3/Script/GellSac.xml b/templates/mp3/Script/GellSac.xml index ec851924..7c088ba4 100644 --- a/templates/mp3/Script/GellSac.xml +++ b/templates/mp3/Script/GellSac.xml @@ -7,7 +7,7 @@ GellSac - + 10.0 diff --git a/templates/mp3/Script/GhorLowerBody.xml b/templates/mp3/Script/GhorLowerBody.xml index 7cfb1a4b..8e9c9e04 100644 --- a/templates/mp3/Script/GhorLowerBody.xml +++ b/templates/mp3/Script/GhorLowerBody.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/GhorUpperBody.xml b/templates/mp3/Script/GhorUpperBody.xml index 945087c0..10cec1eb 100644 --- a/templates/mp3/Script/GhorUpperBody.xml +++ b/templates/mp3/Script/GhorUpperBody.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/GragnolFlyer.xml b/templates/mp3/Script/GragnolFlyer.xml index 5c03591d..77e04d13 100644 --- a/templates/mp3/Script/GragnolFlyer.xml +++ b/templates/mp3/Script/GragnolFlyer.xml @@ -7,7 +7,7 @@ GragnolFlyer - + diff --git a/templates/mp3/Script/GunTurretBase.xml b/templates/mp3/Script/GunTurretBase.xml index b02e4307..3294c5fc 100644 --- a/templates/mp3/Script/GunTurretBase.xml +++ b/templates/mp3/Script/GunTurretBase.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/GunTurretTop.xml b/templates/mp3/Script/GunTurretTop.xml index a378d885..0fcd9cca 100644 --- a/templates/mp3/Script/GunTurretTop.xml +++ b/templates/mp3/Script/GunTurretTop.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/Korakk.xml b/templates/mp3/Script/Korakk.xml index a459fcdd..e6607465 100644 --- a/templates/mp3/Script/Korakk.xml +++ b/templates/mp3/Script/Korakk.xml @@ -9,7 +9,7 @@ - + 65.0 @@ -20,7 +20,7 @@ - + 65.0 @@ -31,7 +31,7 @@ - + 65.0 diff --git a/templates/mp3/Script/KorbaMaw.xml b/templates/mp3/Script/KorbaMaw.xml index 5bea7f7f..5a9a6185 100644 --- a/templates/mp3/Script/KorbaMaw.xml +++ b/templates/mp3/Script/KorbaMaw.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/Metaree.xml b/templates/mp3/Script/Metaree.xml index 8ffe3fd4..33668738 100644 --- a/templates/mp3/Script/Metaree.xml +++ b/templates/mp3/Script/Metaree.xml @@ -7,7 +7,7 @@ Metaree - + 30.0 diff --git a/templates/mp3/Script/MetroidHatcher.xml b/templates/mp3/Script/MetroidHatcher.xml index 882766bb..b6b5357c 100644 --- a/templates/mp3/Script/MetroidHatcher.xml +++ b/templates/mp3/Script/MetroidHatcher.xml @@ -7,7 +7,7 @@ MetroidHatcher - + 1000.0 @@ -62,7 +62,7 @@ - + 1000.0 @@ -117,7 +117,7 @@ - + 1000.0 diff --git a/templates/mp3/Script/MetroidHopper.xml b/templates/mp3/Script/MetroidHopper.xml index af1c8bc3..9eb2124a 100644 --- a/templates/mp3/Script/MetroidHopper.xml +++ b/templates/mp3/Script/MetroidHopper.xml @@ -7,7 +7,7 @@ MetroidHopper - + diff --git a/templates/mp3/Script/MetroidPhazeoid.xml b/templates/mp3/Script/MetroidPhazeoid.xml index caaef210..151b6172 100644 --- a/templates/mp3/Script/MetroidPhazeoid.xml +++ b/templates/mp3/Script/MetroidPhazeoid.xml @@ -8,7 +8,7 @@ - + 50.0 diff --git a/templates/mp3/Script/MinorIng.xml b/templates/mp3/Script/MinorIng.xml index e057fcd0..7f3790f6 100644 --- a/templates/mp3/Script/MinorIng.xml +++ b/templates/mp3/Script/MinorIng.xml @@ -7,7 +7,7 @@ MinorIng - + 4.0 diff --git a/templates/mp3/Script/MysteryFlyer.xml b/templates/mp3/Script/MysteryFlyer.xml index 6d13319d..d3fb4213 100644 --- a/templates/mp3/Script/MysteryFlyer.xml +++ b/templates/mp3/Script/MysteryFlyer.xml @@ -7,7 +7,7 @@ MysteryFlyer - + diff --git a/templates/mp3/Script/NoseTurret.xml b/templates/mp3/Script/NoseTurret.xml index 3cf35e75..2e1d08f0 100644 --- a/templates/mp3/Script/NoseTurret.xml +++ b/templates/mp3/Script/NoseTurret.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/Parasite.xml b/templates/mp3/Script/Parasite.xml index 0ded6d0c..c722569a 100644 --- a/templates/mp3/Script/Parasite.xml +++ b/templates/mp3/Script/Parasite.xml @@ -10,7 +10,7 @@ 0 - + 25.0 diff --git a/templates/mp3/Script/Phaazoid.xml b/templates/mp3/Script/Phaazoid.xml index 61b5eecb..afb9b3f9 100644 --- a/templates/mp3/Script/Phaazoid.xml +++ b/templates/mp3/Script/Phaazoid.xml @@ -7,7 +7,7 @@ Phaazoid - + diff --git a/templates/mp3/Script/PhazonHarvester.xml b/templates/mp3/Script/PhazonHarvester.xml index 2b15bff6..1c93192f 100644 --- a/templates/mp3/Script/PhazonHarvester.xml +++ b/templates/mp3/Script/PhazonHarvester.xml @@ -7,7 +7,7 @@ PhazonHarvester - + 15.0 diff --git a/templates/mp3/Script/PhazonLeech.xml b/templates/mp3/Script/PhazonLeech.xml index abe6c281..8c7b399b 100644 --- a/templates/mp3/Script/PhazonLeech.xml +++ b/templates/mp3/Script/PhazonLeech.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/PhazonPuffer.xml b/templates/mp3/Script/PhazonPuffer.xml index f6fa2577..af41bb1e 100644 --- a/templates/mp3/Script/PhazonPuffer.xml +++ b/templates/mp3/Script/PhazonPuffer.xml @@ -7,7 +7,7 @@ PhazonPuffer - + diff --git a/templates/mp3/Script/PhazonTentacle.xml b/templates/mp3/Script/PhazonTentacle.xml index 88d88dd9..471ef68c 100644 --- a/templates/mp3/Script/PhazonTentacle.xml +++ b/templates/mp3/Script/PhazonTentacle.xml @@ -7,7 +7,7 @@ PhazonTentacle - + diff --git a/templates/mp3/Script/PillBug.xml b/templates/mp3/Script/PillBug.xml index 8283b134..6377b4ee 100644 --- a/templates/mp3/Script/PillBug.xml +++ b/templates/mp3/Script/PillBug.xml @@ -7,7 +7,7 @@ PillBug - + diff --git a/templates/mp3/Script/PirateDrone.xml b/templates/mp3/Script/PirateDrone.xml index 6d6b2084..802d6b28 100644 --- a/templates/mp3/Script/PirateDrone.xml +++ b/templates/mp3/Script/PirateDrone.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/Puffer.xml b/templates/mp3/Script/Puffer.xml index f5fa9d5c..9efca504 100644 --- a/templates/mp3/Script/Puffer.xml +++ b/templates/mp3/Script/Puffer.xml @@ -8,7 +8,7 @@ - + 0.0 diff --git a/templates/mp3/Script/ReptilicusHunter.xml b/templates/mp3/Script/ReptilicusHunter.xml index 820238e9..8391eefb 100644 --- a/templates/mp3/Script/ReptilicusHunter.xml +++ b/templates/mp3/Script/ReptilicusHunter.xml @@ -7,7 +7,7 @@ ReptilicusHunter - + 360.0 diff --git a/templates/mp3/Script/Ridley1.xml b/templates/mp3/Script/Ridley1.xml index 0f255836..65b23678 100644 --- a/templates/mp3/Script/Ridley1.xml +++ b/templates/mp3/Script/Ridley1.xml @@ -9,11 +9,11 @@ - + - + - + diff --git a/templates/mp3/Script/Rundas.xml b/templates/mp3/Script/Rundas.xml index 2dfa0094..301b5320 100644 --- a/templates/mp3/Script/Rundas.xml +++ b/templates/mp3/Script/Rundas.xml @@ -9,7 +9,7 @@ - + Never @@ -35,7 +35,7 @@ - + Never @@ -61,7 +61,7 @@ - + Never diff --git a/templates/mp3/Script/SamusForm.xml b/templates/mp3/Script/SamusForm.xml index 15e3c1df..0417649b 100644 --- a/templates/mp3/Script/SamusForm.xml +++ b/templates/mp3/Script/SamusForm.xml @@ -8,7 +8,7 @@ - + 0.0 diff --git a/templates/mp3/Script/SeedBoss1.xml b/templates/mp3/Script/SeedBoss1.xml index 99ec3799..5e01c64c 100644 --- a/templates/mp3/Script/SeedBoss1.xml +++ b/templates/mp3/Script/SeedBoss1.xml @@ -7,7 +7,7 @@ SeedBoss1 - + diff --git a/templates/mp3/Script/SeedBoss1Orb.xml b/templates/mp3/Script/SeedBoss1Orb.xml index 889e07f0..70a54d82 100644 --- a/templates/mp3/Script/SeedBoss1Orb.xml +++ b/templates/mp3/Script/SeedBoss1Orb.xml @@ -7,7 +7,7 @@ SeedBoss1Orb - + diff --git a/templates/mp3/Script/SeedBoss2BotSwarm.xml b/templates/mp3/Script/SeedBoss2BotSwarm.xml index 38036453..96e86489 100644 --- a/templates/mp3/Script/SeedBoss2BotSwarm.xml +++ b/templates/mp3/Script/SeedBoss2BotSwarm.xml @@ -7,7 +7,7 @@ SeedBoss2BotSwarm - + diff --git a/templates/mp3/Script/SeedBoss2GiantForm.xml b/templates/mp3/Script/SeedBoss2GiantForm.xml index 6dcd9288..c85c8662 100644 --- a/templates/mp3/Script/SeedBoss2GiantForm.xml +++ b/templates/mp3/Script/SeedBoss2GiantForm.xml @@ -7,7 +7,7 @@ SeedBoss2GiantForm - + diff --git a/templates/mp3/Script/SeedBoss2PrimeBot.xml b/templates/mp3/Script/SeedBoss2PrimeBot.xml index 97bc5539..11930b7b 100644 --- a/templates/mp3/Script/SeedBoss2PrimeBot.xml +++ b/templates/mp3/Script/SeedBoss2PrimeBot.xml @@ -9,11 +9,11 @@ - + - + - + diff --git a/templates/mp3/Script/SeedBoss3.xml b/templates/mp3/Script/SeedBoss3.xml index 80cf5365..451ed7de 100644 --- a/templates/mp3/Script/SeedBoss3.xml +++ b/templates/mp3/Script/SeedBoss3.xml @@ -10,7 +10,7 @@ - + 1000.0 @@ -56,7 +56,7 @@ - + 1000.0 @@ -102,7 +102,7 @@ - + 1000.0 diff --git a/templates/mp3/Script/ShellBug.xml b/templates/mp3/Script/ShellBug.xml index 2933fa83..349571b0 100644 --- a/templates/mp3/Script/ShellBug.xml +++ b/templates/mp3/Script/ShellBug.xml @@ -9,7 +9,7 @@ - + diff --git a/templates/mp3/Script/Ship.xml b/templates/mp3/Script/Ship.xml index 7a13bfba..7278a75a 100644 --- a/templates/mp3/Script/Ship.xml +++ b/templates/mp3/Script/Ship.xml @@ -7,7 +7,7 @@ Ship - + diff --git a/templates/mp3/Script/SpacePirate.xml b/templates/mp3/Script/SpacePirate.xml index 1de18f91..e1970433 100644 --- a/templates/mp3/Script/SpacePirate.xml +++ b/templates/mp3/Script/SpacePirate.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/Sprite.xml b/templates/mp3/Script/Sprite.xml index 8aee5885..b353b14e 100644 --- a/templates/mp3/Script/Sprite.xml +++ b/templates/mp3/Script/Sprite.xml @@ -8,7 +8,7 @@ - + 50.0 diff --git a/templates/mp3/Script/SteamBot.xml b/templates/mp3/Script/SteamBot.xml index fddfd7a8..ff6f6cc2 100644 --- a/templates/mp3/Script/SteamBot.xml +++ b/templates/mp3/Script/SteamBot.xml @@ -8,7 +8,7 @@ - + diff --git a/templates/mp3/Script/SteamDrone.xml b/templates/mp3/Script/SteamDrone.xml index 83010048..1433ff10 100644 --- a/templates/mp3/Script/SteamDrone.xml +++ b/templates/mp3/Script/SteamDrone.xml @@ -7,7 +7,7 @@ SteamDrone - + diff --git a/templates/mp3/Script/SteamLord.xml b/templates/mp3/Script/SteamLord.xml index 3f786c1e..113c5040 100644 --- a/templates/mp3/Script/SteamLord.xml +++ b/templates/mp3/Script/SteamLord.xml @@ -7,7 +7,7 @@ SteamLord - + diff --git a/templates/mp3/Script/SwarmBot.xml b/templates/mp3/Script/SwarmBot.xml index 8a94cd7b..226ce852 100644 --- a/templates/mp3/Script/SwarmBot.xml +++ b/templates/mp3/Script/SwarmBot.xml @@ -7,7 +7,7 @@ SwarmBot - +