From 0497ab6dc44c2fb0dd2971342e0fc18aefacde89 Mon Sep 17 00:00:00 2001 From: Bearborg Date: Fri, 10 Jul 2026 02:56:31 -0400 Subject: [PATCH] More property matches and cleanup, some enums --- DKCR/Enums/RenderingType.xml | 12 + ...TweakGraphicalTransitions_UnknownEnum1.xml | 12 - DKCR/Enums/UnknownEnum2.xml | 12 +- DKCR/Game.xml | 8 +- DKCR/Script/AIHint.xml | 2 +- DKCR/Script/CameraBlurKeyframe.xml | 4 +- DKCR/Script/CameraFilterKeyframe.xml | 4 +- DKCR/Script/DistanceFog.xml | 2 +- DKCR/Script/DynamicLight.xml | 2 +- DKCR/Script/StreamedMovie.xml | 2 +- DKCR/Script/TextPane.xml | 2 +- DKCR/Structs/CameraTracking.xml | 8 +- DKCR/Structs/DynamicLightFalloff.xml | 2 +- DKCR/Structs/JungleBossStructB.xml | 14 +- DKCR/Structs/LightParameters.xml | 2 +- DKCR/Structs/PathDetermination.xml | 8 +- DKCR/Structs/SplineType.xml | 2 +- DKCR/Structs/TrackPlayer.xml | 8 +- ...eakGraphicalTransitions_UnknownStruct2.xml | 2 +- DKCR/Structs/UnknownStruct84.xml | 12 +- DKCR/Structs/VolcanoBossBodyPartStructA.xml | 4 +- DKCR/Structs/VolcanoBossBodyPartStructD.xml | 14 +- MP2/Script/AIHint.xml | 2 +- MP2/Script/AIJumpPoint.xml | 2 +- MP2/Script/AtomicAlpha.xml | 2 +- MP2/Script/Blogg.xml | 2 +- MP2/Script/CameraBlurKeyframe.xml | 4 +- MP2/Script/CameraFilterKeyframe.xml | 4 +- MP2/Script/ChozoGhost.xml | 2 +- MP2/Script/ColorModulate.xml | 2 +- MP2/Script/CommandoPirate.xml | 2 +- MP2/Script/ControlHint.xml | 2 +- MP2/Script/DarkCommando.xml | 2 +- MP2/Script/DarkSamus.xml | 6 +- MP2/Script/DarkTrooper.xml | 2 +- MP2/Script/Debris.xml | 2 +- MP2/Script/DigitalGuardian.xml | 2 +- MP2/Script/DigitalGuardianHead.xml | 2 +- MP2/Script/DistanceFog.xml | 2 +- MP2/Script/DynamicLight.xml | 4 +- MP2/Script/Effect.xml | 2 +- MP2/Script/ElitePirate.xml | 2 +- MP2/Script/EmperorIngStage1.xml | 2 +- MP2/Script/EmperorIngStage2Tentacle.xml | 2 +- MP2/Script/EmperorIngStage3.xml | 2 +- MP2/Script/FishCloud.xml | 2 +- MP2/Script/Grenchler.xml | 2 +- MP2/Script/GuiMenu.xml | 2 +- MP2/Script/GuiScreen.xml | 2 +- MP2/Script/Ing.xml | 2 +- MP2/Script/IngBoostBallGuardian.xml | 2 +- MP2/Script/IngSpaceJumpGuardian.xml | 2 +- MP2/Script/IngSpiderballGuardian.xml | 2 +- MP2/Script/Lumite.xml | 2 +- MP2/Script/MediumIng.xml | 4 +- MP2/Script/MetroidAlpha.xml | 2 +- MP2/Script/PathCamera.xml | 2 +- MP2/Script/PathMeshCtrl.xml | 2 +- MP2/Script/PlayerActor.xml | 2 +- MP2/Script/PlayerController.xml | 2 +- MP2/Script/PlayerStateChange.xml | 2 +- MP2/Script/PortalTransition.xml | 2 +- MP2/Script/PuddleSpore.xml | 2 +- MP2/Script/Repulsor.xml | 2 +- MP2/Script/Rezbit.xml | 2 +- MP2/Script/RiftPortal.xml | 2 +- MP2/Script/SafeZone.xml | 6 +- MP2/Script/SafeZoneCrystal.xml | 2 +- MP2/Script/SandBoss.xml | 2 +- MP2/Script/Sandworm.xml | 2 +- MP2/Script/Shredder.xml | 2 +- MP2/Script/Shrieker.xml | 2 +- MP2/Script/SpacePirate.xml | 6 +- MP2/Script/SpiderBallWaypoint.xml | 2 +- MP2/Script/SplitterCommandModule.xml | 2 +- MP2/Script/SplitterMainChassis.xml | 2 +- MP2/Script/SporbBase.xml | 4 +- MP2/Script/StoneToad.xml | 2 +- MP2/Script/StreamedMovie.xml | 2 +- MP2/Script/SurfaceCamera.xml | 2 +- MP2/Script/SwampBossStage1.xml | 2 +- MP2/Script/SwampBossStage2.xml | 2 +- MP2/Script/TeamAI.xml | 2 +- MP2/Script/TextPane.xml | 2 +- MP2/Script/VisorFlare.xml | 4 +- MP2/Script/VisorGoo.xml | 4 +- MP2/Script/WallWalker.xml | 2 +- MP2/Script/Water.xml | 12 +- MP2/Structs/CameraBehaviour.xml | 2 +- MP2/Structs/CameraHintStructA.xml | 2 +- MP2/Structs/CommandData.xml | 2 +- MP2/Structs/DigitalGuardianHeadStruct.xml | 2 +- MP2/Structs/DynamicLightFalloff.xml | 2 +- MP2/Structs/LayerInfo.xml | 2 +- MP2/Structs/LightParameters.xml | 2 +- MP2/Structs/PatternedAITypedef.xml | 8 +- MP2/Structs/SafeZoneStructA.xml | 2 +- MP2/Structs/SandBossStructA.xml | 6 +- MP2/Structs/SpindleCameraStruct.xml | 2 +- MP2/Structs/SplineType.xml | 2 +- MP2/Structs/SplitterCommandModuleData.xml | 8 +- MP2/Structs/SwampBossStage1Struct.xml | 8 +- MP2/Structs/SwampBossStage2Struct.xml | 10 +- MP2/Structs/TDamageInfo.xml | 2 +- MP2/Structs/TweakBall_DeathBall.xml | 2 +- MP2/Structs/TweakBall_ScrewAttack.xml | 2 +- MP2/Structs/TweakPlayerGun_Beam_Combo.xml | 8 +- MP2/Structs/TweakPlayerGun_Beam_Misc.xml | 6 +- MP2/Structs/TweakPlayerGun_Weapons.xml | 8 +- MP2/Structs/UnknownStruct39.xml | 2 +- MP2/Structs/UnknownStruct9.xml | 2 +- MP2Demo/Script/AIJumpPoint.xml | 2 +- MP2Demo/Script/AtomicAlpha.xml | 2 +- MP2Demo/Script/Blogg.xml | 2 +- MP2Demo/Script/CameraBlurKeyframe.xml | 4 +- MP2Demo/Script/CameraFilterKeyframe.xml | 4 +- MP2Demo/Script/ChozoGhost.xml | 2 +- MP2Demo/Script/ColorModulate.xml | 2 +- MP2Demo/Script/CommandoPirate.xml | 14 +- MP2Demo/Script/DarkSamus.xml | 2 +- MP2Demo/Script/DarkTrooper.xml | 2 +- MP2Demo/Script/Debris.xml | 2 +- MP2Demo/Script/DigitalGuardian.xml | 2 +- MP2Demo/Script/DigitalGuardianHead.xml | 2 +- MP2Demo/Script/DistanceFog.xml | 2 +- MP2Demo/Script/DynamicLight.xml | 4 +- MP2Demo/Script/ElitePirate.xml | 2 +- MP2Demo/Script/EmperorIngStage1.xml | 2 +- MP2Demo/Script/FishCloud.xml | 2 +- MP2Demo/Script/Grenchler.xml | 14 +- MP2Demo/Script/GuiMenu.xml | 2 +- MP2Demo/Script/GuiScreen.xml | 2 +- MP2Demo/Script/Ing.xml | 2 +- MP2Demo/Script/IngSpaceJumpGuardian.xml | 2 +- MP2Demo/Script/Lumite.xml | 2 +- MP2Demo/Script/MediumIng.xml | 4 +- MP2Demo/Script/PathCamera.xml | 2 +- MP2Demo/Script/PathMeshCtrl.xml | 2 +- MP2Demo/Script/PlayerActor.xml | 2 +- MP2Demo/Script/PlayerController.xml | 2 +- MP2Demo/Script/PlayerStateChange.xml | 2 +- MP2Demo/Script/Repulsor.xml | 2 +- MP2Demo/Script/Rezbit.xml | 2 +- MP2Demo/Script/RiftPortal.xml | 2 +- MP2Demo/Script/SandBoss.xml | 14 +- MP2Demo/Script/Sandworm.xml | 2 +- MP2Demo/Script/Shredder.xml | 2 +- MP2Demo/Script/Shrieker.xml | 2 +- MP2Demo/Script/SpacePirate.xml | 6 +- MP2Demo/Script/SpiderBallWaypoint.xml | 2 +- MP2Demo/Script/SplitterCommandModule.xml | 2 +- MP2Demo/Script/SplitterMainChassis.xml | 2 +- MP2Demo/Script/SporbBase.xml | 4 +- MP2Demo/Script/StoneToad.xml | 2 +- MP2Demo/Script/SurfaceCamera.xml | 2 +- MP2Demo/Script/TeamAI.xml | 2 +- MP2Demo/Script/TextPane.xml | 2 +- MP2Demo/Script/VisorFlare.xml | 4 +- MP2Demo/Script/VisorGoo.xml | 4 +- MP2Demo/Script/WallCrawlerSwarm.xml | 8 +- MP2Demo/Script/WallWalker.xml | 2 +- MP2Demo/Script/Water.xml | 2 +- MP2Demo/Structs/CameraBehaviour.xml | 2 +- MP2Demo/Structs/CameraHintStructA1.xml | 2 +- MP2Demo/Structs/DigitalGuardianData.xml | 10 +- MP2Demo/Structs/DigitalGuardianHeadData.xml | 8 +- MP2Demo/Structs/DynamicLightFalloff.xml | 2 +- MP2Demo/Structs/LayerInfo.xml | 2 +- MP2Demo/Structs/LightParameters.xml | 2 +- MP2Demo/Structs/PatternedAITypedef.xml | 8 +- MP2Demo/Structs/RezbitData.xml | 4 +- MP2Demo/Structs/SpindleCameraStruct.xml | 2 +- MP2Demo/Structs/SplineType.xml | 2 +- MP2Demo/Structs/SplitterCommandModuleData.xml | 8 +- MP2Demo/Structs/TDamageInfo.xml | 2 +- MP2Demo/Structs/TweakBall_DeathBall.xml | 2 +- MP2Demo/Structs/TweakBall_ScrewAttack.xml | 2 +- MP2Demo/Structs/TweakPlayerGun_Beam_Combo.xml | 8 +- MP2Demo/Structs/TweakPlayerGun_Beam_Misc.xml | 4 +- MP2Demo/Structs/TweakPlayerGun_Weapons.xml | 18 +- MP2Demo/Structs/UnknownStruct22.xml | 2 +- MP2Demo/Structs/UnknownStruct3.xml | 2 +- MP2Demo/Structs/UnknownStruct4.xml | 2 +- MP3/Game.xml | 32 +- MP3/Misc/TweakGui.xml | 8 +- MP3/Script/AIHint.xml | 2 +- MP3/Script/Achievement.xml | 4 +- MP3/Script/Berserker.xml | 2 +- MP3/Script/BlinkWolf.xml | 2 +- MP3/Script/CameraBlurKeyframe.xml | 4 +- MP3/Script/CameraFilterKeyframe.xml | 4 +- MP3/Script/CombatTrooper.xml | 2 +- MP3/Script/ControlHint.xml | 2 +- MP3/Script/DistanceFog.xml | 2 +- MP3/Script/DynamicLight.xml | 2 +- MP3/Script/Effect.xml | 2 +- MP3/Script/FishCloud.xml | 2 +- MP3/Script/Friendly.xml | 2 +- MP3/Script/Gandrayda.xml | 2 +- MP3/Script/GragnolFlyer.xml | 2 +- MP3/Script/GuiScreen.xml | 2 +- MP3/Script/KorbaMaw.xml | 2 +- MP3/Script/MetroidHatcher.xml | 6 +- MP3/Script/PathMeshCtrl.xml | 2 +- MP3/Script/PirateDrone.xml | 2 +- MP3/Script/PlayerActor.xml | 2 +- MP3/Script/Repulsor.xml | 2 +- MP3/Script/RoomAcoustics.xml | 10 +- MP3/Script/SeedBoss3.xml | 6 +- MP3/Script/SpacePirate.xml | 2 +- MP3/Script/SpecialFunction.xml | 2 +- MP3/Script/SpiderBallWaypoint.xml | 2 +- MP3/Script/StreamedMovie.xml | 2 +- MP3/Script/TeamAI.xml | 2 +- MP3/Script/TextPane.xml | 2 +- MP3/Script/VisorFlare.xml | 4 +- MP3/Structs/Abilities.xml | 2 +- MP3/Structs/CommandData.xml | 2 +- MP3/Structs/DynamicLightFalloff.xml | 2 +- MP3/Structs/GragnolFlyerData.xml | 4 +- MP3/Structs/GrappleBlock.xml | 2 +- MP3/Structs/GrappleData.xml | 2 +- MP3/Structs/LightParameters.xml | 2 +- MP3/Structs/PathDetermination.xml | 8 +- MP3/Structs/PatternedAITypedef.xml | 8 +- MP3/Structs/PhaazoidData.xml | 2 +- MP3/Structs/SpacePirateData.xml | 4 +- MP3/Structs/SplineType.xml | 2 +- MP3/Structs/TDamageInfo.xml | 2 +- MP3/Structs/TweakBall_DeathBall.xml | 2 +- MP3/Structs/TweakBall_FireBall.xml | 2 +- MP3/Structs/TweakBall_IceBall.xml | 2 +- MP3/Structs/TweakBall_PhazonBall.xml | 2 +- MP3/Structs/TweakBall_ScrewAttack.xml | 2 +- ...nStruct1.xml => TweakGui_CommandVisor.xml} | 2 +- ...Struct4.xml => TweakGui_GrappleEffect.xml} | 2 +- ...nownStruct3.xml => TweakGui_Hypermode.xml} | 2 +- ...nownStruct2.xml => TweakGui_XRayVisor.xml} | 2 +- MP3/Structs/TweakPlayerGun_Weapons.xml | 8 +- MP3/Structs/UnknownStruct17.xml | 4 +- MP3/Structs/UnknownStruct45.xml | 4 +- MP3/Structs/UnknownStruct61.xml | 4 +- MP3Proto/Script/AIHint.xml | 2 +- MP3Proto/Script/AiJumpPoint.xml | 2 +- MP3Proto/Script/Berserker.xml | 2 +- MP3Proto/Script/BlinkWolf.xml | 2 +- MP3Proto/Script/CameraBlurKeyframe.xml | 4 +- MP3Proto/Script/CameraFilterKeyframe.xml | 4 +- MP3Proto/Script/ColorModulate.xml | 2 +- MP3Proto/Script/ControlHint.xml | 2 +- MP3Proto/Script/DistanceFog.xml | 2 +- MP3Proto/Script/DynamicLight.xml | 2 +- MP3Proto/Script/Effect.xml | 2 +- MP3Proto/Script/FishCloud.xml | 2 +- MP3Proto/Script/Friendly.xml | 2 +- MP3Proto/Script/GragnolFlyer.xml | 2 +- MP3Proto/Script/GuiMenu.xml | 2 +- MP3Proto/Script/GuiScreen.xml | 2 +- MP3Proto/Script/KorbaMaw.xml | 2 +- MP3Proto/Script/PathMeshCtrl.xml | 2 +- MP3Proto/Script/PirateDrone.xml | 2 +- MP3Proto/Script/PlayerActor.xml | 2 +- MP3Proto/Script/PlayerController.xml | 2 +- MP3Proto/Script/Repulsor.xml | 2 +- MP3Proto/Script/Rundas.xml | 2 +- MP3Proto/Script/SpacePirate.xml | 2 +- MP3Proto/Script/SpiderBallWaypoint.xml | 2 +- MP3Proto/Script/StreamedMovie.xml | 2 +- MP3Proto/Script/TeamAiMgr.xml | 2 +- MP3Proto/Script/TextPane.xml | 2 +- MP3Proto/Script/VisorFlare.xml | 4 +- MP3Proto/Structs/BerserkerData.xml | 2 +- MP3Proto/Structs/CommandData.xml | 2 +- MP3Proto/Structs/DynamicLightFalloff.xml | 2 +- MP3Proto/Structs/FlyingPirateData.xml | 2 +- MP3Proto/Structs/GragnolFlyerData.xml | 2 +- MP3Proto/Structs/GrappleBlock.xml | 2 +- MP3Proto/Structs/GrappleData.xml | 2 +- MP3Proto/Structs/LayerInfo.xml | 2 +- MP3Proto/Structs/LightParameters.xml | 2 +- MP3Proto/Structs/PathDetermination.xml | 8 +- MP3Proto/Structs/PatternedAITypedef.xml | 8 +- MP3Proto/Structs/SpacePirateData.xml | 2 +- MP3Proto/Structs/SplineType.xml | 2 +- MP3Proto/Structs/TDamageInfo.xml | 2 +- MP3Proto/Structs/TweakBall_DeathBall.xml | 2 +- MP3Proto/Structs/TweakBall_FireBall.xml | 2 +- MP3Proto/Structs/TweakBall_IceBall.xml | 2 +- MP3Proto/Structs/TweakBall_PhazonBall.xml | 2 +- MP3Proto/Structs/TweakBall_ScrewAttack.xml | 2 +- MP3Proto/Structs/TweakPlayerGun_Weapons.xml | 8 +- PropertyMap.xml | 1278 ++++++++--------- 292 files changed, 1136 insertions(+), 1124 deletions(-) create mode 100644 DKCR/Enums/RenderingType.xml delete mode 100644 DKCR/Enums/TweakGraphicalTransitions_UnknownEnum1.xml rename MP3/Structs/{TweakGui_UnknownStruct1.xml => TweakGui_CommandVisor.xml} (97%) rename MP3/Structs/{TweakGui_UnknownStruct4.xml => TweakGui_GrappleEffect.xml} (96%) rename MP3/Structs/{TweakGui_UnknownStruct3.xml => TweakGui_Hypermode.xml} (99%) rename MP3/Structs/{TweakGui_UnknownStruct2.xml => TweakGui_XRayVisor.xml} (94%) diff --git a/DKCR/Enums/RenderingType.xml b/DKCR/Enums/RenderingType.xml new file mode 100644 index 0000000..aa5bd9c --- /dev/null +++ b/DKCR/Enums/RenderingType.xml @@ -0,0 +1,12 @@ + + + + RenderingType + + + + + + + + diff --git a/DKCR/Enums/TweakGraphicalTransitions_UnknownEnum1.xml b/DKCR/Enums/TweakGraphicalTransitions_UnknownEnum1.xml deleted file mode 100644 index db7964b..0000000 --- a/DKCR/Enums/TweakGraphicalTransitions_UnknownEnum1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - TweakGraphicalTransitions_UnknownEnum1 - - - - - - - - diff --git a/DKCR/Enums/UnknownEnum2.xml b/DKCR/Enums/UnknownEnum2.xml index c87a173..7843f4b 100644 --- a/DKCR/Enums/UnknownEnum2.xml +++ b/DKCR/Enums/UnknownEnum2.xml @@ -3,12 +3,12 @@ UnknownEnum2 - - - - - - + + + + + + diff --git a/DKCR/Game.xml b/DKCR/Game.xml index 5aa51f4..dc6b9e8 100644 --- a/DKCR/Game.xml +++ b/DKCR/Game.xml @@ -1467,6 +1467,10 @@ ReactiveActorBehaviors + + RenderingType + + RetronomeMessage @@ -1723,10 +1727,6 @@ TweakControls_UnknownStruct2 - - TweakGraphicalTransitions_UnknownEnum1 - - TweakGraphicalTransitions_UnknownStruct1 diff --git a/DKCR/Script/AIHint.xml b/DKCR/Script/AIHint.xml index d14c9ba..0070d48 100644 --- a/DKCR/Script/AIHint.xml +++ b/DKCR/Script/AIHint.xml @@ -4,7 +4,7 @@ AIHint - + 0 diff --git a/DKCR/Script/CameraBlurKeyframe.xml b/DKCR/Script/CameraBlurKeyframe.xml index 1529912..489c3bd 100644 --- a/DKCR/Script/CameraBlurKeyframe.xml +++ b/DKCR/Script/CameraBlurKeyframe.xml @@ -4,13 +4,13 @@ CameraBlurKeyframe - + 0 0.0 - + 0 diff --git a/DKCR/Script/CameraFilterKeyframe.xml b/DKCR/Script/CameraFilterKeyframe.xml index 1f5e16e..dceba64 100644 --- a/DKCR/Script/CameraFilterKeyframe.xml +++ b/DKCR/Script/CameraFilterKeyframe.xml @@ -4,7 +4,7 @@ CameraFilterKeyframe - + 0 @@ -13,7 +13,7 @@ 0 - + 0 diff --git a/DKCR/Script/DistanceFog.xml b/DKCR/Script/DistanceFog.xml index 2f6ef3e..816932e 100644 --- a/DKCR/Script/DistanceFog.xml +++ b/DKCR/Script/DistanceFog.xml @@ -16,7 +16,7 @@ - + 0 diff --git a/DKCR/Script/DynamicLight.xml b/DKCR/Script/DynamicLight.xml index 68aa85d..95b2f44 100644 --- a/DKCR/Script/DynamicLight.xml +++ b/DKCR/Script/DynamicLight.xml @@ -4,7 +4,7 @@ DynamicLight - + 2 diff --git a/DKCR/Script/StreamedMovie.xml b/DKCR/Script/StreamedMovie.xml index 21dc978..ddaa429 100644 --- a/DKCR/Script/StreamedMovie.xml +++ b/DKCR/Script/StreamedMovie.xml @@ -17,7 +17,7 @@ 127 - + 0 diff --git a/DKCR/Script/TextPane.xml b/DKCR/Script/TextPane.xml index 6a62d5b..9d6f2c8 100644 --- a/DKCR/Script/TextPane.xml +++ b/DKCR/Script/TextPane.xml @@ -52,7 +52,7 @@ - + 1 diff --git a/DKCR/Structs/CameraTracking.xml b/DKCR/Structs/CameraTracking.xml index 899f132..8b2e7a6 100644 --- a/DKCR/Structs/CameraTracking.xml +++ b/DKCR/Structs/CameraTracking.xml @@ -13,10 +13,10 @@ 0xAF3945DE - - - - + + + + diff --git a/DKCR/Structs/DynamicLightFalloff.xml b/DKCR/Structs/DynamicLightFalloff.xml index a6c840b..c113d18 100644 --- a/DKCR/Structs/DynamicLightFalloff.xml +++ b/DKCR/Structs/DynamicLightFalloff.xml @@ -3,7 +3,7 @@ DynamicLightFalloff - + 0 diff --git a/DKCR/Structs/JungleBossStructB.xml b/DKCR/Structs/JungleBossStructB.xml index a4045dd..ae7ec4c 100644 --- a/DKCR/Structs/JungleBossStructB.xml +++ b/DKCR/Structs/JungleBossStructB.xml @@ -6,13 +6,13 @@ 0xA7F21E62 - - - - - - - + + + + + + + diff --git a/DKCR/Structs/LightParameters.xml b/DKCR/Structs/LightParameters.xml index 88c3797..6dc572d 100644 --- a/DKCR/Structs/LightParameters.xml +++ b/DKCR/Structs/LightParameters.xml @@ -56,7 +56,7 @@ 0.0 - + 0 diff --git a/DKCR/Structs/PathDetermination.xml b/DKCR/Structs/PathDetermination.xml index 36e0f45..437a771 100644 --- a/DKCR/Structs/PathDetermination.xml +++ b/DKCR/Structs/PathDetermination.xml @@ -6,10 +6,10 @@ 0x571AA317 - - - - + + + + diff --git a/DKCR/Structs/SplineType.xml b/DKCR/Structs/SplineType.xml index 67ac6ce..0c1099b 100644 --- a/DKCR/Structs/SplineType.xml +++ b/DKCR/Structs/SplineType.xml @@ -3,7 +3,7 @@ SplineType - + 0 diff --git a/DKCR/Structs/TrackPlayer.xml b/DKCR/Structs/TrackPlayer.xml index 96eb948..c4df302 100644 --- a/DKCR/Structs/TrackPlayer.xml +++ b/DKCR/Structs/TrackPlayer.xml @@ -31,10 +31,10 @@ 0xEC782F50 - - - - + + + + diff --git a/DKCR/Structs/TweakGraphicalTransitions_UnknownStruct2.xml b/DKCR/Structs/TweakGraphicalTransitions_UnknownStruct2.xml index df7934f..9419683 100644 --- a/DKCR/Structs/TweakGraphicalTransitions_UnknownStruct2.xml +++ b/DKCR/Structs/TweakGraphicalTransitions_UnknownStruct2.xml @@ -16,7 +16,7 @@ 0.0 - + 0x10C04105 diff --git a/DKCR/Structs/UnknownStruct84.xml b/DKCR/Structs/UnknownStruct84.xml index 45e4e62..3b0b409 100644 --- a/DKCR/Structs/UnknownStruct84.xml +++ b/DKCR/Structs/UnknownStruct84.xml @@ -6,12 +6,12 @@ 0xE56D8C03 - - - - - - + + + + + + diff --git a/DKCR/Structs/VolcanoBossBodyPartStructA.xml b/DKCR/Structs/VolcanoBossBodyPartStructA.xml index 63f9063..413757e 100644 --- a/DKCR/Structs/VolcanoBossBodyPartStructA.xml +++ b/DKCR/Structs/VolcanoBossBodyPartStructA.xml @@ -7,8 +7,8 @@ 0xB5C34B64 - - + + diff --git a/DKCR/Structs/VolcanoBossBodyPartStructD.xml b/DKCR/Structs/VolcanoBossBodyPartStructD.xml index 1e52a03..d7d414d 100644 --- a/DKCR/Structs/VolcanoBossBodyPartStructD.xml +++ b/DKCR/Structs/VolcanoBossBodyPartStructD.xml @@ -6,13 +6,13 @@ 0xA7F21E62 - - - - - - - + + + + + + + diff --git a/MP2/Script/AIHint.xml b/MP2/Script/AIHint.xml index 11ab977..34330db 100644 --- a/MP2/Script/AIHint.xml +++ b/MP2/Script/AIHint.xml @@ -4,7 +4,7 @@ AIHint - + 0 diff --git a/MP2/Script/AIJumpPoint.xml b/MP2/Script/AIJumpPoint.xml index 7939c8b..826d432 100644 --- a/MP2/Script/AIJumpPoint.xml +++ b/MP2/Script/AIJumpPoint.xml @@ -7,7 +7,7 @@ 3.0 - + 0 diff --git a/MP2/Script/AtomicAlpha.xml b/MP2/Script/AtomicAlpha.xml index d4eee0e..6edeba3 100644 --- a/MP2/Script/AtomicAlpha.xml +++ b/MP2/Script/AtomicAlpha.xml @@ -55,7 +55,7 @@ 0.0 - + 1 diff --git a/MP2/Script/Blogg.xml b/MP2/Script/Blogg.xml index 0cf43ca..1f7e58e 100644 --- a/MP2/Script/Blogg.xml +++ b/MP2/Script/Blogg.xml @@ -9,7 +9,7 @@ - + 1 diff --git a/MP2/Script/CameraBlurKeyframe.xml b/MP2/Script/CameraBlurKeyframe.xml index 2a61f13..819d729 100644 --- a/MP2/Script/CameraBlurKeyframe.xml +++ b/MP2/Script/CameraBlurKeyframe.xml @@ -4,13 +4,13 @@ CameraBlurKeyframe - + 0 0.0 - + 0 diff --git a/MP2/Script/CameraFilterKeyframe.xml b/MP2/Script/CameraFilterKeyframe.xml index e0dc8fc..f30d571 100644 --- a/MP2/Script/CameraFilterKeyframe.xml +++ b/MP2/Script/CameraFilterKeyframe.xml @@ -4,7 +4,7 @@ CameraFilterKeyframe - + 0 @@ -25,7 +25,7 @@ 0 - + 0 diff --git a/MP2/Script/ChozoGhost.xml b/MP2/Script/ChozoGhost.xml index 608a5e6..7f223d9 100644 --- a/MP2/Script/ChozoGhost.xml +++ b/MP2/Script/ChozoGhost.xml @@ -50,7 +50,7 @@ 4.5 - + 1 diff --git a/MP2/Script/ColorModulate.xml b/MP2/Script/ColorModulate.xml index 9a9fafe..6aacccb 100644 --- a/MP2/Script/ColorModulate.xml +++ b/MP2/Script/ColorModulate.xml @@ -19,7 +19,7 @@ 1.0 - + 0 diff --git a/MP2/Script/CommandoPirate.xml b/MP2/Script/CommandoPirate.xml index e50cea7..89feb5a 100644 --- a/MP2/Script/CommandoPirate.xml +++ b/MP2/Script/CommandoPirate.xml @@ -57,7 +57,7 @@ 0.2 - + 1 diff --git a/MP2/Script/ControlHint.xml b/MP2/Script/ControlHint.xml index 65ee513..9e79910 100644 --- a/MP2/Script/ControlHint.xml +++ b/MP2/Script/ControlHint.xml @@ -10,7 +10,7 @@ 0.0 - + 0 diff --git a/MP2/Script/DarkCommando.xml b/MP2/Script/DarkCommando.xml index c690cc2..8005cef 100644 --- a/MP2/Script/DarkCommando.xml +++ b/MP2/Script/DarkCommando.xml @@ -23,7 +23,7 @@ - + 1 diff --git a/MP2/Script/DarkSamus.xml b/MP2/Script/DarkSamus.xml index 2ce13bb..2eb465d 100644 --- a/MP2/Script/DarkSamus.xml +++ b/MP2/Script/DarkSamus.xml @@ -18,7 +18,7 @@ 1.0 - + 1 @@ -133,8 +133,8 @@ CRSC - - -1 + + 0 -1 diff --git a/MP2/Script/DarkTrooper.xml b/MP2/Script/DarkTrooper.xml index 0a6adb2..b824c89 100644 --- a/MP2/Script/DarkTrooper.xml +++ b/MP2/Script/DarkTrooper.xml @@ -22,7 +22,7 @@ 1.0 - + 1 diff --git a/MP2/Script/Debris.xml b/MP2/Script/Debris.xml index 58b3862..ada891b 100644 --- a/MP2/Script/Debris.xml +++ b/MP2/Script/Debris.xml @@ -37,7 +37,7 @@ 1.0 - + 0 diff --git a/MP2/Script/DigitalGuardian.xml b/MP2/Script/DigitalGuardian.xml index db07a97..ce2601d 100644 --- a/MP2/Script/DigitalGuardian.xml +++ b/MP2/Script/DigitalGuardian.xml @@ -22,7 +22,7 @@ - + 2 diff --git a/MP2/Script/DigitalGuardianHead.xml b/MP2/Script/DigitalGuardianHead.xml index 497c5ec..2212d16 100644 --- a/MP2/Script/DigitalGuardianHead.xml +++ b/MP2/Script/DigitalGuardianHead.xml @@ -22,7 +22,7 @@ - + 2 diff --git a/MP2/Script/DistanceFog.xml b/MP2/Script/DistanceFog.xml index 16bce36..a19b4b5 100644 --- a/MP2/Script/DistanceFog.xml +++ b/MP2/Script/DistanceFog.xml @@ -10,7 +10,7 @@ - + 0 diff --git a/MP2/Script/DynamicLight.xml b/MP2/Script/DynamicLight.xml index 5d67020..7e50edb 100644 --- a/MP2/Script/DynamicLight.xml +++ b/MP2/Script/DynamicLight.xml @@ -4,10 +4,10 @@ DynamicLight - + 2 - + 6 diff --git a/MP2/Script/Effect.xml b/MP2/Script/Effect.xml index bb512f0..721d57b 100644 --- a/MP2/Script/Effect.xml +++ b/MP2/Script/Effect.xml @@ -61,7 +61,7 @@ false - + 0 diff --git a/MP2/Script/ElitePirate.xml b/MP2/Script/ElitePirate.xml index db1e8c3..a960e9d 100644 --- a/MP2/Script/ElitePirate.xml +++ b/MP2/Script/ElitePirate.xml @@ -21,7 +21,7 @@ 2.0 - + 2 diff --git a/MP2/Script/EmperorIngStage1.xml b/MP2/Script/EmperorIngStage1.xml index 3522324..8eafdbb 100644 --- a/MP2/Script/EmperorIngStage1.xml +++ b/MP2/Script/EmperorIngStage1.xml @@ -9,7 +9,7 @@ - + 2 diff --git a/MP2/Script/EmperorIngStage2Tentacle.xml b/MP2/Script/EmperorIngStage2Tentacle.xml index fb7ea09..db7a345 100644 --- a/MP2/Script/EmperorIngStage2Tentacle.xml +++ b/MP2/Script/EmperorIngStage2Tentacle.xml @@ -9,7 +9,7 @@ - + 2 diff --git a/MP2/Script/EmperorIngStage3.xml b/MP2/Script/EmperorIngStage3.xml index fbf4e5a..138383c 100644 --- a/MP2/Script/EmperorIngStage3.xml +++ b/MP2/Script/EmperorIngStage3.xml @@ -9,7 +9,7 @@ - + 2 diff --git a/MP2/Script/FishCloud.xml b/MP2/Script/FishCloud.xml index 985d4ab..681357b 100644 --- a/MP2/Script/FishCloud.xml +++ b/MP2/Script/FishCloud.xml @@ -64,7 +64,7 @@ 0.5 - + 3 diff --git a/MP2/Script/Grenchler.xml b/MP2/Script/Grenchler.xml index 640a944..ac04e35 100644 --- a/MP2/Script/Grenchler.xml +++ b/MP2/Script/Grenchler.xml @@ -46,7 +46,7 @@ 1.0 - + 1 diff --git a/MP2/Script/GuiMenu.xml b/MP2/Script/GuiMenu.xml index c37d2c2..329acfc 100644 --- a/MP2/Script/GuiMenu.xml +++ b/MP2/Script/GuiMenu.xml @@ -14,7 +14,7 @@ - + 0 diff --git a/MP2/Script/GuiScreen.xml b/MP2/Script/GuiScreen.xml index 68f9686..bd4888b 100644 --- a/MP2/Script/GuiScreen.xml +++ b/MP2/Script/GuiScreen.xml @@ -7,7 +7,7 @@ GuiScreen - + 0 diff --git a/MP2/Script/Ing.xml b/MP2/Script/Ing.xml index 71aeb37..12aa478 100644 --- a/MP2/Script/Ing.xml +++ b/MP2/Script/Ing.xml @@ -23,7 +23,7 @@ - + 1 diff --git a/MP2/Script/IngBoostBallGuardian.xml b/MP2/Script/IngBoostBallGuardian.xml index 0cfb075..a7f3c39 100644 --- a/MP2/Script/IngBoostBallGuardian.xml +++ b/MP2/Script/IngBoostBallGuardian.xml @@ -24,7 +24,7 @@ - + 1 diff --git a/MP2/Script/IngSpaceJumpGuardian.xml b/MP2/Script/IngSpaceJumpGuardian.xml index c1406a9..f921951 100644 --- a/MP2/Script/IngSpaceJumpGuardian.xml +++ b/MP2/Script/IngSpaceJumpGuardian.xml @@ -24,7 +24,7 @@ - + 1 diff --git a/MP2/Script/IngSpiderballGuardian.xml b/MP2/Script/IngSpiderballGuardian.xml index 2245986..919af6d 100644 --- a/MP2/Script/IngSpiderballGuardian.xml +++ b/MP2/Script/IngSpiderballGuardian.xml @@ -22,7 +22,7 @@ - + 1 diff --git a/MP2/Script/Lumite.xml b/MP2/Script/Lumite.xml index 1cd1226..9babe42 100644 --- a/MP2/Script/Lumite.xml +++ b/MP2/Script/Lumite.xml @@ -21,7 +21,7 @@ 1.0 - + 1 diff --git a/MP2/Script/MediumIng.xml b/MP2/Script/MediumIng.xml index 4270842..1811af3 100644 --- a/MP2/Script/MediumIng.xml +++ b/MP2/Script/MediumIng.xml @@ -20,12 +20,12 @@ - + 1 - + 0 diff --git a/MP2/Script/MetroidAlpha.xml b/MP2/Script/MetroidAlpha.xml index cf1bf95..395eed4 100644 --- a/MP2/Script/MetroidAlpha.xml +++ b/MP2/Script/MetroidAlpha.xml @@ -41,7 +41,7 @@ - + 1 diff --git a/MP2/Script/PathCamera.xml b/MP2/Script/PathCamera.xml index b891dc5..8d78b5d 100644 --- a/MP2/Script/PathCamera.xml +++ b/MP2/Script/PathCamera.xml @@ -29,7 +29,7 @@ 3.0 - + 0 diff --git a/MP2/Script/PathMeshCtrl.xml b/MP2/Script/PathMeshCtrl.xml index dd5b96b..ecea3eb 100644 --- a/MP2/Script/PathMeshCtrl.xml +++ b/MP2/Script/PathMeshCtrl.xml @@ -4,7 +4,7 @@ PathMeshCtrl - + 0 diff --git a/MP2/Script/PlayerActor.xml b/MP2/Script/PlayerActor.xml index e12c539..cc36247 100644 --- a/MP2/Script/PlayerActor.xml +++ b/MP2/Script/PlayerActor.xml @@ -44,7 +44,7 @@ 4 - + 0 diff --git a/MP2/Script/PlayerController.xml b/MP2/Script/PlayerController.xml index f241349..7230b64 100644 --- a/MP2/Script/PlayerController.xml +++ b/MP2/Script/PlayerController.xml @@ -31,7 +31,7 @@ - + 0 diff --git a/MP2/Script/PlayerStateChange.xml b/MP2/Script/PlayerStateChange.xml index 7fb818c..28627d9 100644 --- a/MP2/Script/PlayerStateChange.xml +++ b/MP2/Script/PlayerStateChange.xml @@ -16,7 +16,7 @@ 0 - + 0 diff --git a/MP2/Script/PortalTransition.xml b/MP2/Script/PortalTransition.xml index 7557e41..894d943 100644 --- a/MP2/Script/PortalTransition.xml +++ b/MP2/Script/PortalTransition.xml @@ -37,7 +37,7 @@ 0 - + 0 diff --git a/MP2/Script/PuddleSpore.xml b/MP2/Script/PuddleSpore.xml index eb1fcf8..8ce1fbe 100644 --- a/MP2/Script/PuddleSpore.xml +++ b/MP2/Script/PuddleSpore.xml @@ -37,7 +37,7 @@ 3.0 - + 1 diff --git a/MP2/Script/Repulsor.xml b/MP2/Script/Repulsor.xml index bad4339..90a51b7 100644 --- a/MP2/Script/Repulsor.xml +++ b/MP2/Script/Repulsor.xml @@ -4,7 +4,7 @@ Repulsor - + 0 diff --git a/MP2/Script/Rezbit.xml b/MP2/Script/Rezbit.xml index d796511..fe2f26c 100644 --- a/MP2/Script/Rezbit.xml +++ b/MP2/Script/Rezbit.xml @@ -22,7 +22,7 @@ - + 1 diff --git a/MP2/Script/RiftPortal.xml b/MP2/Script/RiftPortal.xml index d0acf1d..2a8355a 100644 --- a/MP2/Script/RiftPortal.xml +++ b/MP2/Script/RiftPortal.xml @@ -34,7 +34,7 @@ false - + 0 diff --git a/MP2/Script/SafeZone.xml b/MP2/Script/SafeZone.xml index 01d432c..d65503c 100644 --- a/MP2/Script/SafeZone.xml +++ b/MP2/Script/SafeZone.xml @@ -131,7 +131,7 @@ 0 - + 0 @@ -163,7 +163,7 @@ false - + 1 @@ -203,7 +203,7 @@ false - + 1 diff --git a/MP2/Script/SafeZoneCrystal.xml b/MP2/Script/SafeZoneCrystal.xml index dbecf1c..187b2ed 100644 --- a/MP2/Script/SafeZoneCrystal.xml +++ b/MP2/Script/SafeZoneCrystal.xml @@ -28,7 +28,7 @@ SCAN - + 0 diff --git a/MP2/Script/SandBoss.xml b/MP2/Script/SandBoss.xml index d6c4e4d..75bc605 100644 --- a/MP2/Script/SandBoss.xml +++ b/MP2/Script/SandBoss.xml @@ -25,7 +25,7 @@ - + 2 diff --git a/MP2/Script/Sandworm.xml b/MP2/Script/Sandworm.xml index 38a8b5a..9d9c1c9 100644 --- a/MP2/Script/Sandworm.xml +++ b/MP2/Script/Sandworm.xml @@ -33,7 +33,7 @@ 1.0 - + 2 diff --git a/MP2/Script/Shredder.xml b/MP2/Script/Shredder.xml index a40e7b3..c7dfc25 100644 --- a/MP2/Script/Shredder.xml +++ b/MP2/Script/Shredder.xml @@ -9,7 +9,7 @@ - + 1 diff --git a/MP2/Script/Shrieker.xml b/MP2/Script/Shrieker.xml index 34860e7..cabd7bd 100644 --- a/MP2/Script/Shrieker.xml +++ b/MP2/Script/Shrieker.xml @@ -21,7 +21,7 @@ 4.0 - + 1 diff --git a/MP2/Script/SpacePirate.xml b/MP2/Script/SpacePirate.xml index c9baddd..3e8981e 100644 --- a/MP2/Script/SpacePirate.xml +++ b/MP2/Script/SpacePirate.xml @@ -60,7 +60,7 @@ 0.2 - + 1 @@ -158,8 +158,8 @@ 0.050000001 - - -1 + + 0 1.0 diff --git a/MP2/Script/SpiderBallWaypoint.xml b/MP2/Script/SpiderBallWaypoint.xml index 00341ca..eb83b5c 100644 --- a/MP2/Script/SpiderBallWaypoint.xml +++ b/MP2/Script/SpiderBallWaypoint.xml @@ -4,7 +4,7 @@ SpiderBallWaypoint - + 0 diff --git a/MP2/Script/SplitterCommandModule.xml b/MP2/Script/SplitterCommandModule.xml index 6b7d4d8..8612fb3 100644 --- a/MP2/Script/SplitterCommandModule.xml +++ b/MP2/Script/SplitterCommandModule.xml @@ -25,7 +25,7 @@ - + 2 diff --git a/MP2/Script/SplitterMainChassis.xml b/MP2/Script/SplitterMainChassis.xml index 7b540c9..d40bb33 100644 --- a/MP2/Script/SplitterMainChassis.xml +++ b/MP2/Script/SplitterMainChassis.xml @@ -25,7 +25,7 @@ - + 2 diff --git a/MP2/Script/SporbBase.xml b/MP2/Script/SporbBase.xml index f33f3a3..0787a72 100644 --- a/MP2/Script/SporbBase.xml +++ b/MP2/Script/SporbBase.xml @@ -141,8 +141,8 @@ 0 - - -1 + + 0 0 diff --git a/MP2/Script/StoneToad.xml b/MP2/Script/StoneToad.xml index 0b1532c..994e5c3 100644 --- a/MP2/Script/StoneToad.xml +++ b/MP2/Script/StoneToad.xml @@ -9,7 +9,7 @@ - + 1 diff --git a/MP2/Script/StreamedMovie.xml b/MP2/Script/StreamedMovie.xml index 41a7c88..b5d8b1a 100644 --- a/MP2/Script/StreamedMovie.xml +++ b/MP2/Script/StreamedMovie.xml @@ -20,7 +20,7 @@ 127 - + 0 diff --git a/MP2/Script/SurfaceCamera.xml b/MP2/Script/SurfaceCamera.xml index 4bf982f..f9b8e36 100644 --- a/MP2/Script/SurfaceCamera.xml +++ b/MP2/Script/SurfaceCamera.xml @@ -7,7 +7,7 @@ 2 - + 1 diff --git a/MP2/Script/SwampBossStage1.xml b/MP2/Script/SwampBossStage1.xml index 002eb17..b9a0c08 100644 --- a/MP2/Script/SwampBossStage1.xml +++ b/MP2/Script/SwampBossStage1.xml @@ -27,7 +27,7 @@ OnlyIfModified - + 2 diff --git a/MP2/Script/SwampBossStage2.xml b/MP2/Script/SwampBossStage2.xml index d4be922..a0716f0 100644 --- a/MP2/Script/SwampBossStage2.xml +++ b/MP2/Script/SwampBossStage2.xml @@ -55,7 +55,7 @@ 0.0 - + 2 diff --git a/MP2/Script/TeamAI.xml b/MP2/Script/TeamAI.xml index d790759..d5bb0ea 100644 --- a/MP2/Script/TeamAI.xml +++ b/MP2/Script/TeamAI.xml @@ -22,7 +22,7 @@ 1 - + 0 diff --git a/MP2/Script/TextPane.xml b/MP2/Script/TextPane.xml index a60c47c..d007d92 100644 --- a/MP2/Script/TextPane.xml +++ b/MP2/Script/TextPane.xml @@ -48,7 +48,7 @@ - + 1 diff --git a/MP2/Script/VisorFlare.xml b/MP2/Script/VisorFlare.xml index 170f16f..19dead6 100644 --- a/MP2/Script/VisorFlare.xml +++ b/MP2/Script/VisorFlare.xml @@ -4,7 +4,7 @@ VisorFlare - + 0 @@ -19,7 +19,7 @@ 2.0 - + 0 diff --git a/MP2/Script/VisorGoo.xml b/MP2/Script/VisorGoo.xml index c21f031..f891415 100644 --- a/MP2/Script/VisorGoo.xml +++ b/MP2/Script/VisorGoo.xml @@ -33,8 +33,8 @@ 1.0 - - -1 + + 0 false diff --git a/MP2/Script/WallWalker.xml b/MP2/Script/WallWalker.xml index 15959f1..abb7978 100644 --- a/MP2/Script/WallWalker.xml +++ b/MP2/Script/WallWalker.xml @@ -10,7 +10,7 @@ - + 1 diff --git a/MP2/Script/Water.xml b/MP2/Script/Water.xml index 6132ec6..0ba8cbb 100644 --- a/MP2/Script/Water.xml +++ b/MP2/Script/Water.xml @@ -17,7 +17,7 @@ 5.0 - + 0 @@ -87,7 +87,7 @@ - + 0 @@ -103,7 +103,7 @@ - + 0 @@ -119,7 +119,7 @@ - + 0 @@ -135,7 +135,7 @@ - + 0 @@ -151,7 +151,7 @@ - + 0 diff --git a/MP2/Structs/CameraBehaviour.xml b/MP2/Structs/CameraBehaviour.xml index 2d4fb90..4bfeac3 100644 --- a/MP2/Structs/CameraBehaviour.xml +++ b/MP2/Structs/CameraBehaviour.xml @@ -3,7 +3,7 @@ CameraBehaviour - + 0 diff --git a/MP2/Structs/CameraHintStructA.xml b/MP2/Structs/CameraHintStructA.xml index cdecd46..3860cce 100644 --- a/MP2/Structs/CameraHintStructA.xml +++ b/MP2/Structs/CameraHintStructA.xml @@ -3,7 +3,7 @@ CameraHintStructA - + 0 diff --git a/MP2/Structs/CommandData.xml b/MP2/Structs/CommandData.xml index ac75bca..b1cf0a2 100644 --- a/MP2/Structs/CommandData.xml +++ b/MP2/Structs/CommandData.xml @@ -10,7 +10,7 @@ - + 0 diff --git a/MP2/Structs/DigitalGuardianHeadStruct.xml b/MP2/Structs/DigitalGuardianHeadStruct.xml index cc957a8..a482324 100644 --- a/MP2/Structs/DigitalGuardianHeadStruct.xml +++ b/MP2/Structs/DigitalGuardianHeadStruct.xml @@ -3,7 +3,7 @@ DigitalGuardianHeadStruct - + 4 diff --git a/MP2/Structs/DynamicLightFalloff.xml b/MP2/Structs/DynamicLightFalloff.xml index 113a6a8..67796e3 100644 --- a/MP2/Structs/DynamicLightFalloff.xml +++ b/MP2/Structs/DynamicLightFalloff.xml @@ -3,7 +3,7 @@ DynamicLightFalloff - + 0 diff --git a/MP2/Structs/LayerInfo.xml b/MP2/Structs/LayerInfo.xml index 4e86fbb..b7140ba 100644 --- a/MP2/Structs/LayerInfo.xml +++ b/MP2/Structs/LayerInfo.xml @@ -3,7 +3,7 @@ LayerInfo - + -2143184152 diff --git a/MP2/Structs/LightParameters.xml b/MP2/Structs/LightParameters.xml index b2b0e84..0bc98dd 100644 --- a/MP2/Structs/LightParameters.xml +++ b/MP2/Structs/LightParameters.xml @@ -59,7 +59,7 @@ false - + 0 diff --git a/MP2/Structs/PatternedAITypedef.xml b/MP2/Structs/PatternedAITypedef.xml index 561f449..1b49bfc 100644 --- a/MP2/Structs/PatternedAITypedef.xml +++ b/MP2/Structs/PatternedAITypedef.xml @@ -117,7 +117,11 @@ PART - + + + ELSC + + 0.0 @@ -144,7 +148,7 @@ RULE - + 0 diff --git a/MP2/Structs/SafeZoneStructA.xml b/MP2/Structs/SafeZoneStructA.xml index 55140d7..beac49e 100644 --- a/MP2/Structs/SafeZoneStructA.xml +++ b/MP2/Structs/SafeZoneStructA.xml @@ -6,7 +6,7 @@ true - + 0 diff --git a/MP2/Structs/SandBossStructA.xml b/MP2/Structs/SandBossStructA.xml index c84d2df..28220d1 100644 --- a/MP2/Structs/SandBossStructA.xml +++ b/MP2/Structs/SandBossStructA.xml @@ -43,10 +43,8 @@ CMDL - - - CMDL - + + 0 diff --git a/MP2/Structs/SpindleCameraStruct.xml b/MP2/Structs/SpindleCameraStruct.xml index 11c4e87..93e735a 100644 --- a/MP2/Structs/SpindleCameraStruct.xml +++ b/MP2/Structs/SpindleCameraStruct.xml @@ -3,7 +3,7 @@ SpindleCameraStruct - + 0 diff --git a/MP2/Structs/SplineType.xml b/MP2/Structs/SplineType.xml index 7beb189..e786246 100644 --- a/MP2/Structs/SplineType.xml +++ b/MP2/Structs/SplineType.xml @@ -3,7 +3,7 @@ SplineType - + 0 diff --git a/MP2/Structs/SplitterCommandModuleData.xml b/MP2/Structs/SplitterCommandModuleData.xml index 6dff4c3..27ed42f 100644 --- a/MP2/Structs/SplitterCommandModuleData.xml +++ b/MP2/Structs/SplitterCommandModuleData.xml @@ -121,11 +121,11 @@ 0 - - -1 + + 0 - - -1 + + 0 0 diff --git a/MP2/Structs/SwampBossStage1Struct.xml b/MP2/Structs/SwampBossStage1Struct.xml index 7d1130e..bb79ffd 100644 --- a/MP2/Structs/SwampBossStage1Struct.xml +++ b/MP2/Structs/SwampBossStage1Struct.xml @@ -18,16 +18,16 @@ 3 - + 0 - + 0 - + 0 - + 0 diff --git a/MP2/Structs/SwampBossStage2Struct.xml b/MP2/Structs/SwampBossStage2Struct.xml index fcec088..ecc165d 100644 --- a/MP2/Structs/SwampBossStage2Struct.xml +++ b/MP2/Structs/SwampBossStage2Struct.xml @@ -21,19 +21,19 @@ 0.2 - + 0 - + 0 - + 0 - + 7 - + 7 diff --git a/MP2/Structs/TDamageInfo.xml b/MP2/Structs/TDamageInfo.xml index 0619489..098e078 100644 --- a/MP2/Structs/TDamageInfo.xml +++ b/MP2/Structs/TDamageInfo.xml @@ -3,7 +3,7 @@ TDamageInfo - + 0 diff --git a/MP2/Structs/TweakBall_DeathBall.xml b/MP2/Structs/TweakBall_DeathBall.xml index d673ea9..c1ae7d6 100644 --- a/MP2/Structs/TweakBall_DeathBall.xml +++ b/MP2/Structs/TweakBall_DeathBall.xml @@ -8,7 +8,7 @@ - + 5 diff --git a/MP2/Structs/TweakBall_ScrewAttack.xml b/MP2/Structs/TweakBall_ScrewAttack.xml index e3464a7..b906f08 100644 --- a/MP2/Structs/TweakBall_ScrewAttack.xml +++ b/MP2/Structs/TweakBall_ScrewAttack.xml @@ -44,7 +44,7 @@ - + 7 diff --git a/MP2/Structs/TweakPlayerGun_Beam_Combo.xml b/MP2/Structs/TweakPlayerGun_Beam_Combo.xml index 0fda9cf..6574d17 100644 --- a/MP2/Structs/TweakPlayerGun_Beam_Combo.xml +++ b/MP2/Structs/TweakPlayerGun_Beam_Combo.xml @@ -21,7 +21,7 @@ - + 1 @@ -37,7 +37,7 @@ - + 2 @@ -56,7 +56,7 @@ - + 3 @@ -69,7 +69,7 @@ - + 8 diff --git a/MP2/Structs/TweakPlayerGun_Beam_Misc.xml b/MP2/Structs/TweakPlayerGun_Beam_Misc.xml index cdfa86b..b43e319 100644 --- a/MP2/Structs/TweakPlayerGun_Beam_Misc.xml +++ b/MP2/Structs/TweakPlayerGun_Beam_Misc.xml @@ -5,7 +5,7 @@ - + 1 @@ -24,7 +24,7 @@ - + 2 @@ -43,7 +43,7 @@ - + 3 diff --git a/MP2/Structs/TweakPlayerGun_Weapons.xml b/MP2/Structs/TweakPlayerGun_Weapons.xml index 0c95185..a5acf37 100644 --- a/MP2/Structs/TweakPlayerGun_Weapons.xml +++ b/MP2/Structs/TweakPlayerGun_Weapons.xml @@ -5,7 +5,7 @@ - + 4 @@ -24,7 +24,7 @@ - + 5 @@ -40,7 +40,7 @@ - + 6 @@ -73,7 +73,7 @@ - + 1 diff --git a/MP2/Structs/UnknownStruct39.xml b/MP2/Structs/UnknownStruct39.xml index addd22b..eff5c5d 100644 --- a/MP2/Structs/UnknownStruct39.xml +++ b/MP2/Structs/UnknownStruct39.xml @@ -3,7 +3,7 @@ UnknownStruct39 - + 10 diff --git a/MP2/Structs/UnknownStruct9.xml b/MP2/Structs/UnknownStruct9.xml index 08ff77c..e22325d 100644 --- a/MP2/Structs/UnknownStruct9.xml +++ b/MP2/Structs/UnknownStruct9.xml @@ -3,7 +3,7 @@ UnknownStruct9 - + 1 diff --git a/MP2Demo/Script/AIJumpPoint.xml b/MP2Demo/Script/AIJumpPoint.xml index 4ce7ee9..a201562 100644 --- a/MP2Demo/Script/AIJumpPoint.xml +++ b/MP2Demo/Script/AIJumpPoint.xml @@ -7,7 +7,7 @@ 3.0 - + 0 diff --git a/MP2Demo/Script/AtomicAlpha.xml b/MP2Demo/Script/AtomicAlpha.xml index 77420dc..229f6c7 100644 --- a/MP2Demo/Script/AtomicAlpha.xml +++ b/MP2Demo/Script/AtomicAlpha.xml @@ -55,7 +55,7 @@ 0.0 - + 1 diff --git a/MP2Demo/Script/Blogg.xml b/MP2Demo/Script/Blogg.xml index a2d7e3f..ecf2b04 100644 --- a/MP2Demo/Script/Blogg.xml +++ b/MP2Demo/Script/Blogg.xml @@ -9,7 +9,7 @@ - + 1 diff --git a/MP2Demo/Script/CameraBlurKeyframe.xml b/MP2Demo/Script/CameraBlurKeyframe.xml index 012d7fa..0c4cc10 100644 --- a/MP2Demo/Script/CameraBlurKeyframe.xml +++ b/MP2Demo/Script/CameraBlurKeyframe.xml @@ -4,13 +4,13 @@ CameraBlurKeyframe - + 0 0.0 - + 0 diff --git a/MP2Demo/Script/CameraFilterKeyframe.xml b/MP2Demo/Script/CameraFilterKeyframe.xml index bf3953f..97af461 100644 --- a/MP2Demo/Script/CameraFilterKeyframe.xml +++ b/MP2Demo/Script/CameraFilterKeyframe.xml @@ -4,7 +4,7 @@ CameraFilterKeyframe - + 0 @@ -13,7 +13,7 @@ 0 - + 0 diff --git a/MP2Demo/Script/ChozoGhost.xml b/MP2Demo/Script/ChozoGhost.xml index 17279c2..81fe9f1 100644 --- a/MP2Demo/Script/ChozoGhost.xml +++ b/MP2Demo/Script/ChozoGhost.xml @@ -50,7 +50,7 @@ 4.5 - + 1 diff --git a/MP2Demo/Script/ColorModulate.xml b/MP2Demo/Script/ColorModulate.xml index f7acc3d..aa995c7 100644 --- a/MP2Demo/Script/ColorModulate.xml +++ b/MP2Demo/Script/ColorModulate.xml @@ -19,7 +19,7 @@ 1.0 - + 0 diff --git a/MP2Demo/Script/CommandoPirate.xml b/MP2Demo/Script/CommandoPirate.xml index 05b8f58..1048931 100644 --- a/MP2Demo/Script/CommandoPirate.xml +++ b/MP2Demo/Script/CommandoPirate.xml @@ -57,7 +57,7 @@ 0.2 - + 1 @@ -94,11 +94,11 @@ 0 - - -1 + + 0 - - -1 + + 0 -1 @@ -149,8 +149,8 @@ PART - - -1 + + 0 diff --git a/MP2Demo/Script/DarkSamus.xml b/MP2Demo/Script/DarkSamus.xml index c6d49f0..9ad253a 100644 --- a/MP2Demo/Script/DarkSamus.xml +++ b/MP2Demo/Script/DarkSamus.xml @@ -18,7 +18,7 @@ 1.0 - + 1 diff --git a/MP2Demo/Script/DarkTrooper.xml b/MP2Demo/Script/DarkTrooper.xml index f9b7cce..0893840 100644 --- a/MP2Demo/Script/DarkTrooper.xml +++ b/MP2Demo/Script/DarkTrooper.xml @@ -22,7 +22,7 @@ 1.0 - + 1 diff --git a/MP2Demo/Script/Debris.xml b/MP2Demo/Script/Debris.xml index 824cacd..83869f5 100644 --- a/MP2Demo/Script/Debris.xml +++ b/MP2Demo/Script/Debris.xml @@ -37,7 +37,7 @@ 1.0 - + 0 diff --git a/MP2Demo/Script/DigitalGuardian.xml b/MP2Demo/Script/DigitalGuardian.xml index f6cdb92..f1118f5 100644 --- a/MP2Demo/Script/DigitalGuardian.xml +++ b/MP2Demo/Script/DigitalGuardian.xml @@ -22,7 +22,7 @@ - + 2 diff --git a/MP2Demo/Script/DigitalGuardianHead.xml b/MP2Demo/Script/DigitalGuardianHead.xml index 2bbfb8d..2effc9b 100644 --- a/MP2Demo/Script/DigitalGuardianHead.xml +++ b/MP2Demo/Script/DigitalGuardianHead.xml @@ -22,7 +22,7 @@ - + 2 diff --git a/MP2Demo/Script/DistanceFog.xml b/MP2Demo/Script/DistanceFog.xml index 55aedf5..db2b15c 100644 --- a/MP2Demo/Script/DistanceFog.xml +++ b/MP2Demo/Script/DistanceFog.xml @@ -10,7 +10,7 @@ - + 0 diff --git a/MP2Demo/Script/DynamicLight.xml b/MP2Demo/Script/DynamicLight.xml index 233eaa9..db73718 100644 --- a/MP2Demo/Script/DynamicLight.xml +++ b/MP2Demo/Script/DynamicLight.xml @@ -4,10 +4,10 @@ DynamicLight - + 2 - + 6 diff --git a/MP2Demo/Script/ElitePirate.xml b/MP2Demo/Script/ElitePirate.xml index 628019f..879bd66 100644 --- a/MP2Demo/Script/ElitePirate.xml +++ b/MP2Demo/Script/ElitePirate.xml @@ -15,7 +15,7 @@ 2.0 - + 2 diff --git a/MP2Demo/Script/EmperorIngStage1.xml b/MP2Demo/Script/EmperorIngStage1.xml index da6affe..87321de 100644 --- a/MP2Demo/Script/EmperorIngStage1.xml +++ b/MP2Demo/Script/EmperorIngStage1.xml @@ -9,7 +9,7 @@ - + 2 diff --git a/MP2Demo/Script/FishCloud.xml b/MP2Demo/Script/FishCloud.xml index 2643e24..0341444 100644 --- a/MP2Demo/Script/FishCloud.xml +++ b/MP2Demo/Script/FishCloud.xml @@ -64,7 +64,7 @@ 0.5 - + 3 diff --git a/MP2Demo/Script/Grenchler.xml b/MP2Demo/Script/Grenchler.xml index 49c4cce..6c4fa6d 100644 --- a/MP2Demo/Script/Grenchler.xml +++ b/MP2Demo/Script/Grenchler.xml @@ -21,7 +21,7 @@ 1.0 - + 1 @@ -139,16 +139,20 @@ PART - - -1 + + + PART + PART - - -1 + + + SWHC + -1 diff --git a/MP2Demo/Script/GuiMenu.xml b/MP2Demo/Script/GuiMenu.xml index 5c13fe3..24fc565 100644 --- a/MP2Demo/Script/GuiMenu.xml +++ b/MP2Demo/Script/GuiMenu.xml @@ -14,7 +14,7 @@ - + 0 diff --git a/MP2Demo/Script/GuiScreen.xml b/MP2Demo/Script/GuiScreen.xml index 33cd629..843cad1 100644 --- a/MP2Demo/Script/GuiScreen.xml +++ b/MP2Demo/Script/GuiScreen.xml @@ -7,7 +7,7 @@ GuiScreen - + 0 diff --git a/MP2Demo/Script/Ing.xml b/MP2Demo/Script/Ing.xml index 23a9fc6..dba74ca 100644 --- a/MP2Demo/Script/Ing.xml +++ b/MP2Demo/Script/Ing.xml @@ -23,7 +23,7 @@ - + 1 diff --git a/MP2Demo/Script/IngSpaceJumpGuardian.xml b/MP2Demo/Script/IngSpaceJumpGuardian.xml index a69e88f..e92b728 100644 --- a/MP2Demo/Script/IngSpaceJumpGuardian.xml +++ b/MP2Demo/Script/IngSpaceJumpGuardian.xml @@ -24,7 +24,7 @@ - + 1 diff --git a/MP2Demo/Script/Lumite.xml b/MP2Demo/Script/Lumite.xml index eefd2d5..6d7f7d2 100644 --- a/MP2Demo/Script/Lumite.xml +++ b/MP2Demo/Script/Lumite.xml @@ -21,7 +21,7 @@ 1.0 - + 1 diff --git a/MP2Demo/Script/MediumIng.xml b/MP2Demo/Script/MediumIng.xml index 90de067..d03a4a6 100644 --- a/MP2Demo/Script/MediumIng.xml +++ b/MP2Demo/Script/MediumIng.xml @@ -20,12 +20,12 @@ - + 1 - + 0 diff --git a/MP2Demo/Script/PathCamera.xml b/MP2Demo/Script/PathCamera.xml index 0e2bc69..3a84c57 100644 --- a/MP2Demo/Script/PathCamera.xml +++ b/MP2Demo/Script/PathCamera.xml @@ -29,7 +29,7 @@ 3.0 - + 0 diff --git a/MP2Demo/Script/PathMeshCtrl.xml b/MP2Demo/Script/PathMeshCtrl.xml index a9fe154..13bd602 100644 --- a/MP2Demo/Script/PathMeshCtrl.xml +++ b/MP2Demo/Script/PathMeshCtrl.xml @@ -4,7 +4,7 @@ PathMeshCtrl - + 0 diff --git a/MP2Demo/Script/PlayerActor.xml b/MP2Demo/Script/PlayerActor.xml index 336d74c..5a6e9b0 100644 --- a/MP2Demo/Script/PlayerActor.xml +++ b/MP2Demo/Script/PlayerActor.xml @@ -44,7 +44,7 @@ 4 - + 0 diff --git a/MP2Demo/Script/PlayerController.xml b/MP2Demo/Script/PlayerController.xml index ec4bb4e..715c7da 100644 --- a/MP2Demo/Script/PlayerController.xml +++ b/MP2Demo/Script/PlayerController.xml @@ -31,7 +31,7 @@ - + 0 diff --git a/MP2Demo/Script/PlayerStateChange.xml b/MP2Demo/Script/PlayerStateChange.xml index d6a667e..eb36679 100644 --- a/MP2Demo/Script/PlayerStateChange.xml +++ b/MP2Demo/Script/PlayerStateChange.xml @@ -16,7 +16,7 @@ 0 - + 0 diff --git a/MP2Demo/Script/Repulsor.xml b/MP2Demo/Script/Repulsor.xml index 76a0c64..e02a8b1 100644 --- a/MP2Demo/Script/Repulsor.xml +++ b/MP2Demo/Script/Repulsor.xml @@ -4,7 +4,7 @@ Repulsor - + 0 diff --git a/MP2Demo/Script/Rezbit.xml b/MP2Demo/Script/Rezbit.xml index 90d6c87..c14fda4 100644 --- a/MP2Demo/Script/Rezbit.xml +++ b/MP2Demo/Script/Rezbit.xml @@ -22,7 +22,7 @@ - + 1 diff --git a/MP2Demo/Script/RiftPortal.xml b/MP2Demo/Script/RiftPortal.xml index d414136..0e15914 100644 --- a/MP2Demo/Script/RiftPortal.xml +++ b/MP2Demo/Script/RiftPortal.xml @@ -34,7 +34,7 @@ false - + 0 diff --git a/MP2Demo/Script/SandBoss.xml b/MP2Demo/Script/SandBoss.xml index 114b1b5..bb9d1ab 100644 --- a/MP2Demo/Script/SandBoss.xml +++ b/MP2Demo/Script/SandBoss.xml @@ -25,7 +25,7 @@ - + 2 @@ -177,8 +177,8 @@ 0.30000001 - - -1 + + 0 @@ -211,8 +211,8 @@ 0.30000001 - - -1 + + 0 @@ -317,8 +317,8 @@ CSKR - - -1 + + 0 diff --git a/MP2Demo/Script/Sandworm.xml b/MP2Demo/Script/Sandworm.xml index 528759d..312fab3 100644 --- a/MP2Demo/Script/Sandworm.xml +++ b/MP2Demo/Script/Sandworm.xml @@ -21,7 +21,7 @@ 1.0 - + 2 diff --git a/MP2Demo/Script/Shredder.xml b/MP2Demo/Script/Shredder.xml index 99d959d..09b53ac 100644 --- a/MP2Demo/Script/Shredder.xml +++ b/MP2Demo/Script/Shredder.xml @@ -9,7 +9,7 @@ - + 1 diff --git a/MP2Demo/Script/Shrieker.xml b/MP2Demo/Script/Shrieker.xml index 88b1a1b..c7f073e 100644 --- a/MP2Demo/Script/Shrieker.xml +++ b/MP2Demo/Script/Shrieker.xml @@ -21,7 +21,7 @@ 4.0 - + 1 diff --git a/MP2Demo/Script/SpacePirate.xml b/MP2Demo/Script/SpacePirate.xml index d7846e9..52c209e 100644 --- a/MP2Demo/Script/SpacePirate.xml +++ b/MP2Demo/Script/SpacePirate.xml @@ -60,7 +60,7 @@ 0.2 - + 1 @@ -152,8 +152,8 @@ 0.050000001 - - -1 + + 0 1.0 diff --git a/MP2Demo/Script/SpiderBallWaypoint.xml b/MP2Demo/Script/SpiderBallWaypoint.xml index a3268cc..6e63ef9 100644 --- a/MP2Demo/Script/SpiderBallWaypoint.xml +++ b/MP2Demo/Script/SpiderBallWaypoint.xml @@ -4,7 +4,7 @@ SpiderBallWaypoint - + 0 diff --git a/MP2Demo/Script/SplitterCommandModule.xml b/MP2Demo/Script/SplitterCommandModule.xml index e0150d7..b0ec645 100644 --- a/MP2Demo/Script/SplitterCommandModule.xml +++ b/MP2Demo/Script/SplitterCommandModule.xml @@ -25,7 +25,7 @@ - + 2 diff --git a/MP2Demo/Script/SplitterMainChassis.xml b/MP2Demo/Script/SplitterMainChassis.xml index 72643cf..f3c89fb 100644 --- a/MP2Demo/Script/SplitterMainChassis.xml +++ b/MP2Demo/Script/SplitterMainChassis.xml @@ -25,7 +25,7 @@ - + 2 diff --git a/MP2Demo/Script/SporbBase.xml b/MP2Demo/Script/SporbBase.xml index 26c3475..39d3c66 100644 --- a/MP2Demo/Script/SporbBase.xml +++ b/MP2Demo/Script/SporbBase.xml @@ -108,8 +108,8 @@ 0 - - -1 + + 0 0 diff --git a/MP2Demo/Script/StoneToad.xml b/MP2Demo/Script/StoneToad.xml index 86a0b64..0a8329c 100644 --- a/MP2Demo/Script/StoneToad.xml +++ b/MP2Demo/Script/StoneToad.xml @@ -9,7 +9,7 @@ - + 1 diff --git a/MP2Demo/Script/SurfaceCamera.xml b/MP2Demo/Script/SurfaceCamera.xml index 4f533cc..654cbad 100644 --- a/MP2Demo/Script/SurfaceCamera.xml +++ b/MP2Demo/Script/SurfaceCamera.xml @@ -7,7 +7,7 @@ 2 - + 1 diff --git a/MP2Demo/Script/TeamAI.xml b/MP2Demo/Script/TeamAI.xml index 844351d..6addf09 100644 --- a/MP2Demo/Script/TeamAI.xml +++ b/MP2Demo/Script/TeamAI.xml @@ -22,7 +22,7 @@ 1 - + 0 diff --git a/MP2Demo/Script/TextPane.xml b/MP2Demo/Script/TextPane.xml index 92e6e16..142a315 100644 --- a/MP2Demo/Script/TextPane.xml +++ b/MP2Demo/Script/TextPane.xml @@ -27,7 +27,7 @@ - + 1 diff --git a/MP2Demo/Script/VisorFlare.xml b/MP2Demo/Script/VisorFlare.xml index 454eb05..7045374 100644 --- a/MP2Demo/Script/VisorFlare.xml +++ b/MP2Demo/Script/VisorFlare.xml @@ -4,7 +4,7 @@ VisorFlare - + 0 @@ -19,7 +19,7 @@ 2.0 - + 0 diff --git a/MP2Demo/Script/VisorGoo.xml b/MP2Demo/Script/VisorGoo.xml index 48b8b12..1cf0c5b 100644 --- a/MP2Demo/Script/VisorGoo.xml +++ b/MP2Demo/Script/VisorGoo.xml @@ -33,8 +33,8 @@ 1.0 - - -1 + + 0 false diff --git a/MP2Demo/Script/WallCrawlerSwarm.xml b/MP2Demo/Script/WallCrawlerSwarm.xml index 849457b..264b3e9 100644 --- a/MP2Demo/Script/WallCrawlerSwarm.xml +++ b/MP2Demo/Script/WallCrawlerSwarm.xml @@ -129,11 +129,11 @@ - - -1 + + 0 - - -1 + + 0 diff --git a/MP2Demo/Script/WallWalker.xml b/MP2Demo/Script/WallWalker.xml index 073d79c..911d490 100644 --- a/MP2Demo/Script/WallWalker.xml +++ b/MP2Demo/Script/WallWalker.xml @@ -10,7 +10,7 @@ - + 1 diff --git a/MP2Demo/Script/Water.xml b/MP2Demo/Script/Water.xml index 1a16893..f083421 100644 --- a/MP2Demo/Script/Water.xml +++ b/MP2Demo/Script/Water.xml @@ -17,7 +17,7 @@ 5.0 - + 0 diff --git a/MP2Demo/Structs/CameraBehaviour.xml b/MP2Demo/Structs/CameraBehaviour.xml index 3f49e13..5d6a951 100644 --- a/MP2Demo/Structs/CameraBehaviour.xml +++ b/MP2Demo/Structs/CameraBehaviour.xml @@ -3,7 +3,7 @@ CameraBehaviour - + 0 diff --git a/MP2Demo/Structs/CameraHintStructA1.xml b/MP2Demo/Structs/CameraHintStructA1.xml index 69f44ae..ba243ac 100644 --- a/MP2Demo/Structs/CameraHintStructA1.xml +++ b/MP2Demo/Structs/CameraHintStructA1.xml @@ -3,7 +3,7 @@ CameraHintStructA1 - + 0 diff --git a/MP2Demo/Structs/DigitalGuardianData.xml b/MP2Demo/Structs/DigitalGuardianData.xml index bd6bcd2..877d23f 100644 --- a/MP2Demo/Structs/DigitalGuardianData.xml +++ b/MP2Demo/Structs/DigitalGuardianData.xml @@ -78,14 +78,16 @@ 2.0 - - -1 + + 0 500.0 - - -1 + + + PART + diff --git a/MP2Demo/Structs/DigitalGuardianHeadData.xml b/MP2Demo/Structs/DigitalGuardianHeadData.xml index 3e66008..d2e9fb3 100644 --- a/MP2Demo/Structs/DigitalGuardianHeadData.xml +++ b/MP2Demo/Structs/DigitalGuardianHeadData.xml @@ -56,8 +56,8 @@ - - -1 + + 0 @@ -77,8 +77,8 @@ - - -1 + + 0 diff --git a/MP2Demo/Structs/DynamicLightFalloff.xml b/MP2Demo/Structs/DynamicLightFalloff.xml index 667389b..4cb33b9 100644 --- a/MP2Demo/Structs/DynamicLightFalloff.xml +++ b/MP2Demo/Structs/DynamicLightFalloff.xml @@ -3,7 +3,7 @@ DynamicLightFalloff - + 0 diff --git a/MP2Demo/Structs/LayerInfo.xml b/MP2Demo/Structs/LayerInfo.xml index fa0a31c..4fdfbe1 100644 --- a/MP2Demo/Structs/LayerInfo.xml +++ b/MP2Demo/Structs/LayerInfo.xml @@ -3,7 +3,7 @@ LayerInfo - + 0 diff --git a/MP2Demo/Structs/LightParameters.xml b/MP2Demo/Structs/LightParameters.xml index c5901db..54ab53a 100644 --- a/MP2Demo/Structs/LightParameters.xml +++ b/MP2Demo/Structs/LightParameters.xml @@ -59,7 +59,7 @@ false - + 0 diff --git a/MP2Demo/Structs/PatternedAITypedef.xml b/MP2Demo/Structs/PatternedAITypedef.xml index 2ec2eac..81c7388 100644 --- a/MP2Demo/Structs/PatternedAITypedef.xml +++ b/MP2Demo/Structs/PatternedAITypedef.xml @@ -117,7 +117,11 @@ PART - + + + ELSC + + 0.0 @@ -138,7 +142,7 @@ RULE - + 0 diff --git a/MP2Demo/Structs/RezbitData.xml b/MP2Demo/Structs/RezbitData.xml index 8cc6211..cfdb458 100644 --- a/MP2Demo/Structs/RezbitData.xml +++ b/MP2Demo/Structs/RezbitData.xml @@ -41,8 +41,8 @@ - - -1 + + 0 20.0 diff --git a/MP2Demo/Structs/SpindleCameraStruct.xml b/MP2Demo/Structs/SpindleCameraStruct.xml index 1827f05..7877eaf 100644 --- a/MP2Demo/Structs/SpindleCameraStruct.xml +++ b/MP2Demo/Structs/SpindleCameraStruct.xml @@ -3,7 +3,7 @@ SpindleCameraStruct - + 0 diff --git a/MP2Demo/Structs/SplineType.xml b/MP2Demo/Structs/SplineType.xml index c6ee17a..6d789c4 100644 --- a/MP2Demo/Structs/SplineType.xml +++ b/MP2Demo/Structs/SplineType.xml @@ -3,7 +3,7 @@ SplineType - + 0 diff --git a/MP2Demo/Structs/SplitterCommandModuleData.xml b/MP2Demo/Structs/SplitterCommandModuleData.xml index da45cf9..a4fbde8 100644 --- a/MP2Demo/Structs/SplitterCommandModuleData.xml +++ b/MP2Demo/Structs/SplitterCommandModuleData.xml @@ -120,11 +120,11 @@ 0 - - -1 + + 0 - - -1 + + 0 0 diff --git a/MP2Demo/Structs/TDamageInfo.xml b/MP2Demo/Structs/TDamageInfo.xml index 3051887..a066619 100644 --- a/MP2Demo/Structs/TDamageInfo.xml +++ b/MP2Demo/Structs/TDamageInfo.xml @@ -3,7 +3,7 @@ TDamageInfo - + 0 diff --git a/MP2Demo/Structs/TweakBall_DeathBall.xml b/MP2Demo/Structs/TweakBall_DeathBall.xml index 7d8677a..86d6782 100644 --- a/MP2Demo/Structs/TweakBall_DeathBall.xml +++ b/MP2Demo/Structs/TweakBall_DeathBall.xml @@ -8,7 +8,7 @@ - + 5 diff --git a/MP2Demo/Structs/TweakBall_ScrewAttack.xml b/MP2Demo/Structs/TweakBall_ScrewAttack.xml index e94f46e..b14c45f 100644 --- a/MP2Demo/Structs/TweakBall_ScrewAttack.xml +++ b/MP2Demo/Structs/TweakBall_ScrewAttack.xml @@ -44,7 +44,7 @@ - + 7 diff --git a/MP2Demo/Structs/TweakPlayerGun_Beam_Combo.xml b/MP2Demo/Structs/TweakPlayerGun_Beam_Combo.xml index 3260535..2bbacf1 100644 --- a/MP2Demo/Structs/TweakPlayerGun_Beam_Combo.xml +++ b/MP2Demo/Structs/TweakPlayerGun_Beam_Combo.xml @@ -21,7 +21,7 @@ - + 1 @@ -37,7 +37,7 @@ - + 2 @@ -56,7 +56,7 @@ - + 3 @@ -69,7 +69,7 @@ - + 8 diff --git a/MP2Demo/Structs/TweakPlayerGun_Beam_Misc.xml b/MP2Demo/Structs/TweakPlayerGun_Beam_Misc.xml index 152b48a..883a6af 100644 --- a/MP2Demo/Structs/TweakPlayerGun_Beam_Misc.xml +++ b/MP2Demo/Structs/TweakPlayerGun_Beam_Misc.xml @@ -5,7 +5,7 @@ - + 1 @@ -24,7 +24,7 @@ - + 2 diff --git a/MP2Demo/Structs/TweakPlayerGun_Weapons.xml b/MP2Demo/Structs/TweakPlayerGun_Weapons.xml index a6fec0e..189ec68 100644 --- a/MP2Demo/Structs/TweakPlayerGun_Weapons.xml +++ b/MP2Demo/Structs/TweakPlayerGun_Weapons.xml @@ -5,7 +5,7 @@ - + 4 @@ -24,7 +24,7 @@ - + 5 @@ -40,7 +40,7 @@ - + 14 @@ -56,7 +56,7 @@ - + 14 @@ -81,7 +81,7 @@ - + 15 @@ -112,7 +112,7 @@ - + 16 @@ -131,7 +131,7 @@ - + 4 @@ -147,7 +147,7 @@ - + 6 @@ -180,7 +180,7 @@ - + 1 diff --git a/MP2Demo/Structs/UnknownStruct22.xml b/MP2Demo/Structs/UnknownStruct22.xml index e8729a3..8661a94 100644 --- a/MP2Demo/Structs/UnknownStruct22.xml +++ b/MP2Demo/Structs/UnknownStruct22.xml @@ -3,7 +3,7 @@ UnknownStruct22 - + 10 diff --git a/MP2Demo/Structs/UnknownStruct3.xml b/MP2Demo/Structs/UnknownStruct3.xml index 1ca0b7f..24c291f 100644 --- a/MP2Demo/Structs/UnknownStruct3.xml +++ b/MP2Demo/Structs/UnknownStruct3.xml @@ -3,7 +3,7 @@ UnknownStruct3 - + 0 diff --git a/MP2Demo/Structs/UnknownStruct4.xml b/MP2Demo/Structs/UnknownStruct4.xml index 987eea5..affff6c 100644 --- a/MP2Demo/Structs/UnknownStruct4.xml +++ b/MP2Demo/Structs/UnknownStruct4.xml @@ -3,7 +3,7 @@ UnknownStruct4 - + 0 diff --git a/MP3/Game.xml b/MP3/Game.xml index c215b9e..0123805 100644 --- a/MP3/Game.xml +++ b/MP3/Game.xml @@ -1787,6 +1787,10 @@ TweakGuiColors_TurretHudTypedef + + TweakGui_CommandVisor + + TweakGui_Completion @@ -1795,10 +1799,18 @@ TweakGui_Credits + + TweakGui_GrappleEffect + + TweakGui_HudColorTypedef + + TweakGui_Hypermode + + TweakGui_Misc @@ -1823,22 +1835,6 @@ TweakGui_UnknownEnum1 - - TweakGui_UnknownStruct1 - - - - TweakGui_UnknownStruct2 - - - - TweakGui_UnknownStruct3 - - - - TweakGui_UnknownStruct4 - - TweakGui_UnknownStruct5 @@ -1847,6 +1843,10 @@ TweakGui_VisorColorSchemeTypedef + + TweakGui_XRayVisor + + TweakPlayerGun_Arm_Position diff --git a/MP3/Misc/TweakGui.xml b/MP3/Misc/TweakGui.xml index 0b63a58..d591d21 100644 --- a/MP3/Misc/TweakGui.xml +++ b/MP3/Misc/TweakGui.xml @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/MP3/Script/AIHint.xml b/MP3/Script/AIHint.xml index dc9f8fb..d43b6c8 100644 --- a/MP3/Script/AIHint.xml +++ b/MP3/Script/AIHint.xml @@ -4,7 +4,7 @@ AIHint - + 0 diff --git a/MP3/Script/Achievement.xml b/MP3/Script/Achievement.xml index d3b42b6..216c62f 100644 --- a/MP3/Script/Achievement.xml +++ b/MP3/Script/Achievement.xml @@ -41,7 +41,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/MP3/Script/Berserker.xml b/MP3/Script/Berserker.xml index 1cd7d4e..a49160d 100644 --- a/MP3/Script/Berserker.xml +++ b/MP3/Script/Berserker.xml @@ -36,7 +36,7 @@ 1.0 - + 2 diff --git a/MP3/Script/BlinkWolf.xml b/MP3/Script/BlinkWolf.xml index 0379ac0..ce2e691 100644 --- a/MP3/Script/BlinkWolf.xml +++ b/MP3/Script/BlinkWolf.xml @@ -20,7 +20,7 @@ - + 1 diff --git a/MP3/Script/CameraBlurKeyframe.xml b/MP3/Script/CameraBlurKeyframe.xml index 7f12f5c..79dc8c2 100644 --- a/MP3/Script/CameraBlurKeyframe.xml +++ b/MP3/Script/CameraBlurKeyframe.xml @@ -4,13 +4,13 @@ CameraBlurKeyframe - + 0 0.0 - + 0 diff --git a/MP3/Script/CameraFilterKeyframe.xml b/MP3/Script/CameraFilterKeyframe.xml index 1027265..b9b88a3 100644 --- a/MP3/Script/CameraFilterKeyframe.xml +++ b/MP3/Script/CameraFilterKeyframe.xml @@ -4,7 +4,7 @@ CameraFilterKeyframe - + 0 @@ -13,7 +13,7 @@ 0 - + 0 diff --git a/MP3/Script/CombatTrooper.xml b/MP3/Script/CombatTrooper.xml index 0d22725..3193fb6 100644 --- a/MP3/Script/CombatTrooper.xml +++ b/MP3/Script/CombatTrooper.xml @@ -13,7 +13,7 @@ 1.0 - + 1 diff --git a/MP3/Script/ControlHint.xml b/MP3/Script/ControlHint.xml index b909df6..de0d9eb 100644 --- a/MP3/Script/ControlHint.xml +++ b/MP3/Script/ControlHint.xml @@ -10,7 +10,7 @@ 0.0 - + 0 diff --git a/MP3/Script/DistanceFog.xml b/MP3/Script/DistanceFog.xml index b6bb4fe..fe2ffac 100644 --- a/MP3/Script/DistanceFog.xml +++ b/MP3/Script/DistanceFog.xml @@ -17,7 +17,7 @@ - + 0 diff --git a/MP3/Script/DynamicLight.xml b/MP3/Script/DynamicLight.xml index a04a83d..ac83c26 100644 --- a/MP3/Script/DynamicLight.xml +++ b/MP3/Script/DynamicLight.xml @@ -4,7 +4,7 @@ DynamicLight - + 2 diff --git a/MP3/Script/Effect.xml b/MP3/Script/Effect.xml index 0194874..2503bb3 100644 --- a/MP3/Script/Effect.xml +++ b/MP3/Script/Effect.xml @@ -66,7 +66,7 @@ false - + 0 diff --git a/MP3/Script/FishCloud.xml b/MP3/Script/FishCloud.xml index 77f4b21..5d863f0 100644 --- a/MP3/Script/FishCloud.xml +++ b/MP3/Script/FishCloud.xml @@ -64,7 +64,7 @@ 0.5 - + 3 diff --git a/MP3/Script/Friendly.xml b/MP3/Script/Friendly.xml index 90c159d..d64769f 100644 --- a/MP3/Script/Friendly.xml +++ b/MP3/Script/Friendly.xml @@ -13,7 +13,7 @@ 1.0 - + 1 diff --git a/MP3/Script/Gandrayda.xml b/MP3/Script/Gandrayda.xml index 9411000..0ebcdcc 100644 --- a/MP3/Script/Gandrayda.xml +++ b/MP3/Script/Gandrayda.xml @@ -22,7 +22,7 @@ 1.0 - + 1 diff --git a/MP3/Script/GragnolFlyer.xml b/MP3/Script/GragnolFlyer.xml index 77e04d1..4db9d3d 100644 --- a/MP3/Script/GragnolFlyer.xml +++ b/MP3/Script/GragnolFlyer.xml @@ -19,7 +19,7 @@ - + 1 diff --git a/MP3/Script/GuiScreen.xml b/MP3/Script/GuiScreen.xml index 4af297c..88a9aea 100644 --- a/MP3/Script/GuiScreen.xml +++ b/MP3/Script/GuiScreen.xml @@ -7,7 +7,7 @@ GuiScreen - + 0 diff --git a/MP3/Script/KorbaMaw.xml b/MP3/Script/KorbaMaw.xml index b3ddb4e..3bdab80 100644 --- a/MP3/Script/KorbaMaw.xml +++ b/MP3/Script/KorbaMaw.xml @@ -29,7 +29,7 @@ 1.0 - + 1 diff --git a/MP3/Script/MetroidHatcher.xml b/MP3/Script/MetroidHatcher.xml index b6b5357..e0b2de3 100644 --- a/MP3/Script/MetroidHatcher.xml +++ b/MP3/Script/MetroidHatcher.xml @@ -51,7 +51,7 @@ 3.0 - + 2 @@ -106,7 +106,7 @@ 3.0 - + 2 @@ -161,7 +161,7 @@ 3.0 - + 2 diff --git a/MP3/Script/PathMeshCtrl.xml b/MP3/Script/PathMeshCtrl.xml index f061bdc..f6970b0 100644 --- a/MP3/Script/PathMeshCtrl.xml +++ b/MP3/Script/PathMeshCtrl.xml @@ -4,7 +4,7 @@ PathMeshCtrl - + 0 diff --git a/MP3/Script/PirateDrone.xml b/MP3/Script/PirateDrone.xml index 802d6b2..f2b85fb 100644 --- a/MP3/Script/PirateDrone.xml +++ b/MP3/Script/PirateDrone.xml @@ -20,7 +20,7 @@ - + 1 diff --git a/MP3/Script/PlayerActor.xml b/MP3/Script/PlayerActor.xml index bfbda27..03b7d47 100644 --- a/MP3/Script/PlayerActor.xml +++ b/MP3/Script/PlayerActor.xml @@ -123,7 +123,7 @@ 16388 - + 0 diff --git a/MP3/Script/Repulsor.xml b/MP3/Script/Repulsor.xml index fe1e79c..e5eb52a 100644 --- a/MP3/Script/Repulsor.xml +++ b/MP3/Script/Repulsor.xml @@ -4,7 +4,7 @@ Repulsor - + 0 diff --git a/MP3/Script/RoomAcoustics.xml b/MP3/Script/RoomAcoustics.xml index f0d3692..70f8d68 100644 --- a/MP3/Script/RoomAcoustics.xml +++ b/MP3/Script/RoomAcoustics.xml @@ -7,11 +7,11 @@ 0x3AAA1114 - - - - - + + + + + diff --git a/MP3/Script/SeedBoss3.xml b/MP3/Script/SeedBoss3.xml index 451ed7d..244f283 100644 --- a/MP3/Script/SeedBoss3.xml +++ b/MP3/Script/SeedBoss3.xml @@ -38,7 +38,7 @@ - + 2 @@ -84,7 +84,7 @@ - + 2 @@ -130,7 +130,7 @@ - + 2 diff --git a/MP3/Script/SpacePirate.xml b/MP3/Script/SpacePirate.xml index e197043..c72c920 100644 --- a/MP3/Script/SpacePirate.xml +++ b/MP3/Script/SpacePirate.xml @@ -42,7 +42,7 @@ 0.30000001 - + 1 diff --git a/MP3/Script/SpecialFunction.xml b/MP3/Script/SpecialFunction.xml index d03b1f6..ae1cbb0 100644 --- a/MP3/Script/SpecialFunction.xml +++ b/MP3/Script/SpecialFunction.xml @@ -99,7 +99,7 @@ 0xCC1DFCF5 - + diff --git a/MP3/Script/SpiderBallWaypoint.xml b/MP3/Script/SpiderBallWaypoint.xml index fb843eb..a7d939c 100644 --- a/MP3/Script/SpiderBallWaypoint.xml +++ b/MP3/Script/SpiderBallWaypoint.xml @@ -4,7 +4,7 @@ SpiderBallWaypoint - + 0 diff --git a/MP3/Script/StreamedMovie.xml b/MP3/Script/StreamedMovie.xml index 314b54d..7102126 100644 --- a/MP3/Script/StreamedMovie.xml +++ b/MP3/Script/StreamedMovie.xml @@ -17,7 +17,7 @@ 127 - + 0 diff --git a/MP3/Script/TeamAI.xml b/MP3/Script/TeamAI.xml index c3eff2d..07250b9 100644 --- a/MP3/Script/TeamAI.xml +++ b/MP3/Script/TeamAI.xml @@ -31,7 +31,7 @@ 1 - + 0 diff --git a/MP3/Script/TextPane.xml b/MP3/Script/TextPane.xml index 18aaeaf..c8685f0 100644 --- a/MP3/Script/TextPane.xml +++ b/MP3/Script/TextPane.xml @@ -38,7 +38,7 @@ - + 1 diff --git a/MP3/Script/VisorFlare.xml b/MP3/Script/VisorFlare.xml index 5fb97c9..7bb64b7 100644 --- a/MP3/Script/VisorFlare.xml +++ b/MP3/Script/VisorFlare.xml @@ -4,7 +4,7 @@ VisorFlare - + 0 @@ -19,7 +19,7 @@ 2.0 - + 0 diff --git a/MP3/Structs/Abilities.xml b/MP3/Structs/Abilities.xml index ee7b5cb..1ac02cb 100644 --- a/MP3/Structs/Abilities.xml +++ b/MP3/Structs/Abilities.xml @@ -6,7 +6,7 @@ false - + 0 diff --git a/MP3/Structs/CommandData.xml b/MP3/Structs/CommandData.xml index 524b909..197db9f 100644 --- a/MP3/Structs/CommandData.xml +++ b/MP3/Structs/CommandData.xml @@ -7,7 +7,7 @@ false - + 0 diff --git a/MP3/Structs/DynamicLightFalloff.xml b/MP3/Structs/DynamicLightFalloff.xml index d9f525f..c597230 100644 --- a/MP3/Structs/DynamicLightFalloff.xml +++ b/MP3/Structs/DynamicLightFalloff.xml @@ -3,7 +3,7 @@ DynamicLightFalloff - + 0 diff --git a/MP3/Structs/GragnolFlyerData.xml b/MP3/Structs/GragnolFlyerData.xml index 3d123af..d8e9735 100644 --- a/MP3/Structs/GragnolFlyerData.xml +++ b/MP3/Structs/GragnolFlyerData.xml @@ -112,7 +112,7 @@ OnlyIfModified - + 1 @@ -123,7 +123,7 @@ - + 1 diff --git a/MP3/Structs/GrappleBlock.xml b/MP3/Structs/GrappleBlock.xml index fedd8f5..757039d 100644 --- a/MP3/Structs/GrappleBlock.xml +++ b/MP3/Structs/GrappleBlock.xml @@ -3,7 +3,7 @@ GrappleBlock - + 0 diff --git a/MP3/Structs/GrappleData.xml b/MP3/Structs/GrappleData.xml index 7b44ae7..119ad5f 100644 --- a/MP3/Structs/GrappleData.xml +++ b/MP3/Structs/GrappleData.xml @@ -3,7 +3,7 @@ GrappleData - + 0 diff --git a/MP3/Structs/LightParameters.xml b/MP3/Structs/LightParameters.xml index 3aefbe0..84c60c9 100644 --- a/MP3/Structs/LightParameters.xml +++ b/MP3/Structs/LightParameters.xml @@ -50,7 +50,7 @@ false - + 0 diff --git a/MP3/Structs/PathDetermination.xml b/MP3/Structs/PathDetermination.xml index 7a29b2a..c5e9ea8 100644 --- a/MP3/Structs/PathDetermination.xml +++ b/MP3/Structs/PathDetermination.xml @@ -6,10 +6,10 @@ 0x571AA317 - - - - + + + + diff --git a/MP3/Structs/PatternedAITypedef.xml b/MP3/Structs/PatternedAITypedef.xml index 80c3301..28b6d5e 100644 --- a/MP3/Structs/PatternedAITypedef.xml +++ b/MP3/Structs/PatternedAITypedef.xml @@ -48,7 +48,7 @@ RULE - + 0 @@ -140,7 +140,11 @@ PART - + + + ELSC + + 1000.0 diff --git a/MP3/Structs/PhaazoidData.xml b/MP3/Structs/PhaazoidData.xml index facc7e6..6b9392f 100644 --- a/MP3/Structs/PhaazoidData.xml +++ b/MP3/Structs/PhaazoidData.xml @@ -3,7 +3,7 @@ PhaazoidData - + 0 diff --git a/MP3/Structs/SpacePirateData.xml b/MP3/Structs/SpacePirateData.xml index ee9b9f4..e103674 100644 --- a/MP3/Structs/SpacePirateData.xml +++ b/MP3/Structs/SpacePirateData.xml @@ -3,7 +3,7 @@ SpacePirateData - + 0 @@ -228,7 +228,7 @@ - + 1 diff --git a/MP3/Structs/SplineType.xml b/MP3/Structs/SplineType.xml index b404194..b2436d4 100644 --- a/MP3/Structs/SplineType.xml +++ b/MP3/Structs/SplineType.xml @@ -3,7 +3,7 @@ SplineType - + 0 diff --git a/MP3/Structs/TDamageInfo.xml b/MP3/Structs/TDamageInfo.xml index 8f3c3bc..33a9eb1 100644 --- a/MP3/Structs/TDamageInfo.xml +++ b/MP3/Structs/TDamageInfo.xml @@ -3,7 +3,7 @@ TDamageInfo - + 0 diff --git a/MP3/Structs/TweakBall_DeathBall.xml b/MP3/Structs/TweakBall_DeathBall.xml index f3203cb..9cf1c20 100644 --- a/MP3/Structs/TweakBall_DeathBall.xml +++ b/MP3/Structs/TweakBall_DeathBall.xml @@ -8,7 +8,7 @@ - + 5 diff --git a/MP3/Structs/TweakBall_FireBall.xml b/MP3/Structs/TweakBall_FireBall.xml index 181a668..5bdfce4 100644 --- a/MP3/Structs/TweakBall_FireBall.xml +++ b/MP3/Structs/TweakBall_FireBall.xml @@ -8,7 +8,7 @@ - + 5 diff --git a/MP3/Structs/TweakBall_IceBall.xml b/MP3/Structs/TweakBall_IceBall.xml index bd2a8f6..b4bc254 100644 --- a/MP3/Structs/TweakBall_IceBall.xml +++ b/MP3/Structs/TweakBall_IceBall.xml @@ -5,7 +5,7 @@ - + 5 diff --git a/MP3/Structs/TweakBall_PhazonBall.xml b/MP3/Structs/TweakBall_PhazonBall.xml index efd53eb..ae35975 100644 --- a/MP3/Structs/TweakBall_PhazonBall.xml +++ b/MP3/Structs/TweakBall_PhazonBall.xml @@ -8,7 +8,7 @@ - + 5 diff --git a/MP3/Structs/TweakBall_ScrewAttack.xml b/MP3/Structs/TweakBall_ScrewAttack.xml index 2c3de86..aa56571 100644 --- a/MP3/Structs/TweakBall_ScrewAttack.xml +++ b/MP3/Structs/TweakBall_ScrewAttack.xml @@ -50,7 +50,7 @@ - + 7 diff --git a/MP3/Structs/TweakGui_UnknownStruct1.xml b/MP3/Structs/TweakGui_CommandVisor.xml similarity index 97% rename from MP3/Structs/TweakGui_UnknownStruct1.xml rename to MP3/Structs/TweakGui_CommandVisor.xml index e5b7a46..346dc2c 100644 --- a/MP3/Structs/TweakGui_UnknownStruct1.xml +++ b/MP3/Structs/TweakGui_CommandVisor.xml @@ -1,7 +1,7 @@ - TweakGui_UnknownStruct1 + TweakGui_CommandVisor diff --git a/MP3/Structs/TweakGui_UnknownStruct4.xml b/MP3/Structs/TweakGui_GrappleEffect.xml similarity index 96% rename from MP3/Structs/TweakGui_UnknownStruct4.xml rename to MP3/Structs/TweakGui_GrappleEffect.xml index dc84832..6107a18 100644 --- a/MP3/Structs/TweakGui_UnknownStruct4.xml +++ b/MP3/Structs/TweakGui_GrappleEffect.xml @@ -1,7 +1,7 @@ - TweakGui_UnknownStruct4 + TweakGui_GrappleEffect diff --git a/MP3/Structs/TweakGui_UnknownStruct3.xml b/MP3/Structs/TweakGui_Hypermode.xml similarity index 99% rename from MP3/Structs/TweakGui_UnknownStruct3.xml rename to MP3/Structs/TweakGui_Hypermode.xml index 32b00f9..5bb1121 100644 --- a/MP3/Structs/TweakGui_UnknownStruct3.xml +++ b/MP3/Structs/TweakGui_Hypermode.xml @@ -1,7 +1,7 @@ - TweakGui_UnknownStruct3 + TweakGui_Hypermode diff --git a/MP3/Structs/TweakGui_UnknownStruct2.xml b/MP3/Structs/TweakGui_XRayVisor.xml similarity index 94% rename from MP3/Structs/TweakGui_UnknownStruct2.xml rename to MP3/Structs/TweakGui_XRayVisor.xml index 59ce7d1..9cfb110 100644 --- a/MP3/Structs/TweakGui_UnknownStruct2.xml +++ b/MP3/Structs/TweakGui_XRayVisor.xml @@ -1,7 +1,7 @@ - TweakGui_UnknownStruct2 + TweakGui_XRayVisor 0.5 diff --git a/MP3/Structs/TweakPlayerGun_Weapons.xml b/MP3/Structs/TweakPlayerGun_Weapons.xml index 0a834b3..76952fc 100644 --- a/MP3/Structs/TweakPlayerGun_Weapons.xml +++ b/MP3/Structs/TweakPlayerGun_Weapons.xml @@ -5,7 +5,7 @@ - + 7 @@ -35,7 +35,7 @@ - + 4 @@ -54,7 +54,7 @@ - + 5 @@ -73,7 +73,7 @@ - + 5 diff --git a/MP3/Structs/UnknownStruct17.xml b/MP3/Structs/UnknownStruct17.xml index 79b5098..8462191 100644 --- a/MP3/Structs/UnknownStruct17.xml +++ b/MP3/Structs/UnknownStruct17.xml @@ -44,12 +44,12 @@ - + 1 - + 1 diff --git a/MP3/Structs/UnknownStruct45.xml b/MP3/Structs/UnknownStruct45.xml index a6a0565..05402ae 100644 --- a/MP3/Structs/UnknownStruct45.xml +++ b/MP3/Structs/UnknownStruct45.xml @@ -142,12 +142,12 @@ - + 1 - + 1 diff --git a/MP3/Structs/UnknownStruct61.xml b/MP3/Structs/UnknownStruct61.xml index 79b4a54..7de1e06 100644 --- a/MP3/Structs/UnknownStruct61.xml +++ b/MP3/Structs/UnknownStruct61.xml @@ -53,12 +53,12 @@ - + 1 - + 1 diff --git a/MP3Proto/Script/AIHint.xml b/MP3Proto/Script/AIHint.xml index 8640213..7717001 100644 --- a/MP3Proto/Script/AIHint.xml +++ b/MP3Proto/Script/AIHint.xml @@ -4,7 +4,7 @@ AIHint - + 0 diff --git a/MP3Proto/Script/AiJumpPoint.xml b/MP3Proto/Script/AiJumpPoint.xml index 44f3762..f3914cf 100644 --- a/MP3Proto/Script/AiJumpPoint.xml +++ b/MP3Proto/Script/AiJumpPoint.xml @@ -7,7 +7,7 @@ 3.0 - + 0 diff --git a/MP3Proto/Script/Berserker.xml b/MP3Proto/Script/Berserker.xml index 7f7aa2f..4b9fcf3 100644 --- a/MP3Proto/Script/Berserker.xml +++ b/MP3Proto/Script/Berserker.xml @@ -33,7 +33,7 @@ 1.0 - + 2 diff --git a/MP3Proto/Script/BlinkWolf.xml b/MP3Proto/Script/BlinkWolf.xml index 953528f..49752ab 100644 --- a/MP3Proto/Script/BlinkWolf.xml +++ b/MP3Proto/Script/BlinkWolf.xml @@ -17,7 +17,7 @@ - + 1 diff --git a/MP3Proto/Script/CameraBlurKeyframe.xml b/MP3Proto/Script/CameraBlurKeyframe.xml index 28cadc4..23c69af 100644 --- a/MP3Proto/Script/CameraBlurKeyframe.xml +++ b/MP3Proto/Script/CameraBlurKeyframe.xml @@ -4,13 +4,13 @@ CameraBlurKeyframe - + 0 0.0 - + 0 diff --git a/MP3Proto/Script/CameraFilterKeyframe.xml b/MP3Proto/Script/CameraFilterKeyframe.xml index e7f829c..09be50e 100644 --- a/MP3Proto/Script/CameraFilterKeyframe.xml +++ b/MP3Proto/Script/CameraFilterKeyframe.xml @@ -4,7 +4,7 @@ CameraFilterKeyframe - + 0 @@ -13,7 +13,7 @@ 0 - + 0 diff --git a/MP3Proto/Script/ColorModulate.xml b/MP3Proto/Script/ColorModulate.xml index 754e103..61da2a7 100644 --- a/MP3Proto/Script/ColorModulate.xml +++ b/MP3Proto/Script/ColorModulate.xml @@ -19,7 +19,7 @@ 1.0 - + 0 diff --git a/MP3Proto/Script/ControlHint.xml b/MP3Proto/Script/ControlHint.xml index cea0f28..e4ef18a 100644 --- a/MP3Proto/Script/ControlHint.xml +++ b/MP3Proto/Script/ControlHint.xml @@ -10,7 +10,7 @@ 0.0 - + 0 diff --git a/MP3Proto/Script/DistanceFog.xml b/MP3Proto/Script/DistanceFog.xml index 56e3a31..c2bf05d 100644 --- a/MP3Proto/Script/DistanceFog.xml +++ b/MP3Proto/Script/DistanceFog.xml @@ -10,7 +10,7 @@ - + 0 diff --git a/MP3Proto/Script/DynamicLight.xml b/MP3Proto/Script/DynamicLight.xml index 3801fd5..2b64438 100644 --- a/MP3Proto/Script/DynamicLight.xml +++ b/MP3Proto/Script/DynamicLight.xml @@ -4,7 +4,7 @@ DynamicLight - + 2 diff --git a/MP3Proto/Script/Effect.xml b/MP3Proto/Script/Effect.xml index fe9a5a0..d841f90 100644 --- a/MP3Proto/Script/Effect.xml +++ b/MP3Proto/Script/Effect.xml @@ -62,7 +62,7 @@ false - + 0 diff --git a/MP3Proto/Script/FishCloud.xml b/MP3Proto/Script/FishCloud.xml index 810f9cf..12674cd 100644 --- a/MP3Proto/Script/FishCloud.xml +++ b/MP3Proto/Script/FishCloud.xml @@ -61,7 +61,7 @@ 0.5 - + 3 diff --git a/MP3Proto/Script/Friendly.xml b/MP3Proto/Script/Friendly.xml index fa0a547..0bb62a4 100644 --- a/MP3Proto/Script/Friendly.xml +++ b/MP3Proto/Script/Friendly.xml @@ -10,7 +10,7 @@ 1.0 - + 1 diff --git a/MP3Proto/Script/GragnolFlyer.xml b/MP3Proto/Script/GragnolFlyer.xml index c337ded..852397d 100644 --- a/MP3Proto/Script/GragnolFlyer.xml +++ b/MP3Proto/Script/GragnolFlyer.xml @@ -16,7 +16,7 @@ - + 1 diff --git a/MP3Proto/Script/GuiMenu.xml b/MP3Proto/Script/GuiMenu.xml index 6d3179b..3131044 100644 --- a/MP3Proto/Script/GuiMenu.xml +++ b/MP3Proto/Script/GuiMenu.xml @@ -11,7 +11,7 @@ - + 0 diff --git a/MP3Proto/Script/GuiScreen.xml b/MP3Proto/Script/GuiScreen.xml index c5b783c..334a8a5 100644 --- a/MP3Proto/Script/GuiScreen.xml +++ b/MP3Proto/Script/GuiScreen.xml @@ -4,7 +4,7 @@ GuiScreen - + 0 diff --git a/MP3Proto/Script/KorbaMaw.xml b/MP3Proto/Script/KorbaMaw.xml index 2c2196d..2e86e9b 100644 --- a/MP3Proto/Script/KorbaMaw.xml +++ b/MP3Proto/Script/KorbaMaw.xml @@ -26,7 +26,7 @@ 1.0 - + 1 diff --git a/MP3Proto/Script/PathMeshCtrl.xml b/MP3Proto/Script/PathMeshCtrl.xml index 5337d40..91720b2 100644 --- a/MP3Proto/Script/PathMeshCtrl.xml +++ b/MP3Proto/Script/PathMeshCtrl.xml @@ -4,7 +4,7 @@ PathMeshCtrl - + 0 diff --git a/MP3Proto/Script/PirateDrone.xml b/MP3Proto/Script/PirateDrone.xml index d009456..687ca48 100644 --- a/MP3Proto/Script/PirateDrone.xml +++ b/MP3Proto/Script/PirateDrone.xml @@ -37,7 +37,7 @@ - + 1 diff --git a/MP3Proto/Script/PlayerActor.xml b/MP3Proto/Script/PlayerActor.xml index 645985d..c77265b 100644 --- a/MP3Proto/Script/PlayerActor.xml +++ b/MP3Proto/Script/PlayerActor.xml @@ -41,7 +41,7 @@ 4 - + 0 diff --git a/MP3Proto/Script/PlayerController.xml b/MP3Proto/Script/PlayerController.xml index c87bbb4..93486f8 100644 --- a/MP3Proto/Script/PlayerController.xml +++ b/MP3Proto/Script/PlayerController.xml @@ -24,7 +24,7 @@ - + 0 diff --git a/MP3Proto/Script/Repulsor.xml b/MP3Proto/Script/Repulsor.xml index 6a096e1..dca6388 100644 --- a/MP3Proto/Script/Repulsor.xml +++ b/MP3Proto/Script/Repulsor.xml @@ -4,7 +4,7 @@ Repulsor - + 0 diff --git a/MP3Proto/Script/Rundas.xml b/MP3Proto/Script/Rundas.xml index 82a07bd..cf588e0 100644 --- a/MP3Proto/Script/Rundas.xml +++ b/MP3Proto/Script/Rundas.xml @@ -20,7 +20,7 @@ 1.0 - + 1 diff --git a/MP3Proto/Script/SpacePirate.xml b/MP3Proto/Script/SpacePirate.xml index 088ed86..d3ee603 100644 --- a/MP3Proto/Script/SpacePirate.xml +++ b/MP3Proto/Script/SpacePirate.xml @@ -39,7 +39,7 @@ 0.30000001 - + 1 diff --git a/MP3Proto/Script/SpiderBallWaypoint.xml b/MP3Proto/Script/SpiderBallWaypoint.xml index 35d72d6..ead0b21 100644 --- a/MP3Proto/Script/SpiderBallWaypoint.xml +++ b/MP3Proto/Script/SpiderBallWaypoint.xml @@ -4,7 +4,7 @@ SpiderBallWaypoint - + 0 diff --git a/MP3Proto/Script/StreamedMovie.xml b/MP3Proto/Script/StreamedMovie.xml index 8bee893..aea4f2b 100644 --- a/MP3Proto/Script/StreamedMovie.xml +++ b/MP3Proto/Script/StreamedMovie.xml @@ -17,7 +17,7 @@ 127 - + 0 diff --git a/MP3Proto/Script/TeamAiMgr.xml b/MP3Proto/Script/TeamAiMgr.xml index 41ad40b..a630f26 100644 --- a/MP3Proto/Script/TeamAiMgr.xml +++ b/MP3Proto/Script/TeamAiMgr.xml @@ -22,7 +22,7 @@ 1 - + 0 diff --git a/MP3Proto/Script/TextPane.xml b/MP3Proto/Script/TextPane.xml index 0cc433a..2b97308 100644 --- a/MP3Proto/Script/TextPane.xml +++ b/MP3Proto/Script/TextPane.xml @@ -38,7 +38,7 @@ - + 1 diff --git a/MP3Proto/Script/VisorFlare.xml b/MP3Proto/Script/VisorFlare.xml index 371b3ed..da4a48e 100644 --- a/MP3Proto/Script/VisorFlare.xml +++ b/MP3Proto/Script/VisorFlare.xml @@ -4,7 +4,7 @@ VisorFlare - + 0 @@ -19,7 +19,7 @@ 2.0 - + 0 diff --git a/MP3Proto/Structs/BerserkerData.xml b/MP3Proto/Structs/BerserkerData.xml index 1b1bf9a..3631f88 100644 --- a/MP3Proto/Structs/BerserkerData.xml +++ b/MP3Proto/Structs/BerserkerData.xml @@ -66,7 +66,7 @@ - + 1 diff --git a/MP3Proto/Structs/CommandData.xml b/MP3Proto/Structs/CommandData.xml index daeb70e..9012198 100644 --- a/MP3Proto/Structs/CommandData.xml +++ b/MP3Proto/Structs/CommandData.xml @@ -7,7 +7,7 @@ false - + 0 diff --git a/MP3Proto/Structs/DynamicLightFalloff.xml b/MP3Proto/Structs/DynamicLightFalloff.xml index 1123645..7cca8dc 100644 --- a/MP3Proto/Structs/DynamicLightFalloff.xml +++ b/MP3Proto/Structs/DynamicLightFalloff.xml @@ -3,7 +3,7 @@ DynamicLightFalloff - + 0 diff --git a/MP3Proto/Structs/FlyingPirateData.xml b/MP3Proto/Structs/FlyingPirateData.xml index a52989d..8568cab 100644 --- a/MP3Proto/Structs/FlyingPirateData.xml +++ b/MP3Proto/Structs/FlyingPirateData.xml @@ -27,7 +27,7 @@ 100.0 - + 0 diff --git a/MP3Proto/Structs/GragnolFlyerData.xml b/MP3Proto/Structs/GragnolFlyerData.xml index 9f95398..beaeaa9 100644 --- a/MP3Proto/Structs/GragnolFlyerData.xml +++ b/MP3Proto/Structs/GragnolFlyerData.xml @@ -70,7 +70,7 @@ - + 1 diff --git a/MP3Proto/Structs/GrappleBlock.xml b/MP3Proto/Structs/GrappleBlock.xml index b2531b1..47162e4 100644 --- a/MP3Proto/Structs/GrappleBlock.xml +++ b/MP3Proto/Structs/GrappleBlock.xml @@ -3,7 +3,7 @@ GrappleBlock - + 0 diff --git a/MP3Proto/Structs/GrappleData.xml b/MP3Proto/Structs/GrappleData.xml index 3037521..6199447 100644 --- a/MP3Proto/Structs/GrappleData.xml +++ b/MP3Proto/Structs/GrappleData.xml @@ -3,7 +3,7 @@ GrappleData - + 0 diff --git a/MP3Proto/Structs/LayerInfo.xml b/MP3Proto/Structs/LayerInfo.xml index c2f9a96..c92d1f8 100644 --- a/MP3Proto/Structs/LayerInfo.xml +++ b/MP3Proto/Structs/LayerInfo.xml @@ -3,7 +3,7 @@ LayerInfo - + 0 diff --git a/MP3Proto/Structs/LightParameters.xml b/MP3Proto/Structs/LightParameters.xml index ad594d6..7a34ac9 100644 --- a/MP3Proto/Structs/LightParameters.xml +++ b/MP3Proto/Structs/LightParameters.xml @@ -59,7 +59,7 @@ false - + 0 diff --git a/MP3Proto/Structs/PathDetermination.xml b/MP3Proto/Structs/PathDetermination.xml index 21f38a0..83408c3 100644 --- a/MP3Proto/Structs/PathDetermination.xml +++ b/MP3Proto/Structs/PathDetermination.xml @@ -6,10 +6,10 @@ 0x571AA317 - - - - + + + + diff --git a/MP3Proto/Structs/PatternedAITypedef.xml b/MP3Proto/Structs/PatternedAITypedef.xml index 31736c8..ba1b31f 100644 --- a/MP3Proto/Structs/PatternedAITypedef.xml +++ b/MP3Proto/Structs/PatternedAITypedef.xml @@ -45,7 +45,7 @@ RULE - + 0 @@ -121,7 +121,11 @@ PART - + + + ELSC + + 1000.0 diff --git a/MP3Proto/Structs/SpacePirateData.xml b/MP3Proto/Structs/SpacePirateData.xml index 016dc05..de854e5 100644 --- a/MP3Proto/Structs/SpacePirateData.xml +++ b/MP3Proto/Structs/SpacePirateData.xml @@ -136,7 +136,7 @@ - + 1 diff --git a/MP3Proto/Structs/SplineType.xml b/MP3Proto/Structs/SplineType.xml index 3c5f099..77ac25a 100644 --- a/MP3Proto/Structs/SplineType.xml +++ b/MP3Proto/Structs/SplineType.xml @@ -3,7 +3,7 @@ SplineType - + 0 diff --git a/MP3Proto/Structs/TDamageInfo.xml b/MP3Proto/Structs/TDamageInfo.xml index dfd001c..3da5b42 100644 --- a/MP3Proto/Structs/TDamageInfo.xml +++ b/MP3Proto/Structs/TDamageInfo.xml @@ -3,7 +3,7 @@ TDamageInfo - + 0 diff --git a/MP3Proto/Structs/TweakBall_DeathBall.xml b/MP3Proto/Structs/TweakBall_DeathBall.xml index 16e59e9..9fa5306 100644 --- a/MP3Proto/Structs/TweakBall_DeathBall.xml +++ b/MP3Proto/Structs/TweakBall_DeathBall.xml @@ -8,7 +8,7 @@ - + 5 diff --git a/MP3Proto/Structs/TweakBall_FireBall.xml b/MP3Proto/Structs/TweakBall_FireBall.xml index 2f432f4..180bd35 100644 --- a/MP3Proto/Structs/TweakBall_FireBall.xml +++ b/MP3Proto/Structs/TweakBall_FireBall.xml @@ -8,7 +8,7 @@ - + 5 diff --git a/MP3Proto/Structs/TweakBall_IceBall.xml b/MP3Proto/Structs/TweakBall_IceBall.xml index 6b40a24..7263bdb 100644 --- a/MP3Proto/Structs/TweakBall_IceBall.xml +++ b/MP3Proto/Structs/TweakBall_IceBall.xml @@ -5,7 +5,7 @@ - + 5 diff --git a/MP3Proto/Structs/TweakBall_PhazonBall.xml b/MP3Proto/Structs/TweakBall_PhazonBall.xml index 3bd3b14..26f5144 100644 --- a/MP3Proto/Structs/TweakBall_PhazonBall.xml +++ b/MP3Proto/Structs/TweakBall_PhazonBall.xml @@ -8,7 +8,7 @@ - + 5 diff --git a/MP3Proto/Structs/TweakBall_ScrewAttack.xml b/MP3Proto/Structs/TweakBall_ScrewAttack.xml index e2034d9..f0d48a6 100644 --- a/MP3Proto/Structs/TweakBall_ScrewAttack.xml +++ b/MP3Proto/Structs/TweakBall_ScrewAttack.xml @@ -50,7 +50,7 @@ - + 7 diff --git a/MP3Proto/Structs/TweakPlayerGun_Weapons.xml b/MP3Proto/Structs/TweakPlayerGun_Weapons.xml index d242656..d5aa42b 100644 --- a/MP3Proto/Structs/TweakPlayerGun_Weapons.xml +++ b/MP3Proto/Structs/TweakPlayerGun_Weapons.xml @@ -5,7 +5,7 @@ - + 7 @@ -24,7 +24,7 @@ - + 4 @@ -43,7 +43,7 @@ - + 5 @@ -62,7 +62,7 @@ - + 5 diff --git a/PropertyMap.xml b/PropertyMap.xml index ebe8ae8..f101e25 100644 --- a/PropertyMap.xml +++ b/PropertyMap.xml @@ -78,7 +78,7 @@ - + @@ -174,12 +174,12 @@ - + - + @@ -195,7 +195,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -647,7 +647,7 @@ - + @@ -715,7 +715,7 @@ - + @@ -851,11 +851,11 @@ - + - + @@ -871,7 +871,7 @@ - + @@ -935,7 +935,7 @@ - + @@ -995,7 +995,7 @@ - + @@ -1011,7 +1011,7 @@ - + @@ -1027,7 +1027,7 @@ - + @@ -1075,7 +1075,7 @@ - + @@ -1151,7 +1151,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1263,7 +1263,7 @@ - + @@ -1271,7 +1271,7 @@ - + @@ -1283,7 +1283,7 @@ - + @@ -1351,11 +1351,11 @@ - + - + @@ -1611,7 +1611,7 @@ - + @@ -1651,7 +1651,7 @@ - + @@ -1666,7 +1666,7 @@ - + @@ -1702,12 +1702,12 @@ - + - + @@ -1771,7 +1771,7 @@ - + @@ -1843,7 +1843,7 @@ - + @@ -1891,11 +1891,11 @@ - + - + @@ -1983,7 +1983,7 @@ - + @@ -2067,7 +2067,7 @@ - + @@ -2095,7 +2095,7 @@ - + @@ -2491,7 +2491,7 @@ - + @@ -2499,7 +2499,7 @@ - + @@ -2519,7 +2519,7 @@ - + @@ -2543,7 +2543,7 @@ - + @@ -2563,7 +2563,7 @@ - + @@ -2647,7 +2647,7 @@ - + @@ -2655,7 +2655,7 @@ - + @@ -2695,7 +2695,7 @@ - + @@ -2843,7 +2843,7 @@ - + @@ -2851,7 +2851,7 @@ - + @@ -2915,14 +2915,14 @@ - + - + @@ -2939,7 +2939,7 @@ - + @@ -2995,7 +2995,7 @@ - + @@ -3043,7 +3043,7 @@ - + @@ -3055,7 +3055,7 @@ - + @@ -3279,7 +3279,7 @@ - + @@ -3367,7 +3367,7 @@ - + @@ -3430,7 +3430,7 @@ - + @@ -3459,7 +3459,7 @@ - + @@ -3467,7 +3467,7 @@ - + @@ -3511,7 +3511,7 @@ - + @@ -3547,7 +3547,7 @@ - + @@ -3627,7 +3627,7 @@ - + @@ -3651,7 +3651,7 @@ - + @@ -3715,7 +3715,7 @@ - + @@ -3723,7 +3723,7 @@ - + @@ -3799,7 +3799,7 @@ - + @@ -3839,7 +3839,7 @@ - + @@ -3955,7 +3955,7 @@ - + @@ -4174,7 +4174,7 @@ - + @@ -4203,7 +4203,7 @@ - + @@ -4211,7 +4211,7 @@ - + @@ -4434,7 +4434,7 @@ - + @@ -4507,7 +4507,7 @@ - + @@ -4611,7 +4611,7 @@ - + @@ -4627,11 +4627,11 @@ - + - + @@ -4643,7 +4643,7 @@ - + @@ -4663,11 +4663,11 @@ - + - + @@ -4699,7 +4699,7 @@ - + @@ -4807,7 +4807,7 @@ - + @@ -5610,7 +5610,7 @@ - + @@ -5715,7 +5715,7 @@ - + @@ -5771,7 +5771,7 @@ - + @@ -5831,7 +5831,7 @@ - + @@ -5939,7 +5939,7 @@ - + @@ -5998,7 +5998,7 @@ - + @@ -6043,7 +6043,7 @@ - + @@ -6055,7 +6055,7 @@ - + @@ -6367,7 +6367,7 @@ - + @@ -6379,7 +6379,7 @@ - + @@ -6431,7 +6431,7 @@ - + @@ -6579,7 +6579,7 @@ - + @@ -6635,7 +6635,7 @@ - + @@ -6755,7 +6755,7 @@ - + @@ -6783,7 +6783,7 @@ - + @@ -6831,7 +6831,7 @@ - + @@ -6931,7 +6931,7 @@ - + @@ -7035,7 +7035,7 @@ - + @@ -7151,7 +7151,7 @@ - + @@ -7179,7 +7179,7 @@ - + @@ -7231,7 +7231,7 @@ - + @@ -7487,7 +7487,7 @@ - + @@ -7523,7 +7523,7 @@ - + @@ -7603,7 +7603,7 @@ - + @@ -7679,7 +7679,7 @@ - + @@ -7875,7 +7875,7 @@ - + @@ -8039,7 +8039,7 @@ - + @@ -8095,7 +8095,7 @@ - + @@ -8363,7 +8363,7 @@ - + @@ -8451,7 +8451,7 @@ - + @@ -8587,7 +8587,7 @@ - + @@ -8634,7 +8634,7 @@ - + @@ -8695,7 +8695,7 @@ - + @@ -8703,7 +8703,7 @@ - + @@ -8867,7 +8867,7 @@ - + @@ -8943,7 +8943,7 @@ - + @@ -8951,7 +8951,7 @@ - + @@ -9375,7 +9375,7 @@ - + @@ -9463,7 +9463,7 @@ - + @@ -9519,7 +9519,7 @@ - + @@ -9543,7 +9543,7 @@ - + @@ -9583,7 +9583,7 @@ - + @@ -9750,7 +9750,7 @@ - + @@ -9963,7 +9963,7 @@ - + @@ -9975,7 +9975,7 @@ - + @@ -10014,7 +10014,7 @@ - + @@ -10091,7 +10091,7 @@ - + @@ -10154,7 +10154,7 @@ - + @@ -10475,7 +10475,7 @@ - + @@ -10643,7 +10643,7 @@ - + @@ -10723,7 +10723,7 @@ - + @@ -10811,7 +10811,7 @@ - + @@ -10827,7 +10827,7 @@ - + @@ -10899,11 +10899,11 @@ - + - + @@ -10923,7 +10923,7 @@ - + @@ -11127,7 +11127,7 @@ - + @@ -11135,7 +11135,7 @@ - + @@ -11155,7 +11155,7 @@ - + @@ -11295,7 +11295,7 @@ - + @@ -11323,10 +11323,10 @@ - + - + @@ -11347,10 +11347,10 @@ - + - + @@ -11415,7 +11415,7 @@ - + @@ -11495,7 +11495,7 @@ - + @@ -11526,7 +11526,7 @@ - + @@ -11535,7 +11535,7 @@ - + @@ -11547,7 +11547,7 @@ - + @@ -11642,7 +11642,7 @@ - + @@ -11719,7 +11719,7 @@ - + @@ -11807,11 +11807,11 @@ - + - + @@ -11991,7 +11991,7 @@ - + @@ -11999,7 +11999,7 @@ - + @@ -12026,7 +12026,7 @@ - + @@ -12151,7 +12151,7 @@ - + @@ -12167,7 +12167,7 @@ - + @@ -12195,7 +12195,7 @@ - + @@ -12282,7 +12282,7 @@ - + @@ -12319,7 +12319,7 @@ - + @@ -12334,7 +12334,7 @@ - + @@ -12443,7 +12443,7 @@ - + @@ -12455,7 +12455,7 @@ - + @@ -12598,7 +12598,7 @@ - + @@ -12619,7 +12619,7 @@ - + @@ -12807,7 +12807,7 @@ - + @@ -12843,7 +12843,7 @@ - + @@ -12854,7 +12854,7 @@ - + @@ -12931,7 +12931,7 @@ - + @@ -12954,8 +12954,8 @@ - - + + @@ -12975,7 +12975,7 @@ - + @@ -13139,7 +13139,7 @@ - + @@ -13339,7 +13339,7 @@ - + @@ -13367,7 +13367,7 @@ - + @@ -13467,7 +13467,7 @@ - + @@ -13587,7 +13587,7 @@ - + @@ -13615,7 +13615,7 @@ - + @@ -13799,7 +13799,7 @@ - + @@ -13874,7 +13874,7 @@ - + @@ -13903,7 +13903,7 @@ - + @@ -13971,7 +13971,7 @@ - + @@ -14115,11 +14115,11 @@ - + - + @@ -14182,7 +14182,7 @@ - + @@ -14215,7 +14215,7 @@ - + @@ -14231,7 +14231,7 @@ - + @@ -14247,7 +14247,7 @@ - + @@ -14263,7 +14263,7 @@ - + @@ -14527,7 +14527,7 @@ - + @@ -14539,7 +14539,7 @@ - + @@ -14755,7 +14755,7 @@ - + @@ -14931,7 +14931,7 @@ - + @@ -14967,7 +14967,7 @@ - + @@ -15075,7 +15075,7 @@ - + @@ -15167,7 +15167,7 @@ - + @@ -15187,7 +15187,7 @@ - + @@ -15319,11 +15319,11 @@ - + - + @@ -15399,7 +15399,7 @@ - + @@ -15439,7 +15439,7 @@ - + @@ -15475,7 +15475,7 @@ - + @@ -15539,7 +15539,7 @@ - + @@ -15551,7 +15551,7 @@ - + @@ -15699,7 +15699,7 @@ - + @@ -15759,7 +15759,7 @@ - + @@ -15795,7 +15795,7 @@ - + @@ -15831,7 +15831,7 @@ - + @@ -15883,7 +15883,7 @@ - + @@ -15987,7 +15987,7 @@ - + @@ -16159,7 +16159,7 @@ - + @@ -16199,7 +16199,7 @@ - + @@ -16239,7 +16239,7 @@ - + @@ -16255,7 +16255,7 @@ - + @@ -16411,7 +16411,7 @@ - + @@ -16479,7 +16479,7 @@ - + @@ -16487,7 +16487,7 @@ - + @@ -16499,7 +16499,7 @@ - + @@ -16551,7 +16551,7 @@ - + @@ -16675,7 +16675,7 @@ - + @@ -16739,11 +16739,11 @@ - + - + @@ -16907,7 +16907,7 @@ - + @@ -16951,7 +16951,7 @@ - + @@ -16994,8 +16994,8 @@ - - + + @@ -17034,7 +17034,7 @@ - + @@ -17102,7 +17102,7 @@ - + @@ -17191,7 +17191,7 @@ - + @@ -17435,7 +17435,7 @@ - + @@ -17451,7 +17451,7 @@ - + @@ -17459,7 +17459,7 @@ - + @@ -17647,7 +17647,7 @@ - + @@ -17803,7 +17803,7 @@ - + @@ -17883,7 +17883,7 @@ - + @@ -17915,7 +17915,7 @@ - + @@ -18003,7 +18003,7 @@ - + @@ -18039,7 +18039,7 @@ - + @@ -18075,7 +18075,7 @@ - + @@ -18299,7 +18299,7 @@ - + @@ -18327,7 +18327,7 @@ - + @@ -18431,7 +18431,7 @@ - + @@ -18451,7 +18451,7 @@ - + @@ -18463,7 +18463,7 @@ - + @@ -18471,7 +18471,7 @@ - + @@ -18519,7 +18519,7 @@ - + @@ -18591,7 +18591,7 @@ - + @@ -18643,7 +18643,7 @@ - + @@ -18731,7 +18731,7 @@ - + @@ -18767,7 +18767,7 @@ - + @@ -18847,7 +18847,7 @@ - + @@ -18883,7 +18883,7 @@ - + @@ -18927,7 +18927,7 @@ - + @@ -18963,7 +18963,7 @@ - + @@ -19075,7 +19075,7 @@ - + @@ -19086,8 +19086,8 @@ - - + + @@ -19219,7 +19219,7 @@ - + @@ -19227,7 +19227,7 @@ - + @@ -19279,7 +19279,7 @@ - + @@ -19367,7 +19367,7 @@ - + @@ -19535,7 +19535,7 @@ - + @@ -19547,7 +19547,7 @@ - + @@ -19639,7 +19639,7 @@ - + @@ -19791,7 +19791,7 @@ - + @@ -19955,7 +19955,7 @@ - + @@ -19999,7 +19999,7 @@ - + @@ -20063,7 +20063,7 @@ - + @@ -20159,7 +20159,7 @@ - + @@ -20299,7 +20299,7 @@ - + @@ -20311,7 +20311,7 @@ - + @@ -20459,7 +20459,7 @@ - + @@ -20527,7 +20527,7 @@ - + @@ -20595,7 +20595,7 @@ - + @@ -20618,7 +20618,7 @@ - + @@ -20627,7 +20627,7 @@ - + @@ -20667,7 +20667,7 @@ - + @@ -20675,11 +20675,11 @@ - + - + @@ -20713,13 +20713,9 @@ - - - - - + @@ -20831,7 +20827,7 @@ - + @@ -20875,7 +20871,7 @@ - + @@ -20959,7 +20955,7 @@ - + @@ -20967,7 +20963,7 @@ - + @@ -21039,7 +21035,7 @@ - + @@ -21059,7 +21055,7 @@ - + @@ -21075,7 +21071,7 @@ - + @@ -21087,7 +21083,7 @@ - + @@ -21139,7 +21135,7 @@ - + @@ -21155,7 +21151,7 @@ - + @@ -21427,7 +21423,7 @@ - + @@ -21443,7 +21439,7 @@ - + @@ -21563,7 +21559,7 @@ - + @@ -21635,7 +21631,7 @@ - + @@ -21663,7 +21659,7 @@ - + @@ -21691,7 +21687,7 @@ - + @@ -21727,7 +21723,7 @@ - + @@ -21839,7 +21835,7 @@ - + @@ -22010,7 +22006,7 @@ - + @@ -22107,7 +22103,7 @@ - + @@ -22226,8 +22222,8 @@ - - + + @@ -22343,7 +22339,7 @@ - + @@ -22359,14 +22355,14 @@ - + - + - + @@ -22583,7 +22579,7 @@ - + @@ -22727,7 +22723,7 @@ - + @@ -22739,7 +22735,7 @@ - + @@ -22747,7 +22743,7 @@ - + @@ -22755,7 +22751,7 @@ - + @@ -22782,7 +22778,7 @@ - + @@ -23015,7 +23011,7 @@ - + @@ -23186,7 +23182,7 @@ - + @@ -23283,7 +23279,7 @@ - + @@ -23471,7 +23467,7 @@ - + @@ -23507,7 +23503,7 @@ - + @@ -23523,7 +23519,7 @@ - + @@ -23567,7 +23563,7 @@ - + @@ -23599,7 +23595,7 @@ - + @@ -23695,7 +23691,7 @@ - + @@ -23783,7 +23779,7 @@ - + @@ -23795,7 +23791,7 @@ - + @@ -23939,7 +23935,7 @@ - + @@ -23991,7 +23987,7 @@ - + @@ -24043,7 +24039,7 @@ - + @@ -24127,7 +24123,7 @@ - + @@ -24351,7 +24347,7 @@ - + @@ -24379,7 +24375,7 @@ - + @@ -24418,7 +24414,7 @@ - + @@ -24503,7 +24499,7 @@ - + @@ -24682,7 +24678,7 @@ - + @@ -24803,7 +24799,7 @@ - + @@ -24875,7 +24871,7 @@ - + @@ -24919,7 +24915,7 @@ - + @@ -24999,7 +24995,7 @@ - + @@ -25042,7 +25038,7 @@ - + @@ -25075,7 +25071,7 @@ - + @@ -25211,7 +25207,7 @@ - + @@ -25251,7 +25247,7 @@ - + @@ -25287,7 +25283,7 @@ - + @@ -25307,7 +25303,7 @@ - + @@ -25375,7 +25371,7 @@ - + @@ -25411,7 +25407,7 @@ - + @@ -25427,7 +25423,7 @@ - + @@ -25587,7 +25583,7 @@ - + @@ -25635,7 +25631,7 @@ - + @@ -25651,7 +25647,7 @@ - + @@ -25747,7 +25743,7 @@ - + @@ -25818,7 +25814,7 @@ - + @@ -25947,7 +25943,7 @@ - + @@ -25967,7 +25963,7 @@ - + @@ -26103,7 +26099,7 @@ - + @@ -26247,7 +26243,7 @@ - + @@ -26319,7 +26315,7 @@ - + @@ -26343,7 +26339,7 @@ - + @@ -26575,7 +26571,7 @@ - + @@ -26615,7 +26611,7 @@ - + @@ -26643,7 +26639,7 @@ - + @@ -26679,7 +26675,7 @@ - + @@ -26711,7 +26707,7 @@ - + @@ -26947,7 +26943,7 @@ - + @@ -26955,7 +26951,7 @@ - + @@ -26994,7 +26990,7 @@ - + @@ -27179,7 +27175,7 @@ - + @@ -27242,8 +27238,8 @@ - - + + @@ -27327,11 +27323,11 @@ - + - + @@ -27395,7 +27391,7 @@ - + @@ -27519,7 +27515,7 @@ - + @@ -27595,7 +27591,7 @@ - + @@ -27619,11 +27615,11 @@ - + - + @@ -27699,7 +27695,7 @@ - + @@ -27871,7 +27867,7 @@ - + @@ -27903,7 +27899,7 @@ - + @@ -28079,7 +28075,7 @@ - + @@ -28162,7 +28158,7 @@ - + @@ -28191,7 +28187,7 @@ - + @@ -28211,7 +28207,7 @@ - + @@ -28375,7 +28371,7 @@ - + @@ -28459,14 +28455,14 @@ - + - + @@ -28627,7 +28623,7 @@ - + @@ -28731,7 +28727,7 @@ - + @@ -28843,7 +28839,7 @@ - + @@ -28867,7 +28863,7 @@ - + @@ -28915,7 +28911,7 @@ - + @@ -28931,7 +28927,7 @@ - + @@ -29055,7 +29051,7 @@ - + @@ -29131,7 +29127,7 @@ - + @@ -29235,7 +29231,7 @@ - + @@ -29251,7 +29247,7 @@ - + @@ -29363,7 +29359,7 @@ - + @@ -29419,7 +29415,7 @@ - + @@ -29467,7 +29463,7 @@ - + @@ -29507,7 +29503,7 @@ - + @@ -29615,7 +29611,7 @@ - + @@ -29707,7 +29703,7 @@ - + @@ -29779,7 +29775,7 @@ - + @@ -29839,7 +29835,7 @@ - + @@ -29987,7 +29983,7 @@ - + @@ -30194,7 +30190,7 @@ - + @@ -30254,7 +30250,7 @@ - + @@ -30363,7 +30359,7 @@ - + @@ -30415,7 +30411,7 @@ - + @@ -30427,7 +30423,7 @@ - + @@ -30479,7 +30475,7 @@ - + @@ -30491,7 +30487,7 @@ - + @@ -30679,7 +30675,7 @@ - + @@ -30711,7 +30707,7 @@ - + @@ -30743,7 +30739,7 @@ - + @@ -30779,7 +30775,7 @@ - + @@ -30799,7 +30795,7 @@ - + @@ -30863,7 +30859,7 @@ - + @@ -30875,7 +30871,7 @@ - + @@ -30951,7 +30947,7 @@ - + @@ -31103,7 +31099,7 @@ - + @@ -31135,11 +31131,11 @@ - + - + @@ -31195,7 +31191,7 @@ - + @@ -31363,7 +31359,7 @@ - + @@ -31387,7 +31383,7 @@ - + @@ -31403,7 +31399,7 @@ - + @@ -31435,7 +31431,7 @@ - + @@ -31463,7 +31459,7 @@ - + @@ -31635,7 +31631,7 @@ - + @@ -31655,7 +31651,7 @@ - + @@ -31934,7 +31930,7 @@ - + @@ -31963,7 +31959,7 @@ - + @@ -31979,7 +31975,7 @@ - + @@ -32027,7 +32023,7 @@ - + @@ -32043,7 +32039,7 @@ - + @@ -32287,7 +32283,7 @@ - + @@ -32347,7 +32343,7 @@ - + @@ -32362,7 +32358,7 @@ - + @@ -32391,7 +32387,7 @@ - + @@ -32423,7 +32419,7 @@ - + @@ -32435,7 +32431,7 @@ - + @@ -32487,10 +32483,10 @@ - + - + @@ -32515,7 +32511,7 @@ - + @@ -32539,7 +32535,7 @@ - + @@ -32771,7 +32767,7 @@ - + @@ -32919,7 +32915,7 @@ - + @@ -32955,7 +32951,7 @@ - + @@ -33011,7 +33007,7 @@ - + @@ -33091,7 +33087,7 @@ - + @@ -33150,7 +33146,7 @@ - + @@ -33435,7 +33431,7 @@ - + @@ -33519,7 +33515,7 @@ - + @@ -33711,7 +33707,7 @@ - + @@ -33731,7 +33727,7 @@ - + @@ -33743,7 +33739,7 @@ - + @@ -33803,7 +33799,7 @@ - + @@ -33819,7 +33815,7 @@ - + @@ -33859,7 +33855,7 @@ - + @@ -33879,7 +33875,7 @@ - + @@ -33931,7 +33927,7 @@ - + @@ -34047,14 +34043,14 @@ - + - + @@ -34171,7 +34167,7 @@ - + @@ -34419,7 +34415,7 @@ - + @@ -34455,7 +34451,7 @@ - + @@ -34487,7 +34483,7 @@ - + @@ -34599,7 +34595,7 @@ - + @@ -34699,7 +34695,7 @@ - + @@ -34811,7 +34807,7 @@ - + @@ -34867,7 +34863,7 @@ - + @@ -34923,7 +34919,7 @@ - + @@ -34939,7 +34935,7 @@ - + @@ -35014,7 +35010,7 @@ - + @@ -35111,7 +35107,7 @@ - + @@ -35119,7 +35115,7 @@ - + @@ -35171,14 +35167,14 @@ - + - + @@ -35287,7 +35283,7 @@ - + @@ -35307,7 +35303,7 @@ - + @@ -35379,7 +35375,7 @@ - + @@ -35534,7 +35530,7 @@ - + @@ -35739,7 +35735,7 @@ - + @@ -35923,7 +35919,7 @@ - + @@ -35951,7 +35947,7 @@ - + @@ -36083,7 +36079,7 @@ - + @@ -36283,7 +36279,7 @@ - + @@ -36303,7 +36299,7 @@ - + @@ -36431,7 +36427,7 @@ - + @@ -36479,7 +36475,7 @@ - + @@ -36487,11 +36483,11 @@ - + - + @@ -36515,7 +36511,7 @@ - + @@ -36531,7 +36527,7 @@ - + @@ -36575,7 +36571,7 @@ - + @@ -36678,7 +36674,7 @@ - + @@ -36822,7 +36818,7 @@ - + @@ -36839,7 +36835,7 @@ - + @@ -36879,7 +36875,7 @@ - + @@ -36903,7 +36899,7 @@ - + @@ -36938,7 +36934,7 @@ - + @@ -37031,7 +37027,7 @@ - + @@ -37231,7 +37227,7 @@ - + @@ -37243,7 +37239,7 @@ - + @@ -37271,7 +37267,7 @@ - + @@ -37327,7 +37323,7 @@ - + @@ -37355,7 +37351,7 @@ - + @@ -37379,7 +37375,7 @@ - + @@ -37423,7 +37419,7 @@ - + @@ -37467,7 +37463,7 @@ - + @@ -37519,7 +37515,7 @@ - + @@ -37567,7 +37563,7 @@ - + @@ -37615,7 +37611,7 @@ - + @@ -37627,7 +37623,7 @@ - + @@ -37659,7 +37655,7 @@ - + @@ -37727,7 +37723,7 @@ - + @@ -37827,7 +37823,7 @@ - + @@ -37863,7 +37859,7 @@ - + @@ -37930,8 +37926,8 @@ - - + + @@ -38250,7 +38246,7 @@ - + @@ -38339,11 +38335,11 @@ - + - + @@ -38503,7 +38499,7 @@ - + @@ -38535,7 +38531,7 @@ - + @@ -38631,7 +38627,7 @@ - + @@ -38642,7 +38638,7 @@ - + @@ -38662,7 +38658,7 @@ - + @@ -38683,7 +38679,7 @@ - + @@ -38699,7 +38695,7 @@ - + @@ -38814,7 +38810,7 @@ - + @@ -38994,7 +38990,7 @@ - + @@ -39143,7 +39139,7 @@ - + @@ -39219,7 +39215,7 @@ - + @@ -39295,11 +39291,11 @@ - + - - + + @@ -39367,7 +39363,7 @@ - + @@ -39507,7 +39503,7 @@ - + @@ -39583,7 +39579,7 @@ - + @@ -39647,7 +39643,7 @@ - + @@ -39723,7 +39719,7 @@ - + @@ -39751,7 +39747,7 @@ - + @@ -39803,7 +39799,7 @@ - + @@ -39835,7 +39831,7 @@ - + @@ -40011,7 +40007,7 @@ - + @@ -40126,7 +40122,7 @@ - + @@ -40154,11 +40150,7 @@ - - - - - + @@ -40258,7 +40250,7 @@ - + @@ -40303,7 +40295,7 @@ - + @@ -40359,7 +40351,7 @@ - + @@ -40451,11 +40443,11 @@ - + - + @@ -40607,7 +40599,7 @@ - + @@ -40995,7 +40987,7 @@ - + @@ -41003,7 +40995,7 @@ - + @@ -41039,7 +41031,7 @@ - + @@ -41059,10 +41051,10 @@ - + - + @@ -41099,7 +41091,7 @@ - + @@ -41159,7 +41151,7 @@ - + @@ -41215,7 +41207,7 @@ - + @@ -41239,7 +41231,7 @@ - + @@ -41443,7 +41435,7 @@ - + @@ -41635,7 +41627,7 @@ - + @@ -41679,7 +41671,7 @@ - + @@ -41779,7 +41771,7 @@ - + @@ -41807,7 +41799,7 @@ - + @@ -41947,7 +41939,7 @@ - + @@ -41971,7 +41963,7 @@ - + @@ -42003,7 +41995,7 @@ - + @@ -42023,7 +42015,7 @@ - + @@ -42179,7 +42171,7 @@ - + @@ -42231,7 +42223,7 @@ - + @@ -42243,7 +42235,7 @@ - + @@ -42323,7 +42315,7 @@ - + @@ -42430,7 +42422,7 @@ - + @@ -42474,7 +42466,7 @@ - + @@ -42490,7 +42482,7 @@ - + @@ -42535,7 +42527,7 @@ - + @@ -42587,7 +42579,7 @@ - + @@ -42646,7 +42638,7 @@ - + @@ -42683,11 +42675,11 @@ - + - + @@ -42759,7 +42751,7 @@ - + @@ -42835,11 +42827,11 @@ - + - + @@ -42863,7 +42855,7 @@ - + @@ -42907,7 +42899,7 @@ - + @@ -43274,7 +43266,7 @@ - + @@ -43283,7 +43275,7 @@ - + @@ -43303,7 +43295,7 @@ - + @@ -43391,7 +43383,7 @@ - + @@ -43403,7 +43395,7 @@ - + @@ -43411,7 +43403,7 @@ - + @@ -43447,7 +43439,7 @@ - + @@ -43835,7 +43827,7 @@ - + @@ -43895,11 +43887,11 @@ - + - + @@ -44054,7 +44046,7 @@ - + @@ -44075,7 +44067,7 @@ - + @@ -44175,7 +44167,7 @@ - + @@ -44199,7 +44191,7 @@ - + @@ -44239,7 +44231,7 @@ - + @@ -44295,7 +44287,7 @@ - + @@ -44355,7 +44347,7 @@ - + @@ -44363,7 +44355,7 @@ - + @@ -44375,7 +44367,7 @@ - + @@ -44395,7 +44387,7 @@ - + @@ -44511,7 +44503,7 @@ - + @@ -44603,7 +44595,7 @@ - + @@ -44734,7 +44726,7 @@ - + @@ -44743,7 +44735,7 @@ - + @@ -44927,7 +44919,7 @@ - + @@ -44939,7 +44931,7 @@ - + @@ -45047,7 +45039,7 @@ - + @@ -45127,7 +45119,7 @@ - + @@ -45150,12 +45142,12 @@ - + - + @@ -45199,7 +45191,7 @@ - + @@ -45234,7 +45226,7 @@ - + @@ -45263,7 +45255,7 @@ - + @@ -45371,7 +45363,7 @@ - + @@ -45411,7 +45403,7 @@ - + @@ -45431,7 +45423,7 @@ - + @@ -45511,7 +45503,7 @@ - + @@ -45634,7 +45626,7 @@ - + @@ -45647,7 +45639,7 @@ - + @@ -45655,7 +45647,7 @@ - + @@ -45679,7 +45671,7 @@ - + @@ -45787,7 +45779,7 @@ - + @@ -46183,7 +46175,7 @@ - + @@ -46351,7 +46343,7 @@ - + @@ -46403,7 +46395,7 @@ - + @@ -46431,7 +46423,7 @@ - + @@ -46719,7 +46711,7 @@ - + @@ -46803,7 +46795,7 @@ - +