diff --git a/DKCR/Enums/CableEnum.xml b/DKCR/Enums/CableEnum.xml index 8f42399..ee924a9 100644 --- a/DKCR/Enums/CableEnum.xml +++ b/DKCR/Enums/CableEnum.xml @@ -3,9 +3,9 @@ CableEnum - - - + + + diff --git a/DKCR/Enums/DamageableTriggerEnum.xml b/DKCR/Enums/DamageableTriggerEnum.xml index 67885d1..c27792a 100644 --- a/DKCR/Enums/DamageableTriggerEnum.xml +++ b/DKCR/Enums/DamageableTriggerEnum.xml @@ -3,10 +3,10 @@ DamageableTriggerEnum - - - - + + + + diff --git a/DKCR/Enums/PhysicalControl.xml b/DKCR/Enums/PhysicalControl.xml index d0400cd..5dfe450 100644 --- a/DKCR/Enums/PhysicalControl.xml +++ b/DKCR/Enums/PhysicalControl.xml @@ -3,28 +3,28 @@ PhysicalControl - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -68,28 +68,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/DKCR/Enums/PhysicalControlBoolean.xml b/DKCR/Enums/PhysicalControlBoolean.xml index 4c1d140..60b7250 100644 --- a/DKCR/Enums/PhysicalControlBoolean.xml +++ b/DKCR/Enums/PhysicalControlBoolean.xml @@ -3,9 +3,9 @@ PhysicalControlBoolean - - - + + + diff --git a/DKCR/Enums/RevolutionControlType.xml b/DKCR/Enums/RevolutionControlType.xml index 7f51e77..b375da1 100644 --- a/DKCR/Enums/RevolutionControlType.xml +++ b/DKCR/Enums/RevolutionControlType.xml @@ -3,14 +3,14 @@ RevolutionControlType - - - - - - - - + + + + + + + + diff --git a/DKCR/Enums/RevolutionControl_UnknownEnum1.xml b/DKCR/Enums/RevolutionControl_UnknownEnum1.xml deleted file mode 100644 index 4684ce6..0000000 --- a/DKCR/Enums/RevolutionControl_UnknownEnum1.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - RevolutionControl_UnknownEnum1 - - - - - - - - - - - - - - - - diff --git a/DKCR/Enums/RevolutionControl_UnknownEnum2.xml b/DKCR/Enums/RevolutionControl_UnknownEnum2.xml deleted file mode 100644 index cd9c156..0000000 --- a/DKCR/Enums/RevolutionControl_UnknownEnum2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - RevolutionControl_UnknownEnum2 - - - - - - - diff --git a/DKCR/Enums/RevolutionGesture.xml b/DKCR/Enums/RevolutionGesture.xml new file mode 100644 index 0000000..721db96 --- /dev/null +++ b/DKCR/Enums/RevolutionGesture.xml @@ -0,0 +1,20 @@ + + + + RevolutionGesture + + + + + + + + + + + + + + + + diff --git a/DKCR/Enums/RevolutionPointerShape.xml b/DKCR/Enums/RevolutionPointerShape.xml new file mode 100644 index 0000000..5dd6ff9 --- /dev/null +++ b/DKCR/Enums/RevolutionPointerShape.xml @@ -0,0 +1,11 @@ + + + + RevolutionPointerShape + + + + + + + diff --git a/DKCR/Enums/RevolutionVirtualControl.xml b/DKCR/Enums/RevolutionVirtualControl.xml index a818967..c04f70f 100644 --- a/DKCR/Enums/RevolutionVirtualControl.xml +++ b/DKCR/Enums/RevolutionVirtualControl.xml @@ -3,24 +3,24 @@ RevolutionVirtualControl - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/DKCR/Enums/Shape.xml b/DKCR/Enums/Shape.xml index 629d595..98f1b6e 100644 --- a/DKCR/Enums/Shape.xml +++ b/DKCR/Enums/Shape.xml @@ -3,10 +3,10 @@ Shape - - - - + + + + diff --git a/DKCR/Enums/UnknownEnum1.xml b/DKCR/Enums/UnknownEnum1.xml index e8fd037..e30c566 100644 --- a/DKCR/Enums/UnknownEnum1.xml +++ b/DKCR/Enums/UnknownEnum1.xml @@ -3,59 +3,59 @@ UnknownEnum1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DKCR/Game.xml b/DKCR/Game.xml index 6642e6b..d3b7f48 100644 --- a/DKCR/Game.xml +++ b/DKCR/Game.xml @@ -691,10 +691,6 @@ AreaDamageData - - AreaPathStructA - - BalloonBarrelData @@ -899,6 +895,10 @@ DebrisPropertiesOrientationEnum + + DebugControls + + DespawnRules @@ -1211,6 +1211,10 @@ PathPosition + + PathType + + PatternedAITypedef @@ -1475,14 +1479,6 @@ RevolutionControlType - - RevolutionControl_UnknownEnum1 - - - - RevolutionControl_UnknownEnum2 - - RevolutionControl_UnknownStruct1 @@ -1499,10 +1495,18 @@ RevolutionControl_UnknownStruct4 + + RevolutionGesture + + RevolutionPhysicalControl + + RevolutionPointerShape + + RevolutionVirtualControl @@ -1559,6 +1563,10 @@ ShadowData + + ShadowProjection + + Shape @@ -1715,10 +1723,6 @@ TweakControls_UnknownStruct2 - - TweakControls_UnknownStruct3 - - TweakGraphicalTransitions_UnknownEnum1 @@ -2475,10 +2479,6 @@ UnknownStruct51 - - UnknownStruct510 - - UnknownStruct52 diff --git a/DKCR/Script/ActorTransform.xml b/DKCR/Script/ActorTransform.xml index b1e8c90..0520533 100644 --- a/DKCR/Script/ActorTransform.xml +++ b/DKCR/Script/ActorTransform.xml @@ -4,7 +4,7 @@ ActorTransform - + Always 20 diff --git a/DKCR/Script/AreaAttributes.xml b/DKCR/Script/AreaAttributes.xml index de404c1..39ce7b2 100644 --- a/DKCR/Script/AreaAttributes.xml +++ b/DKCR/Script/AreaAttributes.xml @@ -8,7 +8,7 @@ Show the skybox. If no Skybox Model is specified, it will show the World's default skybox. false - + Always -1 diff --git a/DKCR/Script/AreaPath.xml b/DKCR/Script/AreaPath.xml index 82892c3..6180adb 100644 --- a/DKCR/Script/AreaPath.xml +++ b/DKCR/Script/AreaPath.xml @@ -39,7 +39,7 @@ 0.5 - + PART diff --git a/DKCR/Script/BarrelCannon.xml b/DKCR/Script/BarrelCannon.xml index 5239831..2a34e95 100644 --- a/DKCR/Script/BarrelCannon.xml +++ b/DKCR/Script/BarrelCannon.xml @@ -50,7 +50,7 @@ - + 262176 diff --git a/DKCR/Script/BirdBoss.xml b/DKCR/Script/BirdBoss.xml index 87cb0f3..8ae64d1 100644 --- a/DKCR/Script/BirdBoss.xml +++ b/DKCR/Script/BirdBoss.xml @@ -26,7 +26,7 @@ - + 524322 diff --git a/DKCR/Script/CameraFilterKeyframe.xml b/DKCR/Script/CameraFilterKeyframe.xml index b40118e..1f5e16e 100644 --- a/DKCR/Script/CameraFilterKeyframe.xml +++ b/DKCR/Script/CameraFilterKeyframe.xml @@ -7,7 +7,7 @@ 0 - + 0 diff --git a/DKCR/Script/CinematicCamera.xml b/DKCR/Script/CinematicCamera.xml index d25c5de..9ffea42 100644 --- a/DKCR/Script/CinematicCamera.xml +++ b/DKCR/Script/CinematicCamera.xml @@ -19,16 +19,16 @@ 0x639D1F97 - - - - + + + + 10.0 - + 133236 @@ -38,7 +38,7 @@ 0x26AD4A6B - + 12 @@ -62,7 +62,7 @@ - + 0 @@ -86,7 +86,7 @@ - + 0 diff --git a/DKCR/Script/ClingPathControl.xml b/DKCR/Script/ClingPathControl.xml index ccfaaf2..b599cc9 100644 --- a/DKCR/Script/ClingPathControl.xml +++ b/DKCR/Script/ClingPathControl.xml @@ -4,7 +4,7 @@ ClingPathControl - + Always 0 diff --git a/DKCR/Script/ColorModulate.xml b/DKCR/Script/ColorModulate.xml index f9bbda1..de5055a 100644 --- a/DKCR/Script/ColorModulate.xml +++ b/DKCR/Script/ColorModulate.xml @@ -22,13 +22,13 @@ 0xE51B07EB - - + + - - - - + + + + diff --git a/DKCR/Script/CustomInterpolation.xml b/DKCR/Script/CustomInterpolation.xml index 5679c59..cd3c501 100644 --- a/DKCR/Script/CustomInterpolation.xml +++ b/DKCR/Script/CustomInterpolation.xml @@ -4,7 +4,7 @@ CustomInterpolation - + Always 3 diff --git a/DKCR/Script/ForestBoss.xml b/DKCR/Script/ForestBoss.xml index 7e484a9..5d529d8 100644 --- a/DKCR/Script/ForestBoss.xml +++ b/DKCR/Script/ForestBoss.xml @@ -26,7 +26,7 @@ - + 524322 diff --git a/DKCR/Script/GenericCreature.xml b/DKCR/Script/GenericCreature.xml index bc284ef..aeba2cc 100644 --- a/DKCR/Script/GenericCreature.xml +++ b/DKCR/Script/GenericCreature.xml @@ -24,10 +24,10 @@ - + 656426 - + 524304 diff --git a/DKCR/Script/JungleBoss1.xml b/DKCR/Script/JungleBoss1.xml index bd12083..757a525 100644 --- a/DKCR/Script/JungleBoss1.xml +++ b/DKCR/Script/JungleBoss1.xml @@ -27,7 +27,7 @@ - + 524322 diff --git a/DKCR/Script/Mole.xml b/DKCR/Script/Mole.xml index 587a84d..3a739a0 100644 --- a/DKCR/Script/Mole.xml +++ b/DKCR/Script/Mole.xml @@ -12,7 +12,7 @@ - + 524322 diff --git a/DKCR/Script/PathControl.xml b/DKCR/Script/PathControl.xml index 372fb60..2c1f197 100644 --- a/DKCR/Script/PathControl.xml +++ b/DKCR/Script/PathControl.xml @@ -4,7 +4,7 @@ PathControl - + Always 0 diff --git a/DKCR/Script/PirateCrab.xml b/DKCR/Script/PirateCrab.xml index 2ca4dca..2fb888b 100644 --- a/DKCR/Script/PirateCrab.xml +++ b/DKCR/Script/PirateCrab.xml @@ -34,7 +34,7 @@ - + 524322 diff --git a/DKCR/Script/RobotChicken.xml b/DKCR/Script/RobotChicken.xml index bf88f09..d05099c 100644 --- a/DKCR/Script/RobotChicken.xml +++ b/DKCR/Script/RobotChicken.xml @@ -26,7 +26,7 @@ - + 524322 diff --git a/DKCR/Script/RobotChickenFlyer.xml b/DKCR/Script/RobotChickenFlyer.xml index 2b41f01..c3925c9 100644 --- a/DKCR/Script/RobotChickenFlyer.xml +++ b/DKCR/Script/RobotChickenFlyer.xml @@ -26,7 +26,7 @@ - + 524322 diff --git a/DKCR/Script/RumbleEffect.xml b/DKCR/Script/RumbleEffect.xml index 511fc23..a3c704b 100644 --- a/DKCR/Script/RumbleEffect.xml +++ b/DKCR/Script/RumbleEffect.xml @@ -10,7 +10,7 @@ - + Always 240 diff --git a/DKCR/Script/ShadowProjector.xml b/DKCR/Script/ShadowProjector.xml index 5f74a11..0e5e90d 100644 --- a/DKCR/Script/ShadowProjector.xml +++ b/DKCR/Script/ShadowProjector.xml @@ -32,7 +32,7 @@ 128 - + 0.0 diff --git a/DKCR/Script/SpecialFunction.xml b/DKCR/Script/SpecialFunction.xml index 37ea744..591c208 100644 --- a/DKCR/Script/SpecialFunction.xml +++ b/DKCR/Script/SpecialFunction.xml @@ -7,50 +7,50 @@ 0x98C5AED7 - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - + diff --git a/DKCR/Script/VolcanoBossBodyPart.xml b/DKCR/Script/VolcanoBossBodyPart.xml index 6429bc7..8aaae7b 100644 --- a/DKCR/Script/VolcanoBossBodyPart.xml +++ b/DKCR/Script/VolcanoBossBodyPart.xml @@ -27,7 +27,7 @@ - + 524322 diff --git a/DKCR/Structs/CableProperties.xml b/DKCR/Structs/CableProperties.xml index 199f89b..48489c8 100644 --- a/DKCR/Structs/CableProperties.xml +++ b/DKCR/Structs/CableProperties.xml @@ -74,8 +74,8 @@ 0x23363FD3 - - + + diff --git a/DKCR/Structs/CameraFieldOfView.xml b/DKCR/Structs/CameraFieldOfView.xml index 2c3b6d8..9829539 100644 --- a/DKCR/Structs/CameraFieldOfView.xml +++ b/DKCR/Structs/CameraFieldOfView.xml @@ -11,7 +11,7 @@ - + Always 0 diff --git a/DKCR/Structs/CameraInterpolation.xml b/DKCR/Structs/CameraInterpolation.xml index 20bddbe..1d3f70f 100644 --- a/DKCR/Structs/CameraInterpolation.xml +++ b/DKCR/Structs/CameraInterpolation.xml @@ -3,7 +3,7 @@ CameraInterpolation - + Always 3 @@ -16,7 +16,7 @@ - + Always 3 @@ -39,7 +39,7 @@ - + Always 3 diff --git a/DKCR/Structs/CameraOrientation.xml b/DKCR/Structs/CameraOrientation.xml index 2cf2573..4f29819 100644 --- a/DKCR/Structs/CameraOrientation.xml +++ b/DKCR/Structs/CameraOrientation.xml @@ -15,7 +15,7 @@ - + Always 8 diff --git a/DKCR/Structs/CameraShakerData.xml b/DKCR/Structs/CameraShakerData.xml index fcf2772..4639f4c 100644 --- a/DKCR/Structs/CameraShakerData.xml +++ b/DKCR/Structs/CameraShakerData.xml @@ -3,7 +3,7 @@ CameraShakerData - + Always 528 diff --git a/DKCR/Structs/ConditionalTest.xml b/DKCR/Structs/ConditionalTest.xml index 5694724..5e576b3 100644 --- a/DKCR/Structs/ConditionalTest.xml +++ b/DKCR/Structs/ConditionalTest.xml @@ -12,10 +12,13 @@ 0xB22FD89B - - 0 + + + + + - + 0 diff --git a/DKCR/Structs/ControlCommands.xml b/DKCR/Structs/ControlCommands.xml index aa18ac5..6db60a0 100644 --- a/DKCR/Structs/ControlCommands.xml +++ b/DKCR/Structs/ControlCommands.xml @@ -10,7 +10,7 @@ - + @@ -20,23 +20,23 @@ - + - - + + - + - + diff --git a/DKCR/Structs/DamageVulnerability.xml b/DKCR/Structs/DamageVulnerability.xml index 9925822..94a2f26 100644 --- a/DKCR/Structs/DamageVulnerability.xml +++ b/DKCR/Structs/DamageVulnerability.xml @@ -12,11 +12,11 @@ 0.0 - + Always 524288 - + Always 524288 diff --git a/DKCR/Structs/TweakControls_UnknownStruct3.xml b/DKCR/Structs/DebugControls.xml similarity index 99% rename from DKCR/Structs/TweakControls_UnknownStruct3.xml rename to DKCR/Structs/DebugControls.xml index 5db3c19..f0a628d 100644 --- a/DKCR/Structs/TweakControls_UnknownStruct3.xml +++ b/DKCR/Structs/DebugControls.xml @@ -1,7 +1,7 @@ - TweakControls_UnknownStruct3 + DebugControls diff --git a/DKCR/Structs/ForestBossStructC.xml b/DKCR/Structs/ForestBossStructC.xml index 816a9eb..f60ec41 100644 --- a/DKCR/Structs/ForestBossStructC.xml +++ b/DKCR/Structs/ForestBossStructC.xml @@ -38,7 +38,7 @@ - + 524322 diff --git a/DKCR/Structs/LightParameters.xml b/DKCR/Structs/LightParameters.xml index 1950c4c..88c3797 100644 --- a/DKCR/Structs/LightParameters.xml +++ b/DKCR/Structs/LightParameters.xml @@ -10,7 +10,7 @@ 1.0 - + 0x1 @@ -22,7 +22,7 @@ true - + 1 diff --git a/DKCR/Structs/NonSlowdown.xml b/DKCR/Structs/NonSlowdown.xml index 23b749d..7e90470 100644 --- a/DKCR/Structs/NonSlowdown.xml +++ b/DKCR/Structs/NonSlowdown.xml @@ -3,7 +3,7 @@ NonSlowdown - + 0x8C1B1D20 diff --git a/DKCR/Structs/PathPosition.xml b/DKCR/Structs/PathPosition.xml index 7045154..e7a601c 100644 --- a/DKCR/Structs/PathPosition.xml +++ b/DKCR/Structs/PathPosition.xml @@ -3,7 +3,7 @@ PathPosition - + Always 0 diff --git a/DKCR/Structs/AreaPathStructA.xml b/DKCR/Structs/PathType.xml similarity index 95% rename from DKCR/Structs/AreaPathStructA.xml rename to DKCR/Structs/PathType.xml index de45ca9..626a62e 100644 --- a/DKCR/Structs/AreaPathStructA.xml +++ b/DKCR/Structs/PathType.xml @@ -1,7 +1,7 @@ - AreaPathStructA + PathType 0xB9B7640F diff --git a/DKCR/Structs/PlatformMotionProperties.xml b/DKCR/Structs/PlatformMotionProperties.xml index 4792745..b9f63d1 100644 --- a/DKCR/Structs/PlatformMotionProperties.xml +++ b/DKCR/Structs/PlatformMotionProperties.xml @@ -14,7 +14,7 @@ 0.0 - + Always 262432 diff --git a/DKCR/Structs/RevolutionControl.xml b/DKCR/Structs/RevolutionControl.xml index 30cf595..d89b6d8 100644 --- a/DKCR/Structs/RevolutionControl.xml +++ b/DKCR/Structs/RevolutionControl.xml @@ -32,7 +32,7 @@ 0xB2AA1FD4 - + 0x9AD4E0BC diff --git a/DKCR/Structs/RevolutionControl_UnknownStruct1.xml b/DKCR/Structs/RevolutionControl_UnknownStruct1.xml index ece57b8..b6dbb0a 100644 --- a/DKCR/Structs/RevolutionControl_UnknownStruct1.xml +++ b/DKCR/Structs/RevolutionControl_UnknownStruct1.xml @@ -3,7 +3,7 @@ RevolutionControl_UnknownStruct1 - + 0x44D3E4FB diff --git a/DKCR/Structs/UnknownStruct510.xml b/DKCR/Structs/ShadowProjection.xml similarity index 95% rename from DKCR/Structs/UnknownStruct510.xml rename to DKCR/Structs/ShadowProjection.xml index 47bf65f..e1a3a8a 100644 --- a/DKCR/Structs/UnknownStruct510.xml +++ b/DKCR/Structs/ShadowProjection.xml @@ -1,7 +1,7 @@ - UnknownStruct510 + ShadowProjection 0x845C872E diff --git a/DKCR/Structs/SpindleOrientation.xml b/DKCR/Structs/SpindleOrientation.xml index f9e86ec..5f47b17 100644 --- a/DKCR/Structs/SpindleOrientation.xml +++ b/DKCR/Structs/SpindleOrientation.xml @@ -3,7 +3,7 @@ SpindleOrientation - + Always 786432 diff --git a/DKCR/Structs/SurfaceOrientation.xml b/DKCR/Structs/SurfaceOrientation.xml index 1337011..4c7e5b6 100644 --- a/DKCR/Structs/SurfaceOrientation.xml +++ b/DKCR/Structs/SurfaceOrientation.xml @@ -3,7 +3,7 @@ SurfaceOrientation - + Always 256 diff --git a/DKCR/Structs/SurfacePosition.xml b/DKCR/Structs/SurfacePosition.xml index 8e3ee52..bc815fd 100644 --- a/DKCR/Structs/SurfacePosition.xml +++ b/DKCR/Structs/SurfacePosition.xml @@ -3,7 +3,7 @@ SurfacePosition - + Always 1 diff --git a/DKCR/Structs/TweakControls_UnknownStruct1.xml b/DKCR/Structs/TweakControls_UnknownStruct1.xml index 966fd79..665f756 100644 --- a/DKCR/Structs/TweakControls_UnknownStruct1.xml +++ b/DKCR/Structs/TweakControls_UnknownStruct1.xml @@ -6,7 +6,7 @@ - + diff --git a/MP2/Game.xml b/MP2/Game.xml index 32e3e50..45cc146 100644 --- a/MP2/Game.xml +++ b/MP2/Game.xml @@ -848,21 +848,49 @@ - CameraHintStructA - + CameraBehaviour + - CameraHintStructB - + CameraDistance + + + + CameraFOV + + + + CameraHintStructA + CameraHintStructC + + CameraOffset + + CameraShakerData + + CameraSpeed + + + + CameraZOffset + + + + Command + + + + CommandData + + ConditionalTest @@ -872,18 +900,10 @@ - ControlHintStruct - - - ControllerActionCommand - ControllerActionStruct - - - ControllerMapping @@ -939,25 +959,53 @@ EditorProperties + + EmperorIngStage1BeamAttackData + + EmperorIngStage1Data + + EmperorIngStage1MeleeData + + + + EmperorIngStage1ProjectileAttackData + + + + EmperorIngStage1TauntAttackData + + EmperorIngStage1TentacleData + + EmperorIngStage1WarpAttackData + + EmperorIngStage2TentacleData + + EmperorIngStage3Action + + + + EmperorIngStage3DarkBeamAttackData + + EmperorIngStage3Data - EmperorIngStage3StructA - + EmperorIngStage3PortalAttackData + EmperorIngStage3StructB @@ -987,6 +1035,10 @@ IngPossessionData + + IngSpaceJumpGuardianData + + IngSpaceJumpGuardianStruct @@ -1011,6 +1063,10 @@ LightParameters + + MinorIngIngSpot + + MysteryFlyerData @@ -1103,6 +1159,10 @@ SplineType + + SplitterCommandModuleData + + SplitterMainChassisData @@ -1232,8 +1292,8 @@ - TweakGui_DarkVisor - + TweakGui_DarkWorld + TweakGui_EchoVisor @@ -1279,6 +1339,10 @@ TweakPlayerGun_Arm_Position + + TweakPlayerGun_Beam_Combo + + TweakPlayerGun_Beam_Misc @@ -1299,10 +1363,6 @@ TweakPlayerGun_RicochetDamage_Factor - - TweakPlayerGun_UnknownStruct1 - - TweakPlayerGun_Weapons @@ -1419,34 +1479,6 @@ UnknownStruct17 - - UnknownStruct2 - - - - UnknownStruct20 - - - - UnknownStruct21 - - - - UnknownStruct22 - - - - UnknownStruct23 - - - - UnknownStruct24 - - - - UnknownStruct26 - - UnknownStruct28 @@ -1467,14 +1499,6 @@ UnknownStruct31 - - UnknownStruct32 - - - - UnknownStruct33 - - UnknownStruct34 @@ -1499,10 +1523,6 @@ UnknownStruct39 - - UnknownStruct4 - - UnknownStruct40 @@ -1515,26 +1535,6 @@ UnknownStruct42 - - UnknownStruct43 - - - - UnknownStruct5 - - - - UnknownStruct6 - - - - UnknownStruct7 - - - - UnknownStruct8 - - UnknownStruct9 diff --git a/MP2/Misc/TweakGui.xml b/MP2/Misc/TweakGui.xml index 7586ad3..3b26aee 100644 --- a/MP2/Misc/TweakGui.xml +++ b/MP2/Misc/TweakGui.xml @@ -6,7 +6,7 @@ - + diff --git a/MP2/Misc/TweakPlayerGun.xml b/MP2/Misc/TweakPlayerGun.xml index f1aa1a5..c228d41 100644 --- a/MP2/Misc/TweakPlayerGun.xml +++ b/MP2/Misc/TweakPlayerGun.xml @@ -9,7 +9,7 @@ - + diff --git a/MP2/Script/Blogg.xml b/MP2/Script/Blogg.xml index a7162ce..0cf43ca 100644 --- a/MP2/Script/Blogg.xml +++ b/MP2/Script/Blogg.xml @@ -112,8 +112,8 @@ 0.2 - - -1 + + 0 diff --git a/MP2/Script/CameraHint.xml b/MP2/Script/CameraHint.xml index 4bec47d..4136867 100644 --- a/MP2/Script/CameraHint.xml +++ b/MP2/Script/CameraHint.xml @@ -10,14 +10,14 @@ 0.0 - - + + 286 - - - - + + + + 1.0 @@ -25,11 +25,11 @@ 1.0 - + - - + + 2.0 diff --git a/MP2/Script/Coin.xml b/MP2/Script/Coin.xml index 3241d87..9945836 100644 --- a/MP2/Script/Coin.xml +++ b/MP2/Script/Coin.xml @@ -92,8 +92,8 @@ PART - - -1 + + 0 1 @@ -117,7 +117,7 @@ false - + 0 @@ -138,7 +138,7 @@ false - + 0 @@ -153,7 +153,7 @@ 1.0 - + 0 diff --git a/MP2/Script/ControlHint.xml b/MP2/Script/ControlHint.xml index 5fb30fc..65ee513 100644 --- a/MP2/Script/ControlHint.xml +++ b/MP2/Script/ControlHint.xml @@ -38,14 +38,14 @@ - - - - - - - - + + + + + + + + diff --git a/MP2/Script/ControllerAction.xml b/MP2/Script/ControllerAction.xml index 0d7c70f..19a006d 100644 --- a/MP2/Script/ControllerAction.xml +++ b/MP2/Script/ControllerAction.xml @@ -4,7 +4,7 @@ ControllerAction - + false diff --git a/MP2/Script/FishCloud.xml b/MP2/Script/FishCloud.xml index ec4818e..985d4ab 100644 --- a/MP2/Script/FishCloud.xml +++ b/MP2/Script/FishCloud.xml @@ -96,11 +96,19 @@ 0 - + + + PART + + 0 - + + + PART + + 0 diff --git a/MP2/Script/HUDMemo.xml b/MP2/Script/HUDMemo.xml index dd993cc..0154a95 100644 --- a/MP2/Script/HUDMemo.xml +++ b/MP2/Script/HUDMemo.xml @@ -28,11 +28,11 @@ false - + 0 - - + + diff --git a/MP2/Script/Ing.xml b/MP2/Script/Ing.xml index 3476572..71aeb37 100644 --- a/MP2/Script/Ing.xml +++ b/MP2/Script/Ing.xml @@ -29,7 +29,7 @@ - + 0 diff --git a/MP2/Script/IngSpaceJumpGuardian.xml b/MP2/Script/IngSpaceJumpGuardian.xml index 2d1e231..c1406a9 100644 --- a/MP2/Script/IngSpaceJumpGuardian.xml +++ b/MP2/Script/IngSpaceJumpGuardian.xml @@ -30,7 +30,7 @@ - + diff --git a/MP2/Script/Krocuss.xml b/MP2/Script/Krocuss.xml index c345b8d..b1fac07 100644 --- a/MP2/Script/Krocuss.xml +++ b/MP2/Script/Krocuss.xml @@ -8,7 +8,7 @@ Krocuss - + 0 diff --git a/MP2/Script/MetroidAlpha.xml b/MP2/Script/MetroidAlpha.xml index 05c063d..cf1bf95 100644 --- a/MP2/Script/MetroidAlpha.xml +++ b/MP2/Script/MetroidAlpha.xml @@ -91,7 +91,7 @@ 0.5 - + 0 diff --git a/MP2/Script/MinorIng.xml b/MP2/Script/MinorIng.xml index b8f5f61..934e0e2 100644 --- a/MP2/Script/MinorIng.xml +++ b/MP2/Script/MinorIng.xml @@ -82,7 +82,7 @@ false - + diff --git a/MP2/Script/OctapedeSegment.xml b/MP2/Script/OctapedeSegment.xml index 8cc6473..4ce44bf 100644 --- a/MP2/Script/OctapedeSegment.xml +++ b/MP2/Script/OctapedeSegment.xml @@ -8,7 +8,7 @@ OctapedeSegment - + 0 diff --git a/MP2/Script/Parasite.xml b/MP2/Script/Parasite.xml index 6ec59da..2926e89 100644 --- a/MP2/Script/Parasite.xml +++ b/MP2/Script/Parasite.xml @@ -8,7 +8,7 @@ Parasite - + 0 diff --git a/MP2/Script/PlayerStateChange.xml b/MP2/Script/PlayerStateChange.xml index 82b06d1..7fb818c 100644 --- a/MP2/Script/PlayerStateChange.xml +++ b/MP2/Script/PlayerStateChange.xml @@ -13,7 +13,7 @@ 1 - + 0 diff --git a/MP2/Script/PlayerTurret.xml b/MP2/Script/PlayerTurret.xml index 5cafdb2..0f76c8a 100644 --- a/MP2/Script/PlayerTurret.xml +++ b/MP2/Script/PlayerTurret.xml @@ -7,7 +7,7 @@ PlayerTurret - + 1 diff --git a/MP2/Script/PuddleSpore.xml b/MP2/Script/PuddleSpore.xml index 3ce07eb..eb1fcf8 100644 --- a/MP2/Script/PuddleSpore.xml +++ b/MP2/Script/PuddleSpore.xml @@ -7,7 +7,7 @@ PuddleSpore - + 0 diff --git a/MP2/Script/Repulsor.xml b/MP2/Script/Repulsor.xml index 61f804b..bad4339 100644 --- a/MP2/Script/Repulsor.xml +++ b/MP2/Script/Repulsor.xml @@ -13,7 +13,7 @@ -1.0 - + 0 diff --git a/MP2/Script/Ripper.xml b/MP2/Script/Ripper.xml index c091399..c74b8f4 100644 --- a/MP2/Script/Ripper.xml +++ b/MP2/Script/Ripper.xml @@ -7,7 +7,7 @@ Ripper - + 0 diff --git a/MP2/Script/SpindleCamera.xml b/MP2/Script/SpindleCamera.xml index 8e8bb40..d86b8f8 100644 --- a/MP2/Script/SpindleCamera.xml +++ b/MP2/Script/SpindleCamera.xml @@ -4,7 +4,7 @@ SpindleCamera - + 6400 diff --git a/MP2/Script/SplitterCommandModule.xml b/MP2/Script/SplitterCommandModule.xml index e6b4769..6b7d4d8 100644 --- a/MP2/Script/SplitterCommandModule.xml +++ b/MP2/Script/SplitterCommandModule.xml @@ -31,7 +31,7 @@ - + diff --git a/MP2/Script/SurfaceCamera.xml b/MP2/Script/SurfaceCamera.xml index 51be47b..4bf982f 100644 --- a/MP2/Script/SurfaceCamera.xml +++ b/MP2/Script/SurfaceCamera.xml @@ -4,7 +4,7 @@ SurfaceCamera - + 2 diff --git a/MP2/Structs/UnknownStruct4.xml b/MP2/Structs/CameraBehaviour.xml similarity index 90% rename from MP2/Structs/UnknownStruct4.xml rename to MP2/Structs/CameraBehaviour.xml index 028656c..2d4fb90 100644 --- a/MP2/Structs/UnknownStruct4.xml +++ b/MP2/Structs/CameraBehaviour.xml @@ -1,7 +1,7 @@ - UnknownStruct4 + CameraBehaviour 0 diff --git a/MP2/Structs/CameraHintStructB.xml b/MP2/Structs/CameraDistance.xml similarity index 92% rename from MP2/Structs/CameraHintStructB.xml rename to MP2/Structs/CameraDistance.xml index eb7106d..d70159f 100644 --- a/MP2/Structs/CameraHintStructB.xml +++ b/MP2/Structs/CameraDistance.xml @@ -1,7 +1,7 @@ - CameraHintStructB + CameraDistance false diff --git a/MP2/Structs/UnknownStruct6.xml b/MP2/Structs/CameraFOV.xml similarity index 92% rename from MP2/Structs/UnknownStruct6.xml rename to MP2/Structs/CameraFOV.xml index 73da581..f3ccc3d 100644 --- a/MP2/Structs/UnknownStruct6.xml +++ b/MP2/Structs/CameraFOV.xml @@ -1,7 +1,7 @@ - UnknownStruct6 + CameraFOV false diff --git a/MP2/Structs/UnknownStruct5.xml b/MP2/Structs/CameraOffset.xml similarity index 94% rename from MP2/Structs/UnknownStruct5.xml rename to MP2/Structs/CameraOffset.xml index 7a6e361..e4ce079 100644 --- a/MP2/Structs/UnknownStruct5.xml +++ b/MP2/Structs/CameraOffset.xml @@ -1,7 +1,7 @@ - UnknownStruct5 + CameraOffset false diff --git a/MP2/Structs/UnknownStruct7.xml b/MP2/Structs/CameraSpeed.xml similarity index 92% rename from MP2/Structs/UnknownStruct7.xml rename to MP2/Structs/CameraSpeed.xml index 8c0105b..9fa1522 100644 --- a/MP2/Structs/UnknownStruct7.xml +++ b/MP2/Structs/CameraSpeed.xml @@ -1,7 +1,7 @@ - UnknownStruct7 + CameraSpeed false diff --git a/MP2/Structs/UnknownStruct8.xml b/MP2/Structs/CameraZOffset.xml similarity index 92% rename from MP2/Structs/UnknownStruct8.xml rename to MP2/Structs/CameraZOffset.xml index a9ff5c3..6098da3 100644 --- a/MP2/Structs/UnknownStruct8.xml +++ b/MP2/Structs/CameraZOffset.xml @@ -1,7 +1,7 @@ - UnknownStruct8 + CameraZOffset false diff --git a/MP2/Structs/ControllerActionStruct.xml b/MP2/Structs/Command.xml similarity index 89% rename from MP2/Structs/ControllerActionStruct.xml rename to MP2/Structs/Command.xml index a539589..1ae09f9 100644 --- a/MP2/Structs/ControllerActionStruct.xml +++ b/MP2/Structs/Command.xml @@ -1,7 +1,7 @@ - ControllerActionStruct + Command 1 diff --git a/MP2/Structs/ControlHintStruct.xml b/MP2/Structs/CommandData.xml similarity index 91% rename from MP2/Structs/ControlHintStruct.xml rename to MP2/Structs/CommandData.xml index 0f4d812..ac75bca 100644 --- a/MP2/Structs/ControlHintStruct.xml +++ b/MP2/Structs/CommandData.xml @@ -1,9 +1,9 @@ - ControlHintStruct + CommandData - + 0 diff --git a/MP2/Structs/UnknownStruct24.xml b/MP2/Structs/EmperorIngStage1BeamAttackData.xml similarity index 97% rename from MP2/Structs/UnknownStruct24.xml rename to MP2/Structs/EmperorIngStage1BeamAttackData.xml index 6839311..9a4a382 100644 --- a/MP2/Structs/UnknownStruct24.xml +++ b/MP2/Structs/EmperorIngStage1BeamAttackData.xml @@ -1,7 +1,7 @@ - UnknownStruct24 + EmperorIngStage1BeamAttackData diff --git a/MP2/Structs/EmperorIngStage1Data.xml b/MP2/Structs/EmperorIngStage1Data.xml index 5eb24d9..25f056a 100644 --- a/MP2/Structs/EmperorIngStage1Data.xml +++ b/MP2/Structs/EmperorIngStage1Data.xml @@ -4,11 +4,11 @@ EmperorIngStage1Data - - - - - + + + + + 0.0 diff --git a/MP2/Structs/UnknownStruct20.xml b/MP2/Structs/EmperorIngStage1MeleeData.xml similarity index 86% rename from MP2/Structs/UnknownStruct20.xml rename to MP2/Structs/EmperorIngStage1MeleeData.xml index f593c12..16a3083 100644 --- a/MP2/Structs/UnknownStruct20.xml +++ b/MP2/Structs/EmperorIngStage1MeleeData.xml @@ -1,7 +1,7 @@ - UnknownStruct20 + EmperorIngStage1MeleeData diff --git a/MP2/Structs/UnknownStruct21.xml b/MP2/Structs/EmperorIngStage1ProjectileAttackData.xml similarity index 91% rename from MP2/Structs/UnknownStruct21.xml rename to MP2/Structs/EmperorIngStage1ProjectileAttackData.xml index eed5750..c3c9f2f 100644 --- a/MP2/Structs/UnknownStruct21.xml +++ b/MP2/Structs/EmperorIngStage1ProjectileAttackData.xml @@ -1,7 +1,7 @@ - UnknownStruct21 + EmperorIngStage1ProjectileAttackData diff --git a/MP2/Structs/UnknownStruct23.xml b/MP2/Structs/EmperorIngStage1TauntAttackData.xml similarity index 92% rename from MP2/Structs/UnknownStruct23.xml rename to MP2/Structs/EmperorIngStage1TauntAttackData.xml index 698c39a..dd4a1dc 100644 --- a/MP2/Structs/UnknownStruct23.xml +++ b/MP2/Structs/EmperorIngStage1TauntAttackData.xml @@ -1,7 +1,7 @@ - UnknownStruct23 + EmperorIngStage1TauntAttackData 0.0 diff --git a/MP2/Structs/UnknownStruct22.xml b/MP2/Structs/EmperorIngStage1WarpAttackData.xml similarity index 95% rename from MP2/Structs/UnknownStruct22.xml rename to MP2/Structs/EmperorIngStage1WarpAttackData.xml index bd12a92..a06b526 100644 --- a/MP2/Structs/UnknownStruct22.xml +++ b/MP2/Structs/EmperorIngStage1WarpAttackData.xml @@ -1,7 +1,7 @@ - UnknownStruct22 + EmperorIngStage1WarpAttackData diff --git a/MP2/Structs/UnknownStruct2.xml b/MP2/Structs/EmperorIngStage3Action.xml similarity index 93% rename from MP2/Structs/UnknownStruct2.xml rename to MP2/Structs/EmperorIngStage3Action.xml index 4cf0264..6f19b59 100644 --- a/MP2/Structs/UnknownStruct2.xml +++ b/MP2/Structs/EmperorIngStage3Action.xml @@ -1,7 +1,7 @@ - UnknownStruct2 + EmperorIngStage3Action false diff --git a/MP2/Structs/EmperorIngStage3StructA.xml b/MP2/Structs/EmperorIngStage3DarkBeamAttackData.xml similarity index 97% rename from MP2/Structs/EmperorIngStage3StructA.xml rename to MP2/Structs/EmperorIngStage3DarkBeamAttackData.xml index a7a4217..288755c 100644 --- a/MP2/Structs/EmperorIngStage3StructA.xml +++ b/MP2/Structs/EmperorIngStage3DarkBeamAttackData.xml @@ -1,7 +1,7 @@ - EmperorIngStage3StructA + EmperorIngStage3DarkBeamAttackData diff --git a/MP2/Structs/EmperorIngStage3Data.xml b/MP2/Structs/EmperorIngStage3Data.xml index c78ef3a..4187faa 100644 --- a/MP2/Structs/EmperorIngStage3Data.xml +++ b/MP2/Structs/EmperorIngStage3Data.xml @@ -21,8 +21,8 @@ - - + + PART @@ -31,7 +31,7 @@ - + 0 diff --git a/MP2/Structs/UnknownStruct26.xml b/MP2/Structs/EmperorIngStage3PortalAttackData.xml similarity index 98% rename from MP2/Structs/UnknownStruct26.xml rename to MP2/Structs/EmperorIngStage3PortalAttackData.xml index c8e7f29..f414a16 100644 --- a/MP2/Structs/UnknownStruct26.xml +++ b/MP2/Structs/EmperorIngStage3PortalAttackData.xml @@ -1,7 +1,7 @@ - UnknownStruct26 + EmperorIngStage3PortalAttackData diff --git a/MP2/Structs/EmperorIngStage3StructB.xml b/MP2/Structs/EmperorIngStage3StructB.xml index a3f0080..09e8a7b 100644 --- a/MP2/Structs/EmperorIngStage3StructB.xml +++ b/MP2/Structs/EmperorIngStage3StructB.xml @@ -12,14 +12,14 @@ 0.0 - - - - - - - - + + + + + + + + diff --git a/MP2/Structs/UnknownStruct32.xml b/MP2/Structs/IngSpaceJumpGuardianData.xml similarity index 98% rename from MP2/Structs/UnknownStruct32.xml rename to MP2/Structs/IngSpaceJumpGuardianData.xml index 799db69..afa1b3e 100644 --- a/MP2/Structs/UnknownStruct32.xml +++ b/MP2/Structs/IngSpaceJumpGuardianData.xml @@ -1,7 +1,7 @@ - UnknownStruct32 + IngSpaceJumpGuardianData diff --git a/MP2/Structs/UnknownStruct33.xml b/MP2/Structs/MinorIngIngSpot.xml similarity index 98% rename from MP2/Structs/UnknownStruct33.xml rename to MP2/Structs/MinorIngIngSpot.xml index 80f9595..e8adcf6 100644 --- a/MP2/Structs/UnknownStruct33.xml +++ b/MP2/Structs/MinorIngIngSpot.xml @@ -1,7 +1,7 @@ - UnknownStruct33 + MinorIngIngSpot diff --git a/MP2/Structs/PlatformMotionProperties.xml b/MP2/Structs/PlatformMotionProperties.xml index 09b424f..712a0f7 100644 --- a/MP2/Structs/PlatformMotionProperties.xml +++ b/MP2/Structs/PlatformMotionProperties.xml @@ -11,7 +11,7 @@ 0.0 - + 288 diff --git a/MP2/Structs/UnknownStruct43.xml b/MP2/Structs/SplitterCommandModuleData.xml similarity index 99% rename from MP2/Structs/UnknownStruct43.xml rename to MP2/Structs/SplitterCommandModuleData.xml index e0326a4..6dff4c3 100644 --- a/MP2/Structs/UnknownStruct43.xml +++ b/MP2/Structs/SplitterCommandModuleData.xml @@ -1,7 +1,7 @@ - UnknownStruct43 + SplitterCommandModuleData 10 diff --git a/MP2/Structs/TweakGui_DarkVisor.xml b/MP2/Structs/TweakGui_DarkWorld.xml similarity index 97% rename from MP2/Structs/TweakGui_DarkVisor.xml rename to MP2/Structs/TweakGui_DarkWorld.xml index 1d4e85c..184f079 100644 --- a/MP2/Structs/TweakGui_DarkVisor.xml +++ b/MP2/Structs/TweakGui_DarkWorld.xml @@ -1,7 +1,7 @@ - TweakGui_DarkVisor + TweakGui_DarkWorld diff --git a/MP2/Structs/TweakPlayerGun_UnknownStruct1.xml b/MP2/Structs/TweakPlayerGun_Beam_Combo.xml similarity index 98% rename from MP2/Structs/TweakPlayerGun_UnknownStruct1.xml rename to MP2/Structs/TweakPlayerGun_Beam_Combo.xml index 6b99d96..0fda9cf 100644 --- a/MP2/Structs/TweakPlayerGun_UnknownStruct1.xml +++ b/MP2/Structs/TweakPlayerGun_Beam_Combo.xml @@ -1,7 +1,7 @@ - TweakPlayerGun_UnknownStruct1 + TweakPlayerGun_Beam_Combo diff --git a/MP2Demo/Game.xml b/MP2Demo/Game.xml index b99b1d8..a0474a7 100644 --- a/MP2Demo/Game.xml +++ b/MP2Demo/Game.xml @@ -608,8 +608,16 @@ - CameraHintStructA - + CameraBehaviour + + + + CameraDistance + + + + CameraFOV + CameraHintStructA1 @@ -619,10 +627,22 @@ CameraHintStructB + + CameraOffset + + CameraShakerData + + CameraSpeed + + + + CameraZOffset + + ConditionalTest @@ -679,6 +699,22 @@ EditorProperties + + EmperorIngStage1Data + + + + EmperorIngStage1MeleeData + + + + EmperorIngStage1ProjectileAttackData + + + + EmperorIngStage1TentacleData + + FlareDef @@ -699,6 +735,10 @@ IngPossessionData + + IngSpaceJumpGuardianData + + LayerInfo @@ -711,6 +751,10 @@ LightParameters + + MinorIngIngSpot + + PatternedAITypedef @@ -775,6 +819,10 @@ SplineType + + SplitterCommandModuleData + + SplitterMainChassisData @@ -875,6 +923,10 @@ TweakGui_Credits + + TweakGui_DarkWorld + + TweakGui_EchoVisor @@ -899,10 +951,6 @@ TweakGui_ScannableObjectDownloadTimes - - TweakGui_UnknownStruct1 - - TweakGui_VisorColorSchemeTypedef @@ -919,6 +967,10 @@ TweakPlayerGun_Arm_Position + + TweakPlayerGun_Beam_Combo + + TweakPlayerGun_Beam_Misc @@ -939,10 +991,6 @@ TweakPlayerGun_RicochetDamage_Factor - - TweakPlayerGun_UnknownStruct1 - - TweakPlayerGun_Weapons @@ -1035,10 +1083,6 @@ UnknownStruct1 - - UnknownStruct10 - - UnknownStruct11 @@ -1047,34 +1091,10 @@ UnknownStruct12 - - UnknownStruct13 - - - - UnknownStruct14 - - - - UnknownStruct15 - - - - UnknownStruct16 - - UnknownStruct17 - - UnknownStruct18 - - - - UnknownStruct19 - - UnknownStruct2 @@ -1091,10 +1111,6 @@ UnknownStruct22 - - UnknownStruct23 - - UnknownStruct3 @@ -1107,22 +1123,6 @@ UnknownStruct5 - - UnknownStruct6 - - - - UnknownStruct7 - - - - UnknownStruct8 - - - - UnknownStruct9 - - Vector2f diff --git a/MP2Demo/Misc/TweakGui.xml b/MP2Demo/Misc/TweakGui.xml index 8d444ae..be3c7ff 100644 --- a/MP2Demo/Misc/TweakGui.xml +++ b/MP2Demo/Misc/TweakGui.xml @@ -6,9 +6,9 @@ - - - + + + diff --git a/MP2Demo/Misc/TweakPlayerGun.xml b/MP2Demo/Misc/TweakPlayerGun.xml index a47c907..f7a1174 100644 --- a/MP2Demo/Misc/TweakPlayerGun.xml +++ b/MP2Demo/Misc/TweakPlayerGun.xml @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + 19 diff --git a/MP2Demo/Script/ActorRotate.xml b/MP2Demo/Script/ActorRotate.xml index c502a65..a77fc9a 100644 --- a/MP2Demo/Script/ActorRotate.xml +++ b/MP2Demo/Script/ActorRotate.xml @@ -4,7 +4,7 @@ ActorRotate - + 20 diff --git a/MP2Demo/Script/AreaAttributes.xml b/MP2Demo/Script/AreaAttributes.xml index c3c1790..d67cc4d 100644 --- a/MP2Demo/Script/AreaAttributes.xml +++ b/MP2Demo/Script/AreaAttributes.xml @@ -14,7 +14,7 @@ Show the skybox. If no Skybox Model is specified, it will show the World's default skybox. false - + 0 @@ -28,7 +28,7 @@ CMDL - + 0 diff --git a/MP2Demo/Script/Blogg.xml b/MP2Demo/Script/Blogg.xml index 581559f..a2d7e3f 100644 --- a/MP2Demo/Script/Blogg.xml +++ b/MP2Demo/Script/Blogg.xml @@ -106,8 +106,8 @@ 5.0 - - -1 + + 0 diff --git a/MP2Demo/Script/Camera.xml b/MP2Demo/Script/Camera.xml index 883ef9a..9e60b9d 100644 --- a/MP2Demo/Script/Camera.xml +++ b/MP2Demo/Script/Camera.xml @@ -13,7 +13,7 @@ 10.0 - + 160 diff --git a/MP2Demo/Script/CameraFilterKeyframe.xml b/MP2Demo/Script/CameraFilterKeyframe.xml index 33161eb..bf3953f 100644 --- a/MP2Demo/Script/CameraFilterKeyframe.xml +++ b/MP2Demo/Script/CameraFilterKeyframe.xml @@ -7,7 +7,7 @@ 0 - + 0 diff --git a/MP2Demo/Script/CameraHint.xml b/MP2Demo/Script/CameraHint.xml index 5613838..7e4d362 100644 --- a/MP2Demo/Script/CameraHint.xml +++ b/MP2Demo/Script/CameraHint.xml @@ -7,14 +7,14 @@ 10 - - + + 318 - - - - + + + + 1.0 @@ -22,11 +22,11 @@ 1.0 - + - - + + 2.0 diff --git a/MP2Demo/Script/Coin.xml b/MP2Demo/Script/Coin.xml index bf0a3be..ce2ec4d 100644 --- a/MP2Demo/Script/Coin.xml +++ b/MP2Demo/Script/Coin.xml @@ -92,8 +92,8 @@ PART - - -1 + + 0 1 @@ -117,7 +117,7 @@ false - + 0 @@ -138,7 +138,7 @@ false - + 0 @@ -153,7 +153,7 @@ 1.0 - + 0 diff --git a/MP2Demo/Script/ControllerAction.xml b/MP2Demo/Script/ControllerAction.xml index ea0cbd8..337c778 100644 --- a/MP2Demo/Script/ControllerAction.xml +++ b/MP2Demo/Script/ControllerAction.xml @@ -4,7 +4,7 @@ ControllerAction - + 0 diff --git a/MP2Demo/Script/DebrisExtended.xml b/MP2Demo/Script/DebrisExtended.xml index f6f0648..0467844 100644 --- a/MP2Demo/Script/DebrisExtended.xml +++ b/MP2Demo/Script/DebrisExtended.xml @@ -114,7 +114,7 @@ false - + 0 @@ -135,7 +135,7 @@ false - + 0 @@ -150,7 +150,7 @@ 1.0 - + 0 diff --git a/MP2Demo/Script/EmperorIngStage1.xml b/MP2Demo/Script/EmperorIngStage1.xml index 1ff72a2..da6affe 100644 --- a/MP2Demo/Script/EmperorIngStage1.xml +++ b/MP2Demo/Script/EmperorIngStage1.xml @@ -15,7 +15,7 @@ - + diff --git a/MP2Demo/Script/FishCloud.xml b/MP2Demo/Script/FishCloud.xml index 5978863..2643e24 100644 --- a/MP2Demo/Script/FishCloud.xml +++ b/MP2Demo/Script/FishCloud.xml @@ -96,14 +96,18 @@ 0 - - -1 + + + PART + 0 - - -1 + + + PART + 0 diff --git a/MP2Demo/Script/Grenchler.xml b/MP2Demo/Script/Grenchler.xml index 1a08ce7..49c4cce 100644 --- a/MP2Demo/Script/Grenchler.xml +++ b/MP2Demo/Script/Grenchler.xml @@ -33,11 +33,15 @@ - - -1 + + + CMDL + - - -1 + + + CSKR + 10.0 @@ -115,8 +119,10 @@ 20.0 - - -1 + + + PART + @@ -128,14 +134,18 @@ - - -1 + + + PART + -1 - - -1 + + + PART + -1 @@ -144,8 +154,10 @@ -1 - - -1 + + + WPSC + 4 diff --git a/MP2Demo/Script/HUDMemo.xml b/MP2Demo/Script/HUDMemo.xml index dd72398..44254f7 100644 --- a/MP2Demo/Script/HUDMemo.xml +++ b/MP2Demo/Script/HUDMemo.xml @@ -25,7 +25,7 @@ false - + 0 diff --git a/MP2Demo/Script/Ing.xml b/MP2Demo/Script/Ing.xml index a2c158b..23a9fc6 100644 --- a/MP2Demo/Script/Ing.xml +++ b/MP2Demo/Script/Ing.xml @@ -29,7 +29,7 @@ - + 0 diff --git a/MP2Demo/Script/IngSpaceJumpGuardian.xml b/MP2Demo/Script/IngSpaceJumpGuardian.xml index 8f6d701..a69e88f 100644 --- a/MP2Demo/Script/IngSpaceJumpGuardian.xml +++ b/MP2Demo/Script/IngSpaceJumpGuardian.xml @@ -30,7 +30,7 @@ - + diff --git a/MP2Demo/Script/Kralee.xml b/MP2Demo/Script/Kralee.xml index 44331a2..23fad16 100644 --- a/MP2Demo/Script/Kralee.xml +++ b/MP2Demo/Script/Kralee.xml @@ -8,7 +8,7 @@ Kralee - + 0 @@ -135,7 +135,7 @@ 0 - + -1 diff --git a/MP2Demo/Script/Krocuss.xml b/MP2Demo/Script/Krocuss.xml index 71ff194..f32627b 100644 --- a/MP2Demo/Script/Krocuss.xml +++ b/MP2Demo/Script/Krocuss.xml @@ -8,7 +8,7 @@ Krocuss - + 0 diff --git a/MP2Demo/Script/MetroidAlpha.xml b/MP2Demo/Script/MetroidAlpha.xml index 45e164b..4a310b1 100644 --- a/MP2Demo/Script/MetroidAlpha.xml +++ b/MP2Demo/Script/MetroidAlpha.xml @@ -35,7 +35,7 @@ 100.0 - + 0 diff --git a/MP2Demo/Script/MinorIng.xml b/MP2Demo/Script/MinorIng.xml index 471b7c1..cb0145b 100644 --- a/MP2Demo/Script/MinorIng.xml +++ b/MP2Demo/Script/MinorIng.xml @@ -61,7 +61,7 @@ false - + diff --git a/MP2Demo/Script/OctapedeSegment.xml b/MP2Demo/Script/OctapedeSegment.xml index 3a19c93..010b32f 100644 --- a/MP2Demo/Script/OctapedeSegment.xml +++ b/MP2Demo/Script/OctapedeSegment.xml @@ -8,7 +8,7 @@ OctapedeSegment - + 0 diff --git a/MP2Demo/Script/Parasite.xml b/MP2Demo/Script/Parasite.xml index d7e3d04..7dc11ec 100644 --- a/MP2Demo/Script/Parasite.xml +++ b/MP2Demo/Script/Parasite.xml @@ -8,7 +8,7 @@ Parasite - + 0 diff --git a/MP2Demo/Script/PathCamera.xml b/MP2Demo/Script/PathCamera.xml index 8c10fd8..0e2bc69 100644 --- a/MP2Demo/Script/PathCamera.xml +++ b/MP2Demo/Script/PathCamera.xml @@ -4,7 +4,7 @@ PathCamera - + 32 diff --git a/MP2Demo/Script/PickupGenerator.xml b/MP2Demo/Script/PickupGenerator.xml index 29291a5..0dcf166 100644 --- a/MP2Demo/Script/PickupGenerator.xml +++ b/MP2Demo/Script/PickupGenerator.xml @@ -15,8 +15,10 @@ Never 0.0 - - -1 + + + RULE + diff --git a/MP2Demo/Script/PlayerActor.xml b/MP2Demo/Script/PlayerActor.xml index f932514..336d74c 100644 --- a/MP2Demo/Script/PlayerActor.xml +++ b/MP2Demo/Script/PlayerActor.xml @@ -41,7 +41,7 @@ true - + 4 diff --git a/MP2Demo/Script/PlayerHint.xml b/MP2Demo/Script/PlayerHint.xml index 89cab47..2524ad7 100644 --- a/MP2Demo/Script/PlayerHint.xml +++ b/MP2Demo/Script/PlayerHint.xml @@ -4,7 +4,7 @@ PlayerHint - + 1 diff --git a/MP2Demo/Script/PlayerStateChange.xml b/MP2Demo/Script/PlayerStateChange.xml index 0bf9112..d6a667e 100644 --- a/MP2Demo/Script/PlayerStateChange.xml +++ b/MP2Demo/Script/PlayerStateChange.xml @@ -13,7 +13,7 @@ 1 - + 0 diff --git a/MP2Demo/Script/PlayerTurret.xml b/MP2Demo/Script/PlayerTurret.xml index 4e029b4..4832bac 100644 --- a/MP2Demo/Script/PlayerTurret.xml +++ b/MP2Demo/Script/PlayerTurret.xml @@ -7,7 +7,7 @@ PlayerTurret - + 1 diff --git a/MP2Demo/Script/Ripper.xml b/MP2Demo/Script/Ripper.xml index 0391037..1e7e3f5 100644 --- a/MP2Demo/Script/Ripper.xml +++ b/MP2Demo/Script/Ripper.xml @@ -7,7 +7,7 @@ Ripper - + 0 diff --git a/MP2Demo/Script/SandBoss.xml b/MP2Demo/Script/SandBoss.xml index e3a7a9d..114b1b5 100644 --- a/MP2Demo/Script/SandBoss.xml +++ b/MP2Demo/Script/SandBoss.xml @@ -128,8 +128,10 @@ 4.0 - - -1 + + + WPSC + diff --git a/MP2Demo/Script/SpecialFunction.xml b/MP2Demo/Script/SpecialFunction.xml index 81fdd78..87e97fd 100644 --- a/MP2Demo/Script/SpecialFunction.xml +++ b/MP2Demo/Script/SpecialFunction.xml @@ -10,7 +10,7 @@ - + 0 diff --git a/MP2Demo/Script/SpindleCamera.xml b/MP2Demo/Script/SpindleCamera.xml index 245a890..94a7c4a 100644 --- a/MP2Demo/Script/SpindleCamera.xml +++ b/MP2Demo/Script/SpindleCamera.xml @@ -4,7 +4,7 @@ SpindleCamera - + 6400 diff --git a/MP2Demo/Script/Splinter.xml b/MP2Demo/Script/Splinter.xml index c48d74a..aca8889 100644 --- a/MP2Demo/Script/Splinter.xml +++ b/MP2Demo/Script/Splinter.xml @@ -72,8 +72,8 @@ - - -1 + + 0 diff --git a/MP2Demo/Script/SplitterCommandModule.xml b/MP2Demo/Script/SplitterCommandModule.xml index 9504079..e0150d7 100644 --- a/MP2Demo/Script/SplitterCommandModule.xml +++ b/MP2Demo/Script/SplitterCommandModule.xml @@ -31,7 +31,7 @@ - + diff --git a/MP2Demo/Script/StreamedAudio.xml b/MP2Demo/Script/StreamedAudio.xml index 4e425ce..5f2b8cb 100644 --- a/MP2Demo/Script/StreamedAudio.xml +++ b/MP2Demo/Script/StreamedAudio.xml @@ -17,7 +17,7 @@ 127 - + 0 diff --git a/MP2Demo/Script/SurfaceCamera.xml b/MP2Demo/Script/SurfaceCamera.xml index 2cba635..4f533cc 100644 --- a/MP2Demo/Script/SurfaceCamera.xml +++ b/MP2Demo/Script/SurfaceCamera.xml @@ -4,7 +4,7 @@ SurfaceCamera - + 2 diff --git a/MP2Demo/Script/WallCrawlerSwarm.xml b/MP2Demo/Script/WallCrawlerSwarm.xml index c934bd3..849457b 100644 --- a/MP2Demo/Script/WallCrawlerSwarm.xml +++ b/MP2Demo/Script/WallCrawlerSwarm.xml @@ -31,11 +31,15 @@ PART - - -1 + + + PART + - - -1 + + + PART + diff --git a/MP2Demo/Script/WallWalker.xml b/MP2Demo/Script/WallWalker.xml index cf7d74b..073d79c 100644 --- a/MP2Demo/Script/WallWalker.xml +++ b/MP2Demo/Script/WallWalker.xml @@ -54,11 +54,11 @@ 5 - - -1 + + 0 - - -1 + + 0 2.0 diff --git a/MP2Demo/Script/Water.xml b/MP2Demo/Script/Water.xml index 7626836..1a16893 100644 --- a/MP2Demo/Script/Water.xml +++ b/MP2Demo/Script/Water.xml @@ -53,11 +53,15 @@ TXTR - - -1 + + + TXTR + - - -1 + + + TXTR + @@ -134,7 +138,7 @@ 0 - + -1 diff --git a/MP2Demo/Structs/UnknownStruct6.xml b/MP2Demo/Structs/CameraBehaviour.xml similarity index 90% rename from MP2Demo/Structs/UnknownStruct6.xml rename to MP2Demo/Structs/CameraBehaviour.xml index 0207a80..3f49e13 100644 --- a/MP2Demo/Structs/UnknownStruct6.xml +++ b/MP2Demo/Structs/CameraBehaviour.xml @@ -1,7 +1,7 @@ - UnknownStruct6 + CameraBehaviour 0 diff --git a/MP2Demo/Structs/CameraHintStructA.xml b/MP2Demo/Structs/CameraDistance.xml similarity index 92% rename from MP2Demo/Structs/CameraHintStructA.xml rename to MP2Demo/Structs/CameraDistance.xml index 7b2a15b..1926a90 100644 --- a/MP2Demo/Structs/CameraHintStructA.xml +++ b/MP2Demo/Structs/CameraDistance.xml @@ -1,7 +1,7 @@ - CameraHintStructA + CameraDistance false diff --git a/MP2Demo/Structs/UnknownStruct8.xml b/MP2Demo/Structs/CameraFOV.xml similarity index 92% rename from MP2Demo/Structs/UnknownStruct8.xml rename to MP2Demo/Structs/CameraFOV.xml index 6611dbc..412977e 100644 --- a/MP2Demo/Structs/UnknownStruct8.xml +++ b/MP2Demo/Structs/CameraFOV.xml @@ -1,7 +1,7 @@ - UnknownStruct8 + CameraFOV false diff --git a/MP2Demo/Structs/UnknownStruct7.xml b/MP2Demo/Structs/CameraOffset.xml similarity index 94% rename from MP2Demo/Structs/UnknownStruct7.xml rename to MP2Demo/Structs/CameraOffset.xml index fea0385..249411e 100644 --- a/MP2Demo/Structs/UnknownStruct7.xml +++ b/MP2Demo/Structs/CameraOffset.xml @@ -1,7 +1,7 @@ - UnknownStruct7 + CameraOffset false diff --git a/MP2Demo/Structs/CameraShakerData.xml b/MP2Demo/Structs/CameraShakerData.xml index 1bfc126..c295c2c 100644 --- a/MP2Demo/Structs/CameraShakerData.xml +++ b/MP2Demo/Structs/CameraShakerData.xml @@ -3,7 +3,7 @@ CameraShakerData - + 16 diff --git a/MP2Demo/Structs/UnknownStruct9.xml b/MP2Demo/Structs/CameraSpeed.xml similarity index 92% rename from MP2Demo/Structs/UnknownStruct9.xml rename to MP2Demo/Structs/CameraSpeed.xml index 034d3ff..c0dd74d 100644 --- a/MP2Demo/Structs/UnknownStruct9.xml +++ b/MP2Demo/Structs/CameraSpeed.xml @@ -1,7 +1,7 @@ - UnknownStruct9 + CameraSpeed false diff --git a/MP2Demo/Structs/UnknownStruct10.xml b/MP2Demo/Structs/CameraZOffset.xml similarity index 92% rename from MP2Demo/Structs/UnknownStruct10.xml rename to MP2Demo/Structs/CameraZOffset.xml index 5d7936c..a15bb93 100644 --- a/MP2Demo/Structs/UnknownStruct10.xml +++ b/MP2Demo/Structs/CameraZOffset.xml @@ -1,7 +1,7 @@ - UnknownStruct10 + CameraZOffset false diff --git a/MP2Demo/Structs/ConditionalTest.xml b/MP2Demo/Structs/ConditionalTest.xml index 85d3b4f..b5df003 100644 --- a/MP2Demo/Structs/ConditionalTest.xml +++ b/MP2Demo/Structs/ConditionalTest.xml @@ -9,10 +9,13 @@ 0 - - 0 + + + + + - + 0 diff --git a/MP2Demo/Structs/DigitalGuardianData.xml b/MP2Demo/Structs/DigitalGuardianData.xml index 9332b04..bd6bcd2 100644 --- a/MP2Demo/Structs/DigitalGuardianData.xml +++ b/MP2Demo/Structs/DigitalGuardianData.xml @@ -57,17 +57,23 @@ - - -1 + + + CMDL + 100.0 - - -1 + + + CMDL + - - -1 + + + PART + 2.0 diff --git a/MP2Demo/Structs/UnknownStruct16.xml b/MP2Demo/Structs/EmperorIngStage1Data.xml similarity index 58% rename from MP2Demo/Structs/UnknownStruct16.xml rename to MP2Demo/Structs/EmperorIngStage1Data.xml index b0bd9ed..c30bdee 100644 --- a/MP2Demo/Structs/UnknownStruct16.xml +++ b/MP2Demo/Structs/EmperorIngStage1Data.xml @@ -1,11 +1,11 @@ - UnknownStruct16 + EmperorIngStage1Data - - - + + + 0.0 diff --git a/MP2Demo/Structs/UnknownStruct14.xml b/MP2Demo/Structs/EmperorIngStage1MeleeData.xml similarity index 86% rename from MP2Demo/Structs/UnknownStruct14.xml rename to MP2Demo/Structs/EmperorIngStage1MeleeData.xml index 1f5965b..a6e06b5 100644 --- a/MP2Demo/Structs/UnknownStruct14.xml +++ b/MP2Demo/Structs/EmperorIngStage1MeleeData.xml @@ -1,7 +1,7 @@ - UnknownStruct14 + EmperorIngStage1MeleeData diff --git a/MP2Demo/Structs/UnknownStruct15.xml b/MP2Demo/Structs/EmperorIngStage1ProjectileAttackData.xml similarity index 89% rename from MP2Demo/Structs/UnknownStruct15.xml rename to MP2Demo/Structs/EmperorIngStage1ProjectileAttackData.xml index 25005c6..32acb93 100644 --- a/MP2Demo/Structs/UnknownStruct15.xml +++ b/MP2Demo/Structs/EmperorIngStage1ProjectileAttackData.xml @@ -1,7 +1,7 @@ - UnknownStruct15 + EmperorIngStage1ProjectileAttackData diff --git a/MP2Demo/Structs/UnknownStruct13.xml b/MP2Demo/Structs/EmperorIngStage1TentacleData.xml similarity index 93% rename from MP2Demo/Structs/UnknownStruct13.xml rename to MP2Demo/Structs/EmperorIngStage1TentacleData.xml index e489784..3aed971 100644 --- a/MP2Demo/Structs/UnknownStruct13.xml +++ b/MP2Demo/Structs/EmperorIngStage1TentacleData.xml @@ -1,7 +1,7 @@ - UnknownStruct13 + EmperorIngStage1TentacleData diff --git a/MP2Demo/Structs/IngPossessionData.xml b/MP2Demo/Structs/IngPossessionData.xml index fb591f0..4c38e54 100644 --- a/MP2Demo/Structs/IngPossessionData.xml +++ b/MP2Demo/Structs/IngPossessionData.xml @@ -6,11 +6,15 @@ false - - -1 + + + CMDL + - - -1 + + + CSKR + diff --git a/MP2Demo/Structs/UnknownStruct18.xml b/MP2Demo/Structs/IngSpaceJumpGuardianData.xml similarity index 98% rename from MP2Demo/Structs/UnknownStruct18.xml rename to MP2Demo/Structs/IngSpaceJumpGuardianData.xml index 4adad53..a67f6aa 100644 --- a/MP2Demo/Structs/UnknownStruct18.xml +++ b/MP2Demo/Structs/IngSpaceJumpGuardianData.xml @@ -1,7 +1,7 @@ - UnknownStruct18 + IngSpaceJumpGuardianData 10.0 diff --git a/MP2Demo/Structs/LightParameters.xml b/MP2Demo/Structs/LightParameters.xml index f591c76..c5901db 100644 --- a/MP2Demo/Structs/LightParameters.xml +++ b/MP2Demo/Structs/LightParameters.xml @@ -37,7 +37,7 @@ - + 1 diff --git a/MP2Demo/Structs/UnknownStruct19.xml b/MP2Demo/Structs/MinorIngIngSpot.xml similarity index 98% rename from MP2Demo/Structs/UnknownStruct19.xml rename to MP2Demo/Structs/MinorIngIngSpot.xml index d8b1c44..3a24dc0 100644 --- a/MP2Demo/Structs/UnknownStruct19.xml +++ b/MP2Demo/Structs/MinorIngIngSpot.xml @@ -1,7 +1,7 @@ - UnknownStruct19 + MinorIngIngSpot diff --git a/MP2Demo/Structs/PatternedAITypedef.xml b/MP2Demo/Structs/PatternedAITypedef.xml index acef95c..2ec2eac 100644 --- a/MP2Demo/Structs/PatternedAITypedef.xml +++ b/MP2Demo/Structs/PatternedAITypedef.xml @@ -79,8 +79,8 @@ 0.0 - - -1 + + 0 @@ -130,8 +130,8 @@ PART - - -1 + + 0 diff --git a/MP2Demo/Structs/PlatformMotionProperties.xml b/MP2Demo/Structs/PlatformMotionProperties.xml index 971fe64..cbf011b 100644 --- a/MP2Demo/Structs/PlatformMotionProperties.xml +++ b/MP2Demo/Structs/PlatformMotionProperties.xml @@ -11,7 +11,7 @@ 0.0 - + 288 diff --git a/MP2Demo/Structs/ShockWaveInfo.xml b/MP2Demo/Structs/ShockWaveInfo.xml index 9888d3b..7533515 100644 --- a/MP2Demo/Structs/ShockWaveInfo.xml +++ b/MP2Demo/Structs/ShockWaveInfo.xml @@ -29,7 +29,7 @@ ELSC - + -1 diff --git a/MP2Demo/Structs/SpawnPointStruct.xml b/MP2Demo/Structs/SpawnPointStruct.xml index 7c86f46..f623cfa 100644 --- a/MP2Demo/Structs/SpawnPointStruct.xml +++ b/MP2Demo/Structs/SpawnPointStruct.xml @@ -69,7 +69,7 @@ 1 - + 1 diff --git a/MP2Demo/Structs/UnknownStruct23.xml b/MP2Demo/Structs/SplitterCommandModuleData.xml similarity index 99% rename from MP2Demo/Structs/UnknownStruct23.xml rename to MP2Demo/Structs/SplitterCommandModuleData.xml index dcdbde6..da45cf9 100644 --- a/MP2Demo/Structs/UnknownStruct23.xml +++ b/MP2Demo/Structs/SplitterCommandModuleData.xml @@ -1,7 +1,7 @@ - UnknownStruct23 + SplitterCommandModuleData 10 diff --git a/MP2Demo/Structs/TweakGui_UnknownStruct1.xml b/MP2Demo/Structs/TweakGui_DarkWorld.xml similarity index 99% rename from MP2Demo/Structs/TweakGui_UnknownStruct1.xml rename to MP2Demo/Structs/TweakGui_DarkWorld.xml index 5b95d11..52be3d3 100644 --- a/MP2Demo/Structs/TweakGui_UnknownStruct1.xml +++ b/MP2Demo/Structs/TweakGui_DarkWorld.xml @@ -1,7 +1,7 @@ - TweakGui_UnknownStruct1 + TweakGui_DarkWorld diff --git a/MP2Demo/Structs/TweakPlayerControls_UnknownStruct1.xml b/MP2Demo/Structs/TweakPlayerControls_UnknownStruct1.xml index 620ec66..0018238 100644 --- a/MP2Demo/Structs/TweakPlayerControls_UnknownStruct1.xml +++ b/MP2Demo/Structs/TweakPlayerControls_UnknownStruct1.xml @@ -3,223 +3,223 @@ TweakPlayerControls_UnknownStruct1 - + 1 - + 2 - + 3 - + 4 - + 3 - + 4 - + 3 - + 4 - + 2 - + 1 - + 16 - + 16 - + 15 - + 15 - + 0 - + 15 - + 15 - + 18 - + 17 - + 0 - + 0 - + 0 - + 0 - + 0 - + 11 - + 12 - + 14 - + 13 - + 0 - + 0 - + 9 - + 20 - + 0 - + 0 - + 3 - + 4 - + 1 - + 2 - + 10 - + 0 - + 17 - + 18 - + 0 - + 2 - + 1 - + 3 - + 4 - + 5 - + 6 - + 7 - + 8 - + 10 - + 9 - + 10 - + 9 - + 0 - + 0 - + 0 - + 0 - + 0 - + 19 - + 0 - + 0 - + 21 - + 0 - + 0 - + 9 - + 13 - + 22 - + 12 - + 14 - + 9 - + 10 diff --git a/MP2Demo/Structs/TweakPlayerGun_UnknownStruct1.xml b/MP2Demo/Structs/TweakPlayerGun_Beam_Combo.xml similarity index 98% rename from MP2Demo/Structs/TweakPlayerGun_UnknownStruct1.xml rename to MP2Demo/Structs/TweakPlayerGun_Beam_Combo.xml index 4800f15..3260535 100644 --- a/MP2Demo/Structs/TweakPlayerGun_UnknownStruct1.xml +++ b/MP2Demo/Structs/TweakPlayerGun_Beam_Combo.xml @@ -1,7 +1,7 @@ - TweakPlayerGun_UnknownStruct1 + TweakPlayerGun_Beam_Combo diff --git a/MP2Demo/Structs/UnknownStruct20.xml b/MP2Demo/Structs/UnknownStruct20.xml index c8e6536..cb46643 100644 --- a/MP2Demo/Structs/UnknownStruct20.xml +++ b/MP2Demo/Structs/UnknownStruct20.xml @@ -27,8 +27,10 @@ PART - - -1 + + + PART + 4.0 diff --git a/MP2Demo/Structs/UnknownStruct21.xml b/MP2Demo/Structs/UnknownStruct21.xml index f9872e2..10214c2 100644 --- a/MP2Demo/Structs/UnknownStruct21.xml +++ b/MP2Demo/Structs/UnknownStruct21.xml @@ -39,20 +39,28 @@ 3.0 - - -1 + + + CMDL + - - -1 + + + PART + - - -1 + + + PART + - - -1 + + + SPSC + - - -1 + + 0 1.5 diff --git a/MP2Demo/Structs/VisorParameters.xml b/MP2Demo/Structs/VisorParameters.xml index d441571..dfaa07d 100644 --- a/MP2Demo/Structs/VisorParameters.xml +++ b/MP2Demo/Structs/VisorParameters.xml @@ -6,7 +6,7 @@ false - + 15 diff --git a/MP3/Enums/BerserkerEnum.xml b/MP3/Enums/BerserkerEnum.xml deleted file mode 100644 index 8d3b601..0000000 --- a/MP3/Enums/BerserkerEnum.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - BerserkerEnum - - - - - - - - diff --git a/MP3/Enums/CableEnum.xml b/MP3/Enums/CableEnum.xml index a7baf13..03c7224 100644 --- a/MP3/Enums/CableEnum.xml +++ b/MP3/Enums/CableEnum.xml @@ -3,9 +3,9 @@ CableEnum - - - + + + diff --git a/MP3/Enums/DamageableTriggerEnum.xml b/MP3/Enums/DamageableTriggerEnum.xml index 4b61460..6c3279c 100644 --- a/MP3/Enums/DamageableTriggerEnum.xml +++ b/MP3/Enums/DamageableTriggerEnum.xml @@ -3,10 +3,10 @@ DamageableTriggerEnum - - - - + + + + diff --git a/MP3/Enums/DifficultyEnum.xml b/MP3/Enums/DifficultyEnum.xml new file mode 100644 index 0000000..1a2f8b9 --- /dev/null +++ b/MP3/Enums/DifficultyEnum.xml @@ -0,0 +1,12 @@ + + + + DifficultyEnum + + + + + + + + diff --git a/MP3/Enums/HyperModeType.xml b/MP3/Enums/HyperModeType.xml index d94df9e..121885a 100644 --- a/MP3/Enums/HyperModeType.xml +++ b/MP3/Enums/HyperModeType.xml @@ -3,9 +3,9 @@ HyperModeType - - - + + + diff --git a/MP3/Enums/MiscControls_UnknownEnum1.xml b/MP3/Enums/MiscControls_UnknownEnum1.xml deleted file mode 100644 index 3164f15..0000000 --- a/MP3/Enums/MiscControls_UnknownEnum1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - MiscControls_UnknownEnum1 - - - - - - - - - diff --git a/MP3/Enums/PhysicalControl.xml b/MP3/Enums/PhysicalControl.xml index 841bc0f..3580bd5 100644 --- a/MP3/Enums/PhysicalControl.xml +++ b/MP3/Enums/PhysicalControl.xml @@ -3,28 +3,28 @@ PhysicalControl - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -37,28 +37,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP3/Enums/PhysicalControlBoolean.xml b/MP3/Enums/PhysicalControlBoolean.xml index d4e76ac..b0e048c 100644 --- a/MP3/Enums/PhysicalControlBoolean.xml +++ b/MP3/Enums/PhysicalControlBoolean.xml @@ -3,9 +3,9 @@ PhysicalControlBoolean - - - + + + diff --git a/MP3/Enums/PlayerItem.xml b/MP3/Enums/PlayerItem.xml index 66201a4..18d7307 100644 --- a/MP3/Enums/PlayerItem.xml +++ b/MP3/Enums/PlayerItem.xml @@ -4,65 +4,65 @@ PlayerItem true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP3/Enums/QuickSelectMethod.xml b/MP3/Enums/QuickSelectMethod.xml new file mode 100644 index 0000000..60291b2 --- /dev/null +++ b/MP3/Enums/QuickSelectMethod.xml @@ -0,0 +1,13 @@ + + + + QuickSelectMethod + + + + + + + + + diff --git a/MP3/Enums/RevolutionControlType.xml b/MP3/Enums/RevolutionControlType.xml index d1ec3c2..2fed12f 100644 --- a/MP3/Enums/RevolutionControlType.xml +++ b/MP3/Enums/RevolutionControlType.xml @@ -3,13 +3,13 @@ RevolutionControlType - - - - - - - + + + + + + + diff --git a/MP3/Enums/RevolutionControl_UnknownEnum1.xml b/MP3/Enums/RevolutionControl_UnknownEnum1.xml deleted file mode 100644 index d7696ab..0000000 --- a/MP3/Enums/RevolutionControl_UnknownEnum1.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - RevolutionControl_UnknownEnum1 - - - - - - - - - - - - - - - - diff --git a/MP3/Enums/RevolutionControl_UnknownEnum2.xml b/MP3/Enums/RevolutionControl_UnknownEnum2.xml deleted file mode 100644 index b675398..0000000 --- a/MP3/Enums/RevolutionControl_UnknownEnum2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - RevolutionControl_UnknownEnum2 - - - - - - - diff --git a/MP3/Enums/RevolutionGesture.xml b/MP3/Enums/RevolutionGesture.xml new file mode 100644 index 0000000..19fe286 --- /dev/null +++ b/MP3/Enums/RevolutionGesture.xml @@ -0,0 +1,20 @@ + + + + RevolutionGesture + + + + + + + + + + + + + + + + diff --git a/MP3/Enums/RevolutionPointerShape.xml b/MP3/Enums/RevolutionPointerShape.xml new file mode 100644 index 0000000..ee7cf0e --- /dev/null +++ b/MP3/Enums/RevolutionPointerShape.xml @@ -0,0 +1,11 @@ + + + + RevolutionPointerShape + + + + + + + diff --git a/MP3/Enums/RevolutionVirtualControl.xml b/MP3/Enums/RevolutionVirtualControl.xml index 42ef2a0..ec77f5f 100644 --- a/MP3/Enums/RevolutionVirtualControl.xml +++ b/MP3/Enums/RevolutionVirtualControl.xml @@ -3,22 +3,22 @@ RevolutionVirtualControl - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/MP3/Game.xml b/MP3/Game.xml index 6ddbaa5..84059cc 100644 --- a/MP3/Game.xml +++ b/MP3/Game.xml @@ -851,10 +851,6 @@ AiDifficultySettings - - Armor - - AuroraUnit1Data @@ -883,10 +879,6 @@ BerserkerData - - BerserkerEnum - - BlinkWolfData @@ -947,14 +939,6 @@ CameraShakerEnvelope - - CattleProd - - - - Chakram - - ChasePosition @@ -1035,6 +1019,10 @@ DefenseMechanoidData + + DifficultyEnum + + DynamicLightFalloff @@ -1063,10 +1051,6 @@ ElectricBeamInfo - - EnergyWhip - - EyePodData @@ -1111,6 +1095,14 @@ FlyerSwarmData + + FlyingPirateArmorData + + + + FlyingPirateBlasterData + + FlyingPirateData @@ -1120,8 +1112,12 @@ - FlyingPirateStruct - + FlyingPirateHyperModeData + + + + FlyingPirateJetPackData + FriendlyData @@ -1160,8 +1156,8 @@ - GrappleInfo - + GrappleParameters + GuiWidgetProperties @@ -1207,10 +1203,6 @@ InventoryControls - - JetPack - - KorakkData @@ -1239,6 +1231,10 @@ LightParameters + + LogBookControls + + MapControls @@ -1271,18 +1267,6 @@ MiscControls - - MiscControls_UnknownEnum1 - - - - MiscControls_UnknownStruct1 - - - - MiscControls_UnknownStruct2 - - ModIncaData @@ -1335,10 +1319,6 @@ PTCNoseTurretData - - ParticleBlaster - - PathDetermination @@ -1447,6 +1427,14 @@ PuddleControlPhaseData + + QuickSelectControls + + + + QuickSelectMethod + + RagDollData @@ -1455,13 +1443,25 @@ RainProperties + + ReptilicusHunterCattleProd + + + + ReptilicusHunterChakram + + ReptilicusHunterData - ReptilicusHunterStruct - + ReptilicusHunterEnergyWhip + + + + ReptilicusHunterHyperMode + RevolutionControl @@ -1471,14 +1471,6 @@ RevolutionControlType - - RevolutionControl_UnknownEnum1 - - - - RevolutionControl_UnknownEnum2 - - RevolutionControl_UnknownStruct1 @@ -1495,6 +1487,10 @@ RevolutionControl_UnknownStruct4 + + RevolutionGesture + + RevolutionPhysicalControl @@ -1503,6 +1499,10 @@ RevolutionPhysicalControl_UnknownEnum1 + + RevolutionPointerShape + + RevolutionVirtualControl @@ -1604,8 +1604,8 @@ - SpacePirateStruct - + SpacePirateHyperModeData + SpacePirateWeaponData diff --git a/MP3/Script/Achievement.xml b/MP3/Script/Achievement.xml index 48b4ab2..d3b42b6 100644 --- a/MP3/Script/Achievement.xml +++ b/MP3/Script/Achievement.xml @@ -11,90 +11,90 @@ 0x9165E2BE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP3/Script/AreaAttributes.xml b/MP3/Script/AreaAttributes.xml index 30315b7..3677f54 100644 --- a/MP3/Script/AreaAttributes.xml +++ b/MP3/Script/AreaAttributes.xml @@ -17,12 +17,12 @@ 0xF9A89E57 - - - - - - + + + + + + diff --git a/MP3/Script/CameraFilterKeyframe.xml b/MP3/Script/CameraFilterKeyframe.xml index 5ad477f..1027265 100644 --- a/MP3/Script/CameraFilterKeyframe.xml +++ b/MP3/Script/CameraFilterKeyframe.xml @@ -7,7 +7,7 @@ 0 - + 0 diff --git a/MP3/Script/CinematicCamera.xml b/MP3/Script/CinematicCamera.xml index 312eebf..5bb41f1 100644 --- a/MP3/Script/CinematicCamera.xml +++ b/MP3/Script/CinematicCamera.xml @@ -19,21 +19,21 @@ 0xC1A4F436 - - - - - + + + + + 0x639D1F97 - - - - + + + + diff --git a/MP3/Script/ColorModulate.xml b/MP3/Script/ColorModulate.xml index f9e3840..b09d5e1 100644 --- a/MP3/Script/ColorModulate.xml +++ b/MP3/Script/ColorModulate.xml @@ -22,17 +22,17 @@ 0xE51B07EB - - + + - - - - + + + + - - + + diff --git a/MP3/Script/ControlHint.xml b/MP3/Script/ControlHint.xml index de4f6fd..b909df6 100644 --- a/MP3/Script/ControlHint.xml +++ b/MP3/Script/ControlHint.xml @@ -25,7 +25,7 @@ 0.0099999998 - + 0 diff --git a/MP3/Script/FishCloud.xml b/MP3/Script/FishCloud.xml index 7b97c41..49cbd62 100644 --- a/MP3/Script/FishCloud.xml +++ b/MP3/Script/FishCloud.xml @@ -116,14 +116,22 @@ 1.0 - + + + PART + + 0 1.0 - + + + PART + + 0 diff --git a/MP3/Script/GrapplePoint.xml b/MP3/Script/GrapplePoint.xml index a6e6df2..f9c13cd 100644 --- a/MP3/Script/GrapplePoint.xml +++ b/MP3/Script/GrapplePoint.xml @@ -7,7 +7,7 @@ GrapplePoint - + diff --git a/MP3/Script/HUDMemo.xml b/MP3/Script/HUDMemo.xml index db9c15b..0a26684 100644 --- a/MP3/Script/HUDMemo.xml +++ b/MP3/Script/HUDMemo.xml @@ -13,11 +13,11 @@ true - + 0 - - + + diff --git a/MP3/Script/Parasite.xml b/MP3/Script/Parasite.xml index c722569..a94c59c 100644 --- a/MP3/Script/Parasite.xml +++ b/MP3/Script/Parasite.xml @@ -7,7 +7,7 @@ Parasite - + 0 diff --git a/MP3/Script/Repulsor.xml b/MP3/Script/Repulsor.xml index 80d3927..fe1e79c 100644 --- a/MP3/Script/Repulsor.xml +++ b/MP3/Script/Repulsor.xml @@ -13,7 +13,7 @@ -1.0 - + 0 diff --git a/MP3/Script/ShipCommandIcon.xml b/MP3/Script/ShipCommandIcon.xml index a4bbf79..de76812 100644 --- a/MP3/Script/ShipCommandIcon.xml +++ b/MP3/Script/ShipCommandIcon.xml @@ -13,7 +13,7 @@ true - + 0 diff --git a/MP3/Script/SpecialFunction.xml b/MP3/Script/SpecialFunction.xml index cce056b..d03b1f6 100644 --- a/MP3/Script/SpecialFunction.xml +++ b/MP3/Script/SpecialFunction.xml @@ -7,68 +7,68 @@ 0x98C5AED7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP3/Script/Trigger.xml b/MP3/Script/Trigger.xml index 8962f44..8ff4ef9 100644 --- a/MP3/Script/Trigger.xml +++ b/MP3/Script/Trigger.xml @@ -7,10 +7,10 @@ 0x482B22F1 - - - - + + + + diff --git a/MP3/Structs/ActorParameters.xml b/MP3/Structs/ActorParameters.xml index 6408b19..b7fade6 100644 --- a/MP3/Structs/ActorParameters.xml +++ b/MP3/Structs/ActorParameters.xml @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -60,8 +60,8 @@ 0xDE8CE5BD - - + + diff --git a/MP3/Structs/AiDifficultySettings.xml b/MP3/Structs/AiDifficultySettings.xml index 4981859..40370be 100644 --- a/MP3/Structs/AiDifficultySettings.xml +++ b/MP3/Structs/AiDifficultySettings.xml @@ -3,7 +3,7 @@ AiDifficultySettings - + 0xF12A35C6 diff --git a/MP3/Structs/CableProperties.xml b/MP3/Structs/CableProperties.xml index 1f25371..7490b58 100644 --- a/MP3/Structs/CableProperties.xml +++ b/MP3/Structs/CableProperties.xml @@ -96,8 +96,8 @@ 0x23363FD3 - - + + diff --git a/MP3/Structs/ConditionalTest.xml b/MP3/Structs/ConditionalTest.xml index 72ed5b4..c148019 100644 --- a/MP3/Structs/ConditionalTest.xml +++ b/MP3/Structs/ConditionalTest.xml @@ -12,10 +12,13 @@ 0xFB73F2B8 - - 0 + + + + + - + 0 diff --git a/MP3/Structs/ControlCommands.xml b/MP3/Structs/ControlCommands.xml index bd1d2dd..eb2d1a3 100644 --- a/MP3/Structs/ControlCommands.xml +++ b/MP3/Structs/ControlCommands.xml @@ -6,130 +6,130 @@ 0xE88E6A10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP3/Structs/DamageInfo.xml b/MP3/Structs/DamageInfo.xml index f429d2c..2078e69 100644 --- a/MP3/Structs/DamageInfo.xml +++ b/MP3/Structs/DamageInfo.xml @@ -6,17 +6,17 @@ 0xBC709037 - - - - - - - - - - - + + + + + + + + + + + diff --git a/MP3/Structs/Armor.xml b/MP3/Structs/FlyingPirateArmorData.xml similarity index 98% rename from MP3/Structs/Armor.xml rename to MP3/Structs/FlyingPirateArmorData.xml index 86ef6d9..2d85421 100644 --- a/MP3/Structs/Armor.xml +++ b/MP3/Structs/FlyingPirateArmorData.xml @@ -1,7 +1,7 @@ - Armor + FlyingPirateArmorData false diff --git a/MP3/Structs/ParticleBlaster.xml b/MP3/Structs/FlyingPirateBlasterData.xml similarity index 97% rename from MP3/Structs/ParticleBlaster.xml rename to MP3/Structs/FlyingPirateBlasterData.xml index bdaa46a..f05c84d 100644 --- a/MP3/Structs/ParticleBlaster.xml +++ b/MP3/Structs/FlyingPirateBlasterData.xml @@ -1,7 +1,7 @@ - ParticleBlaster + FlyingPirateBlasterData diff --git a/MP3/Structs/FlyingPirateData.xml b/MP3/Structs/FlyingPirateData.xml index 4bdccc5..549b948 100644 --- a/MP3/Structs/FlyingPirateData.xml +++ b/MP3/Structs/FlyingPirateData.xml @@ -106,14 +106,14 @@ 3.0 - + - - - - - + + + + + false diff --git a/MP3/Structs/ReptilicusHunterStruct.xml b/MP3/Structs/FlyingPirateHyperModeData.xml similarity index 95% rename from MP3/Structs/ReptilicusHunterStruct.xml rename to MP3/Structs/FlyingPirateHyperModeData.xml index 534fd3a..b8a6264 100644 --- a/MP3/Structs/ReptilicusHunterStruct.xml +++ b/MP3/Structs/FlyingPirateHyperModeData.xml @@ -1,7 +1,7 @@ - ReptilicusHunterStruct + FlyingPirateHyperModeData false diff --git a/MP3/Structs/JetPack.xml b/MP3/Structs/FlyingPirateJetPackData.xml similarity index 96% rename from MP3/Structs/JetPack.xml rename to MP3/Structs/FlyingPirateJetPackData.xml index 280186e..e4f4233 100644 --- a/MP3/Structs/JetPack.xml +++ b/MP3/Structs/FlyingPirateJetPackData.xml @@ -1,7 +1,7 @@ - JetPack + FlyingPirateJetPackData 120.0 diff --git a/MP3/Structs/GrappleInfo.xml b/MP3/Structs/GrappleParameters.xml similarity index 95% rename from MP3/Structs/GrappleInfo.xml rename to MP3/Structs/GrappleParameters.xml index ef06214..6231331 100644 --- a/MP3/Structs/GrappleInfo.xml +++ b/MP3/Structs/GrappleParameters.xml @@ -1,7 +1,7 @@ - GrappleInfo + GrappleParameters 5.0 diff --git a/MP3/Structs/LightParameters.xml b/MP3/Structs/LightParameters.xml index 4327216..3aefbe0 100644 --- a/MP3/Structs/LightParameters.xml +++ b/MP3/Structs/LightParameters.xml @@ -16,7 +16,7 @@ true - + 0x1 diff --git a/MP3/Structs/MiscControls_UnknownStruct1.xml b/MP3/Structs/LogBookControls.xml similarity index 96% rename from MP3/Structs/MiscControls_UnknownStruct1.xml rename to MP3/Structs/LogBookControls.xml index 740878d..deda10c 100644 --- a/MP3/Structs/MiscControls_UnknownStruct1.xml +++ b/MP3/Structs/LogBookControls.xml @@ -1,7 +1,7 @@ - MiscControls_UnknownStruct1 + LogBookControls diff --git a/MP3/Structs/MiscControls.xml b/MP3/Structs/MiscControls.xml index 7d3eafe..285c19b 100644 --- a/MP3/Structs/MiscControls.xml +++ b/MP3/Structs/MiscControls.xml @@ -6,8 +6,8 @@ - - + + diff --git a/MP3/Structs/MiscControls_UnknownStruct2.xml b/MP3/Structs/QuickSelectControls.xml similarity index 94% rename from MP3/Structs/MiscControls_UnknownStruct2.xml rename to MP3/Structs/QuickSelectControls.xml index 92acdf9..4c59076 100644 --- a/MP3/Structs/MiscControls_UnknownStruct2.xml +++ b/MP3/Structs/QuickSelectControls.xml @@ -1,9 +1,9 @@ - MiscControls_UnknownStruct2 + QuickSelectControls - + 0xBB12C51F diff --git a/MP3/Structs/CattleProd.xml b/MP3/Structs/ReptilicusHunterCattleProd.xml similarity index 95% rename from MP3/Structs/CattleProd.xml rename to MP3/Structs/ReptilicusHunterCattleProd.xml index 146bae2..130eb85 100644 --- a/MP3/Structs/CattleProd.xml +++ b/MP3/Structs/ReptilicusHunterCattleProd.xml @@ -1,7 +1,7 @@ - CattleProd + ReptilicusHunterCattleProd diff --git a/MP3/Structs/Chakram.xml b/MP3/Structs/ReptilicusHunterChakram.xml similarity index 98% rename from MP3/Structs/Chakram.xml rename to MP3/Structs/ReptilicusHunterChakram.xml index ddc1169..b1be6fa 100644 --- a/MP3/Structs/Chakram.xml +++ b/MP3/Structs/ReptilicusHunterChakram.xml @@ -1,7 +1,7 @@ - Chakram + ReptilicusHunterChakram diff --git a/MP3/Structs/ReptilicusHunterData.xml b/MP3/Structs/ReptilicusHunterData.xml index d91e67b..f16c4ff 100644 --- a/MP3/Structs/ReptilicusHunterData.xml +++ b/MP3/Structs/ReptilicusHunterData.xml @@ -82,12 +82,12 @@ 10.0 - - - - - - + + + + + + diff --git a/MP3/Structs/EnergyWhip.xml b/MP3/Structs/ReptilicusHunterEnergyWhip.xml similarity index 96% rename from MP3/Structs/EnergyWhip.xml rename to MP3/Structs/ReptilicusHunterEnergyWhip.xml index 4c6ecb1..25615f5 100644 --- a/MP3/Structs/EnergyWhip.xml +++ b/MP3/Structs/ReptilicusHunterEnergyWhip.xml @@ -1,7 +1,7 @@ - EnergyWhip + ReptilicusHunterEnergyWhip diff --git a/MP3/Structs/FlyingPirateStruct.xml b/MP3/Structs/ReptilicusHunterHyperMode.xml similarity index 95% rename from MP3/Structs/FlyingPirateStruct.xml rename to MP3/Structs/ReptilicusHunterHyperMode.xml index 8fd8a14..0873464 100644 --- a/MP3/Structs/FlyingPirateStruct.xml +++ b/MP3/Structs/ReptilicusHunterHyperMode.xml @@ -1,7 +1,7 @@ - FlyingPirateStruct + ReptilicusHunterHyperMode false diff --git a/MP3/Structs/RevolutionControl.xml b/MP3/Structs/RevolutionControl.xml index a2e766e..d352bab 100644 --- a/MP3/Structs/RevolutionControl.xml +++ b/MP3/Structs/RevolutionControl.xml @@ -41,7 +41,7 @@ OnlyIfModified 0xB2AA1FD4 - + OnlyIfModified 0x9AD4E0BC diff --git a/MP3/Structs/RevolutionControl_UnknownStruct1.xml b/MP3/Structs/RevolutionControl_UnknownStruct1.xml index 00cb857..3049df5 100644 --- a/MP3/Structs/RevolutionControl_UnknownStruct1.xml +++ b/MP3/Structs/RevolutionControl_UnknownStruct1.xml @@ -3,7 +3,7 @@ RevolutionControl_UnknownStruct1 - + 0x44D3E4FB diff --git a/MP3/Structs/SpacePirateData.xml b/MP3/Structs/SpacePirateData.xml index f516aa9..ee9b9f4 100644 --- a/MP3/Structs/SpacePirateData.xml +++ b/MP3/Structs/SpacePirateData.xml @@ -211,9 +211,9 @@ 1.5 - - - + + + false diff --git a/MP3/Structs/SpacePirateStruct.xml b/MP3/Structs/SpacePirateHyperModeData.xml similarity index 97% rename from MP3/Structs/SpacePirateStruct.xml rename to MP3/Structs/SpacePirateHyperModeData.xml index 99ecee5..10d6974 100644 --- a/MP3/Structs/SpacePirateStruct.xml +++ b/MP3/Structs/SpacePirateHyperModeData.xml @@ -1,7 +1,7 @@ - SpacePirateStruct + SpacePirateHyperModeData false diff --git a/MP3/Structs/UnknownStruct21.xml b/MP3/Structs/UnknownStruct21.xml index 386f328..c995043 100644 --- a/MP3/Structs/UnknownStruct21.xml +++ b/MP3/Structs/UnknownStruct21.xml @@ -3,7 +3,7 @@ UnknownStruct21 - + 0xF12A35C6 diff --git a/MP3Proto/Enums/HyperModeType.xml b/MP3Proto/Enums/HyperModeType.xml index 5f13c28..ed70204 100644 --- a/MP3Proto/Enums/HyperModeType.xml +++ b/MP3Proto/Enums/HyperModeType.xml @@ -3,9 +3,9 @@ HyperModeType - - - + + + diff --git a/MP3Proto/Enums/LocationOfEffect1.xml b/MP3Proto/Enums/LocationOfEffect1.xml index 47a1502..9e7cf3a 100644 --- a/MP3Proto/Enums/LocationOfEffect1.xml +++ b/MP3Proto/Enums/LocationOfEffect1.xml @@ -3,9 +3,9 @@ LocationOfEffect1 - - - + + + diff --git a/MP3Proto/Enums/PhysicalControl.xml b/MP3Proto/Enums/PhysicalControl.xml index af9a93e..89d39ca 100644 --- a/MP3Proto/Enums/PhysicalControl.xml +++ b/MP3Proto/Enums/PhysicalControl.xml @@ -3,49 +3,49 @@ PhysicalControl - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP3Proto/Enums/PhysicalControlBoolean.xml b/MP3Proto/Enums/PhysicalControlBoolean.xml index bca486b..32bd0d1 100644 --- a/MP3Proto/Enums/PhysicalControlBoolean.xml +++ b/MP3Proto/Enums/PhysicalControlBoolean.xml @@ -3,9 +3,9 @@ PhysicalControlBoolean - - - + + + diff --git a/MP3Proto/Enums/PlayerItem.xml b/MP3Proto/Enums/PlayerItem.xml index a662013..b4938b6 100644 --- a/MP3Proto/Enums/PlayerItem.xml +++ b/MP3Proto/Enums/PlayerItem.xml @@ -4,42 +4,42 @@ PlayerItem true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP3Proto/Enums/RevolutionControlType.xml b/MP3Proto/Enums/RevolutionControlType.xml index 7982039..4e8fc80 100644 --- a/MP3Proto/Enums/RevolutionControlType.xml +++ b/MP3Proto/Enums/RevolutionControlType.xml @@ -3,11 +3,11 @@ RevolutionControlType - - - - - + + + + + diff --git a/MP3Proto/Enums/RevolutionVirtualControl.xml b/MP3Proto/Enums/RevolutionVirtualControl.xml index 9c94050..d0b74f8 100644 --- a/MP3Proto/Enums/RevolutionVirtualControl.xml +++ b/MP3Proto/Enums/RevolutionVirtualControl.xml @@ -3,16 +3,16 @@ RevolutionVirtualControl - - - - - - - - - - + + + + + + + + + + diff --git a/MP3Proto/Game.xml b/MP3Proto/Game.xml index 1837968..fbaa356 100644 --- a/MP3Proto/Game.xml +++ b/MP3Proto/Game.xml @@ -631,10 +631,6 @@ ActorParameters - - Armor - - Ball @@ -707,14 +703,6 @@ CameraShakerEnvelope - - CattleProd - - - - Chakram - - ChasePosition @@ -807,10 +795,6 @@ ElectricBeamInfo - - EnergyWhip - - EyePodData @@ -847,6 +831,14 @@ FlyerSwarmData + + FlyingPirateArmorData + + + + FlyingPirateBlasterData + + FlyingPirateData @@ -855,6 +847,10 @@ FlyingPirateHelixMissileData + + FlyingPirateJetPackData + + FriendlyData @@ -876,8 +872,8 @@ - GrappleInfo - + GrappleParameters + GuiWidgetProperties @@ -915,10 +911,6 @@ InventoryControls - - JetPack - - KorakkData @@ -1019,10 +1011,6 @@ PTCNoseTurretData - - ParticleBlaster - - PathDetermination @@ -1123,10 +1111,22 @@ RagDollData + + ReptilicusHunterCattleProd + + + + ReptilicusHunterChakram + + ReptilicusHunterData + + ReptilicusHunterEnergyWhip + + RevolutionControl diff --git a/MP3Proto/Misc/TweakPlayerGun.xml b/MP3Proto/Misc/TweakPlayerGun.xml index ee40973..2dada2e 100644 --- a/MP3Proto/Misc/TweakPlayerGun.xml +++ b/MP3Proto/Misc/TweakPlayerGun.xml @@ -13,21 +13,21 @@ - + 304 - + 304 - + 307 diff --git a/MP3Proto/Script/ActorTransform.xml b/MP3Proto/Script/ActorTransform.xml index c80672e..a18e1a3 100644 --- a/MP3Proto/Script/ActorTransform.xml +++ b/MP3Proto/Script/ActorTransform.xml @@ -4,7 +4,7 @@ ActorTransform - + 20 diff --git a/MP3Proto/Script/AreaAttributes.xml b/MP3Proto/Script/AreaAttributes.xml index d398967..16073ae 100644 --- a/MP3Proto/Script/AreaAttributes.xml +++ b/MP3Proto/Script/AreaAttributes.xml @@ -18,10 +18,10 @@ Enable Dark World damage and switch to the Dark World map. false - + 0 - + -1 @@ -35,7 +35,7 @@ CMDL - + 0 diff --git a/MP3Proto/Script/CameraFilterKeyframe.xml b/MP3Proto/Script/CameraFilterKeyframe.xml index 4c33ede..e7f829c 100644 --- a/MP3Proto/Script/CameraFilterKeyframe.xml +++ b/MP3Proto/Script/CameraFilterKeyframe.xml @@ -7,7 +7,7 @@ 0 - + 0 diff --git a/MP3Proto/Script/CameraHint.xml b/MP3Proto/Script/CameraHint.xml index c8d983c..e97178e 100644 --- a/MP3Proto/Script/CameraHint.xml +++ b/MP3Proto/Script/CameraHint.xml @@ -10,7 +10,7 @@ 0.0 - + 30725 diff --git a/MP3Proto/Script/CinematicCamera.xml b/MP3Proto/Script/CinematicCamera.xml index b89c0ee..59836a1 100644 --- a/MP3Proto/Script/CinematicCamera.xml +++ b/MP3Proto/Script/CinematicCamera.xml @@ -7,27 +7,27 @@ 0xC1A4F436 - - - - - + + + + + 0x639D1F97 - - - - + + + + 10.0 - + 2132 @@ -37,7 +37,7 @@ 0x26AD4A6B - + 4 diff --git a/MP3Proto/Script/ControlHint.xml b/MP3Proto/Script/ControlHint.xml index aad635e..cea0f28 100644 --- a/MP3Proto/Script/ControlHint.xml +++ b/MP3Proto/Script/ControlHint.xml @@ -22,7 +22,7 @@ 0.0 - + 0 diff --git a/MP3Proto/Script/FishCloud.xml b/MP3Proto/Script/FishCloud.xml index c41034f..810f9cf 100644 --- a/MP3Proto/Script/FishCloud.xml +++ b/MP3Proto/Script/FishCloud.xml @@ -99,11 +99,19 @@ 0 - + + + PART + + 0 - + + + PART + + 0 diff --git a/MP3Proto/Script/FrontEndDataNetwork.xml b/MP3Proto/Script/FrontEndDataNetwork.xml index 2496843..4e7498a 100644 --- a/MP3Proto/Script/FrontEndDataNetwork.xml +++ b/MP3Proto/Script/FrontEndDataNetwork.xml @@ -63,8 +63,8 @@ 0.247059 - - -1 + + 0 diff --git a/MP3Proto/Script/GrapplePoint.xml b/MP3Proto/Script/GrapplePoint.xml index ea9b5bb..24062dc 100644 --- a/MP3Proto/Script/GrapplePoint.xml +++ b/MP3Proto/Script/GrapplePoint.xml @@ -4,7 +4,7 @@ GrapplePoint - + diff --git a/MP3Proto/Script/HUDMemo.xml b/MP3Proto/Script/HUDMemo.xml index d8cddc6..159b4ff 100644 --- a/MP3Proto/Script/HUDMemo.xml +++ b/MP3Proto/Script/HUDMemo.xml @@ -28,7 +28,7 @@ false - + 0 diff --git a/MP3Proto/Script/PathControl.xml b/MP3Proto/Script/PathControl.xml index d297256..6b7874e 100644 --- a/MP3Proto/Script/PathControl.xml +++ b/MP3Proto/Script/PathControl.xml @@ -4,7 +4,7 @@ PathControl - + 0 diff --git a/MP3Proto/Script/PlayerActor.xml b/MP3Proto/Script/PlayerActor.xml index 73cf68e..645985d 100644 --- a/MP3Proto/Script/PlayerActor.xml +++ b/MP3Proto/Script/PlayerActor.xml @@ -38,7 +38,7 @@ true - + 4 diff --git a/MP3Proto/Script/PlayerHint.xml b/MP3Proto/Script/PlayerHint.xml index 0343f0e..44aba77 100644 --- a/MP3Proto/Script/PlayerHint.xml +++ b/MP3Proto/Script/PlayerHint.xml @@ -13,7 +13,7 @@ 1.0 - + 1 diff --git a/MP3Proto/Script/PlayerTurret.xml b/MP3Proto/Script/PlayerTurret.xml index 6c392c0..124ba19 100644 --- a/MP3Proto/Script/PlayerTurret.xml +++ b/MP3Proto/Script/PlayerTurret.xml @@ -4,7 +4,7 @@ PlayerTurret - + 1 diff --git a/MP3Proto/Script/Repulsor.xml b/MP3Proto/Script/Repulsor.xml index d70f75b..6a096e1 100644 --- a/MP3Proto/Script/Repulsor.xml +++ b/MP3Proto/Script/Repulsor.xml @@ -13,7 +13,7 @@ -1.0 - + 0 diff --git a/MP3Proto/Script/RoomAcoustics.xml b/MP3Proto/Script/RoomAcoustics.xml index ab82f17..3293fde 100644 --- a/MP3Proto/Script/RoomAcoustics.xml +++ b/MP3Proto/Script/RoomAcoustics.xml @@ -7,7 +7,7 @@ 117 - + 1 diff --git a/MP3Proto/Script/ShipCommandIcon.xml b/MP3Proto/Script/ShipCommandIcon.xml index afd7041..d30a2c1 100644 --- a/MP3Proto/Script/ShipCommandIcon.xml +++ b/MP3Proto/Script/ShipCommandIcon.xml @@ -7,7 +7,7 @@ true - + 0 diff --git a/MP3Proto/Script/SpecialFunction.xml b/MP3Proto/Script/SpecialFunction.xml index 488fb04..dfa5c3f 100644 --- a/MP3Proto/Script/SpecialFunction.xml +++ b/MP3Proto/Script/SpecialFunction.xml @@ -7,52 +7,52 @@ 0x98C5AED7 - - + + - + - - - + + + - + - - - - - + + + + + - - - - + + + + - + - - + + - + - + - - + + - - - - - - + + + + + + @@ -60,24 +60,24 @@ - - - + + + - + - - - + + + - + - + - - + + diff --git a/MP3Proto/Script/StreamedAudio.xml b/MP3Proto/Script/StreamedAudio.xml index d732412..5f65705 100644 --- a/MP3Proto/Script/StreamedAudio.xml +++ b/MP3Proto/Script/StreamedAudio.xml @@ -17,7 +17,7 @@ 127 - + 0 diff --git a/MP3Proto/Script/Trigger.xml b/MP3Proto/Script/Trigger.xml index 4789770..318a870 100644 --- a/MP3Proto/Script/Trigger.xml +++ b/MP3Proto/Script/Trigger.xml @@ -7,10 +7,10 @@ 0x482B22F1 - - - - + + + + diff --git a/MP3Proto/Structs/CableProperties.xml b/MP3Proto/Structs/CableProperties.xml index b777aac..a86ebb8 100644 --- a/MP3Proto/Structs/CableProperties.xml +++ b/MP3Proto/Structs/CableProperties.xml @@ -75,8 +75,8 @@ 0x23363FD3 - - + + diff --git a/MP3Proto/Structs/CameraInterpolation.xml b/MP3Proto/Structs/CameraInterpolation.xml index 50b577d..7103597 100644 --- a/MP3Proto/Structs/CameraInterpolation.xml +++ b/MP3Proto/Structs/CameraInterpolation.xml @@ -3,7 +3,7 @@ CameraInterpolation - + 3 @@ -15,7 +15,7 @@ - + 3 diff --git a/MP3Proto/Structs/CameraOrientation.xml b/MP3Proto/Structs/CameraOrientation.xml index 89117d6..0f75ac5 100644 --- a/MP3Proto/Structs/CameraOrientation.xml +++ b/MP3Proto/Structs/CameraOrientation.xml @@ -14,7 +14,7 @@ - + 0 diff --git a/MP3Proto/Structs/CameraPosition.xml b/MP3Proto/Structs/CameraPosition.xml index 8892997..a577a59 100644 --- a/MP3Proto/Structs/CameraPosition.xml +++ b/MP3Proto/Structs/CameraPosition.xml @@ -15,7 +15,7 @@ - + 0 diff --git a/MP3Proto/Structs/CameraShakerData.xml b/MP3Proto/Structs/CameraShakerData.xml index f0875df..3512fa4 100644 --- a/MP3Proto/Structs/CameraShakerData.xml +++ b/MP3Proto/Structs/CameraShakerData.xml @@ -3,7 +3,7 @@ CameraShakerData - + 48 diff --git a/MP3Proto/Structs/ConditionalTest.xml b/MP3Proto/Structs/ConditionalTest.xml index 3fad660..55a12ff 100644 --- a/MP3Proto/Structs/ConditionalTest.xml +++ b/MP3Proto/Structs/ConditionalTest.xml @@ -9,10 +9,13 @@ 0xFB73F2B8 - - 0 + + + + + - + 0 diff --git a/MP3Proto/Structs/ControlCommands.xml b/MP3Proto/Structs/ControlCommands.xml index 15f5ac1..d941924 100644 --- a/MP3Proto/Structs/ControlCommands.xml +++ b/MP3Proto/Structs/ControlCommands.xml @@ -6,96 +6,96 @@ 0xE88E6A10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP3Proto/Structs/DamageInfo.xml b/MP3Proto/Structs/DamageInfo.xml index dc49079..267d9d0 100644 --- a/MP3Proto/Structs/DamageInfo.xml +++ b/MP3Proto/Structs/DamageInfo.xml @@ -6,13 +6,13 @@ 0xBC709037 - - - - - - - + + + + + + + diff --git a/MP3Proto/Structs/Armor.xml b/MP3Proto/Structs/FlyingPirateArmorData.xml similarity index 98% rename from MP3Proto/Structs/Armor.xml rename to MP3Proto/Structs/FlyingPirateArmorData.xml index 735ba03..7649067 100644 --- a/MP3Proto/Structs/Armor.xml +++ b/MP3Proto/Structs/FlyingPirateArmorData.xml @@ -1,7 +1,7 @@ - Armor + FlyingPirateArmorData false diff --git a/MP3Proto/Structs/ParticleBlaster.xml b/MP3Proto/Structs/FlyingPirateBlasterData.xml similarity index 96% rename from MP3Proto/Structs/ParticleBlaster.xml rename to MP3Proto/Structs/FlyingPirateBlasterData.xml index 6a3092d..eee68e5 100644 --- a/MP3Proto/Structs/ParticleBlaster.xml +++ b/MP3Proto/Structs/FlyingPirateBlasterData.xml @@ -1,7 +1,7 @@ - ParticleBlaster + FlyingPirateBlasterData diff --git a/MP3Proto/Structs/FlyingPirateData.xml b/MP3Proto/Structs/FlyingPirateData.xml index cf773c6..a52989d 100644 --- a/MP3Proto/Structs/FlyingPirateData.xml +++ b/MP3Proto/Structs/FlyingPirateData.xml @@ -76,11 +76,11 @@ 3.0 - + - - + + diff --git a/MP3Proto/Structs/JetPack.xml b/MP3Proto/Structs/FlyingPirateJetPackData.xml similarity index 96% rename from MP3Proto/Structs/JetPack.xml rename to MP3Proto/Structs/FlyingPirateJetPackData.xml index c9f0aab..9b58d7f 100644 --- a/MP3Proto/Structs/JetPack.xml +++ b/MP3Proto/Structs/FlyingPirateJetPackData.xml @@ -1,7 +1,7 @@ - JetPack + FlyingPirateJetPackData 120.0 diff --git a/MP3Proto/Structs/GrappleInfo.xml b/MP3Proto/Structs/GrappleParameters.xml similarity index 95% rename from MP3Proto/Structs/GrappleInfo.xml rename to MP3Proto/Structs/GrappleParameters.xml index f260602..927eb9e 100644 --- a/MP3Proto/Structs/GrappleInfo.xml +++ b/MP3Proto/Structs/GrappleParameters.xml @@ -1,7 +1,7 @@ - GrappleInfo + GrappleParameters 5.0 diff --git a/MP3Proto/Structs/LightParameters.xml b/MP3Proto/Structs/LightParameters.xml index bc68378..ad594d6 100644 --- a/MP3Proto/Structs/LightParameters.xml +++ b/MP3Proto/Structs/LightParameters.xml @@ -28,7 +28,7 @@ true - + 0x1 @@ -37,7 +37,7 @@ - + 1 diff --git a/MP3Proto/Structs/PathPosition.xml b/MP3Proto/Structs/PathPosition.xml index 6949bee..404aa4e 100644 --- a/MP3Proto/Structs/PathPosition.xml +++ b/MP3Proto/Structs/PathPosition.xml @@ -3,7 +3,7 @@ PathPosition - + 0 diff --git a/MP3Proto/Structs/PlatformMotionProperties.xml b/MP3Proto/Structs/PlatformMotionProperties.xml index 46cfde9..8339c31 100644 --- a/MP3Proto/Structs/PlatformMotionProperties.xml +++ b/MP3Proto/Structs/PlatformMotionProperties.xml @@ -11,7 +11,7 @@ 0.0 - + 288 diff --git a/MP3Proto/Structs/CattleProd.xml b/MP3Proto/Structs/ReptilicusHunterCattleProd.xml similarity index 94% rename from MP3Proto/Structs/CattleProd.xml rename to MP3Proto/Structs/ReptilicusHunterCattleProd.xml index 5dca5ba..3073915 100644 --- a/MP3Proto/Structs/CattleProd.xml +++ b/MP3Proto/Structs/ReptilicusHunterCattleProd.xml @@ -1,7 +1,7 @@ - CattleProd + ReptilicusHunterCattleProd diff --git a/MP3Proto/Structs/Chakram.xml b/MP3Proto/Structs/ReptilicusHunterChakram.xml similarity index 98% rename from MP3Proto/Structs/Chakram.xml rename to MP3Proto/Structs/ReptilicusHunterChakram.xml index 2d18c5d..700b5bb 100644 --- a/MP3Proto/Structs/Chakram.xml +++ b/MP3Proto/Structs/ReptilicusHunterChakram.xml @@ -1,7 +1,7 @@ - Chakram + ReptilicusHunterChakram diff --git a/MP3Proto/Structs/ReptilicusHunterData.xml b/MP3Proto/Structs/ReptilicusHunterData.xml index b1996b3..597ceff 100644 --- a/MP3Proto/Structs/ReptilicusHunterData.xml +++ b/MP3Proto/Structs/ReptilicusHunterData.xml @@ -43,9 +43,9 @@ 10.0 - - - + + + diff --git a/MP3Proto/Structs/EnergyWhip.xml b/MP3Proto/Structs/ReptilicusHunterEnergyWhip.xml similarity index 94% rename from MP3Proto/Structs/EnergyWhip.xml rename to MP3Proto/Structs/ReptilicusHunterEnergyWhip.xml index d55eca7..88643f8 100644 --- a/MP3Proto/Structs/EnergyWhip.xml +++ b/MP3Proto/Structs/ReptilicusHunterEnergyWhip.xml @@ -1,7 +1,7 @@ - EnergyWhip + ReptilicusHunterEnergyWhip diff --git a/MP3Proto/Structs/SpindleOrientation.xml b/MP3Proto/Structs/SpindleOrientation.xml index f7cde69..d576af8 100644 --- a/MP3Proto/Structs/SpindleOrientation.xml +++ b/MP3Proto/Structs/SpindleOrientation.xml @@ -3,7 +3,7 @@ SpindleOrientation - + 786432 diff --git a/MP3Proto/Structs/SpindlePosition.xml b/MP3Proto/Structs/SpindlePosition.xml index ab48756..ea5101a 100644 --- a/MP3Proto/Structs/SpindlePosition.xml +++ b/MP3Proto/Structs/SpindlePosition.xml @@ -3,7 +3,7 @@ SpindlePosition - + 320 diff --git a/MP3Proto/Structs/SurfaceOrientation.xml b/MP3Proto/Structs/SurfaceOrientation.xml index 8fd93f6..120877f 100644 --- a/MP3Proto/Structs/SurfaceOrientation.xml +++ b/MP3Proto/Structs/SurfaceOrientation.xml @@ -3,7 +3,7 @@ SurfaceOrientation - + 256 diff --git a/MP3Proto/Structs/SurfacePosition.xml b/MP3Proto/Structs/SurfacePosition.xml index e3c9720..5a15904 100644 --- a/MP3Proto/Structs/SurfacePosition.xml +++ b/MP3Proto/Structs/SurfacePosition.xml @@ -3,7 +3,7 @@ SurfacePosition - + 1 diff --git a/MP3Proto/Structs/VisorParameters.xml b/MP3Proto/Structs/VisorParameters.xml index 944023e..cfdb6b8 100644 --- a/MP3Proto/Structs/VisorParameters.xml +++ b/MP3Proto/Structs/VisorParameters.xml @@ -6,7 +6,7 @@ false - + 15 diff --git a/PropertyMap.xml b/PropertyMap.xml index f6ed185..9cabd73 100644 --- a/PropertyMap.xml +++ b/PropertyMap.xml @@ -3,7 +3,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -315,7 +315,7 @@ - + @@ -331,7 +331,7 @@ - + @@ -355,15 +355,15 @@ - + - + - + @@ -395,7 +395,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -439,7 +439,7 @@ - + @@ -475,7 +475,7 @@ - + @@ -499,7 +499,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -651,11 +651,11 @@ - + - + @@ -665,10 +665,6 @@ - - - - @@ -738,7 +734,7 @@ - + @@ -747,7 +743,7 @@ - + @@ -949,10 +945,6 @@ - - - - @@ -991,7 +983,7 @@ - + @@ -1007,11 +999,7 @@ - - - - - + @@ -1059,7 +1047,7 @@ - + @@ -1095,7 +1083,7 @@ - + @@ -1107,7 +1095,7 @@ - + @@ -1159,7 +1147,7 @@ - + @@ -1235,11 +1223,11 @@ - + - + @@ -1247,7 +1235,7 @@ - + @@ -1299,7 +1287,7 @@ - + @@ -1335,7 +1323,7 @@ - + @@ -1343,11 +1331,7 @@ - - - - - + @@ -1402,12 +1386,8 @@ - - - - - - + + @@ -1495,7 +1475,7 @@ - + @@ -1638,8 +1618,8 @@ - - + + @@ -1654,8 +1634,8 @@ - - + + @@ -1691,7 +1671,7 @@ - + @@ -1743,7 +1723,7 @@ - + @@ -1823,11 +1803,11 @@ - + - + @@ -1855,7 +1835,7 @@ - + @@ -1903,7 +1883,7 @@ - + @@ -1919,7 +1899,7 @@ - + @@ -1975,7 +1955,7 @@ - + @@ -2013,10 +1993,6 @@ - - - - @@ -2101,10 +2077,6 @@ - - - - @@ -2131,7 +2103,7 @@ - + @@ -2155,7 +2127,7 @@ - + @@ -2163,7 +2135,7 @@ - + @@ -2243,7 +2215,7 @@ - + @@ -2463,7 +2435,7 @@ - + @@ -2575,7 +2547,7 @@ - + @@ -2603,7 +2575,7 @@ - + @@ -2627,7 +2599,7 @@ - + @@ -2739,7 +2711,7 @@ - + @@ -2766,16 +2738,12 @@ - - - - - - + + - + @@ -2815,7 +2783,7 @@ - + @@ -2827,7 +2795,7 @@ - + @@ -2921,25 +2889,21 @@ - - - - - + - - + + @@ -2955,7 +2919,7 @@ - + @@ -3063,7 +3027,7 @@ - + @@ -3115,7 +3079,7 @@ - + @@ -3127,7 +3091,7 @@ - + @@ -3135,7 +3099,7 @@ - + @@ -3179,7 +3143,7 @@ - + @@ -3215,7 +3179,7 @@ - + @@ -3223,7 +3187,7 @@ - + @@ -3350,8 +3314,8 @@ - - + + @@ -3423,7 +3387,7 @@ - + @@ -3479,7 +3443,7 @@ - + @@ -3531,7 +3495,7 @@ - + @@ -3539,11 +3503,11 @@ - + - + @@ -3555,7 +3519,7 @@ - + @@ -3563,7 +3527,7 @@ - + @@ -3667,7 +3631,7 @@ - + @@ -3717,13 +3681,9 @@ - - - - - + @@ -3747,11 +3707,11 @@ - + - + @@ -3855,7 +3815,7 @@ - + @@ -3905,10 +3865,6 @@ - - - - @@ -4191,7 +4147,7 @@ - + @@ -4223,7 +4179,7 @@ - + @@ -4233,10 +4189,6 @@ - - - - @@ -4431,7 +4383,7 @@ - + @@ -4487,7 +4439,7 @@ - + @@ -4499,14 +4451,14 @@ - + - + @@ -4567,7 +4519,7 @@ - + @@ -4577,10 +4529,6 @@ - - - - @@ -4671,7 +4619,7 @@ - + @@ -4687,7 +4635,7 @@ - + @@ -4799,7 +4747,7 @@ - + @@ -4807,7 +4755,7 @@ - + @@ -4937,13 +4885,9 @@ - - - - - + @@ -4975,7 +4919,7 @@ - + @@ -4995,7 +4939,7 @@ - + @@ -5021,10 +4965,6 @@ - - - - @@ -5091,7 +5031,7 @@ - + @@ -5239,7 +5179,7 @@ - + @@ -5287,11 +5227,7 @@ - - - - - + @@ -5335,7 +5271,7 @@ - + @@ -5343,7 +5279,7 @@ - + @@ -5359,11 +5295,11 @@ - + - + @@ -5399,7 +5335,7 @@ - + @@ -5431,7 +5367,7 @@ - + @@ -5439,7 +5375,7 @@ - + @@ -5555,7 +5491,7 @@ - + @@ -5727,7 +5663,7 @@ - + @@ -5770,7 +5706,7 @@ - + @@ -5866,8 +5802,8 @@ - - + + @@ -5947,7 +5883,7 @@ - + @@ -5963,7 +5899,7 @@ - + @@ -6089,17 +6025,13 @@ - - - - - + @@ -6107,7 +6039,7 @@ - + @@ -6171,7 +6103,7 @@ - + @@ -6287,7 +6219,7 @@ - + @@ -6363,7 +6295,7 @@ - + @@ -6371,7 +6303,7 @@ - + @@ -6407,7 +6339,7 @@ - + @@ -6659,7 +6591,7 @@ - + @@ -6683,7 +6615,7 @@ - + @@ -6821,10 +6753,6 @@ - - - - @@ -6835,7 +6763,7 @@ - + @@ -6875,7 +6803,7 @@ - + @@ -6915,7 +6843,7 @@ - + @@ -6927,7 +6855,7 @@ - + @@ -6967,7 +6895,7 @@ - + @@ -7247,7 +7175,7 @@ - + @@ -7299,7 +7227,7 @@ - + @@ -7331,7 +7259,7 @@ - + @@ -7355,7 +7283,7 @@ - + @@ -7409,10 +7337,6 @@ - - - - @@ -7439,7 +7363,7 @@ - + @@ -7511,11 +7435,11 @@ - + - + @@ -7523,7 +7447,7 @@ - + @@ -7651,7 +7575,7 @@ - + @@ -7710,8 +7634,8 @@ - - + + @@ -7719,7 +7643,7 @@ - + @@ -7739,11 +7663,11 @@ - + - + @@ -7751,7 +7675,7 @@ - + @@ -7775,7 +7699,7 @@ - + @@ -7863,7 +7787,7 @@ - + @@ -7939,7 +7863,7 @@ - + @@ -7959,7 +7883,7 @@ - + @@ -8007,7 +7931,7 @@ - + @@ -8031,7 +7955,7 @@ - + @@ -8051,7 +7975,7 @@ - + @@ -8063,7 +7987,7 @@ - + @@ -8151,7 +8075,7 @@ - + @@ -8171,7 +8095,7 @@ - + @@ -8187,7 +8111,7 @@ - + @@ -8197,10 +8121,6 @@ - - - - @@ -8223,7 +8143,7 @@ - + @@ -8287,7 +8207,7 @@ - + @@ -8307,15 +8227,15 @@ - + - + - + @@ -8331,7 +8251,7 @@ - + @@ -8355,7 +8275,7 @@ - + @@ -8379,7 +8299,7 @@ - + @@ -8459,7 +8379,7 @@ - + @@ -8467,11 +8387,11 @@ - + - + @@ -8519,7 +8439,7 @@ - + @@ -8611,7 +8531,7 @@ - + @@ -8639,7 +8559,7 @@ - + @@ -8707,7 +8627,7 @@ - + @@ -8739,11 +8659,11 @@ - + - + @@ -8787,7 +8707,7 @@ - + @@ -8889,10 +8809,6 @@ - - - - @@ -8915,7 +8831,7 @@ - + @@ -8935,7 +8851,7 @@ - + @@ -9079,7 +8995,7 @@ - + @@ -9107,7 +9023,7 @@ - + @@ -9119,7 +9035,7 @@ - + @@ -9175,7 +9091,7 @@ - + @@ -9191,11 +9107,11 @@ - + - + @@ -9226,8 +9142,8 @@ - - + + @@ -9337,25 +9253,17 @@ - - - - - - - - - + @@ -9367,7 +9275,7 @@ - + @@ -9399,7 +9307,7 @@ - + @@ -9435,7 +9343,7 @@ - + @@ -9459,11 +9367,11 @@ - + - + @@ -9495,7 +9403,7 @@ - + @@ -9571,7 +9479,7 @@ - + @@ -9687,7 +9595,7 @@ - + @@ -9735,7 +9643,7 @@ - + @@ -9746,7 +9654,7 @@ - + @@ -9755,7 +9663,7 @@ - + @@ -9805,17 +9713,13 @@ - - - - - + @@ -9823,7 +9727,7 @@ - + @@ -9951,7 +9855,7 @@ - + @@ -10018,8 +9922,8 @@ - - + + @@ -10182,12 +10086,8 @@ - - - - - - + + @@ -10202,8 +10102,8 @@ - - + + @@ -10213,10 +10113,6 @@ - - - - @@ -10243,7 +10139,7 @@ - + @@ -10279,7 +10175,7 @@ - + @@ -10391,7 +10287,7 @@ - + @@ -10415,7 +10311,7 @@ - + @@ -10667,7 +10563,7 @@ - + @@ -10807,11 +10703,11 @@ - + - + @@ -10906,7 +10802,7 @@ - + @@ -10935,7 +10831,7 @@ - + @@ -10991,7 +10887,7 @@ - + @@ -11149,10 +11045,6 @@ - - - - @@ -11162,8 +11054,8 @@ - - + + @@ -11175,7 +11067,7 @@ - + @@ -11279,7 +11171,7 @@ - + @@ -11323,7 +11215,7 @@ - + @@ -11333,10 +11225,6 @@ - - - - @@ -11359,7 +11247,7 @@ - + @@ -11435,7 +11323,7 @@ - + @@ -11467,7 +11355,7 @@ - + @@ -11487,7 +11375,7 @@ - + @@ -11499,7 +11387,7 @@ - + @@ -11522,8 +11410,8 @@ - - + + @@ -11539,7 +11427,7 @@ - + @@ -11689,10 +11577,6 @@ - - - - @@ -11747,7 +11631,7 @@ - + @@ -11898,8 +11782,8 @@ - - + + @@ -11955,7 +11839,7 @@ - + @@ -12031,7 +11915,7 @@ - + @@ -12058,8 +11942,8 @@ - - + + @@ -12091,7 +11975,7 @@ - + @@ -12239,7 +12123,7 @@ - + @@ -12275,7 +12159,7 @@ - + @@ -12287,7 +12171,7 @@ - + @@ -12331,11 +12215,11 @@ - + - + @@ -12351,7 +12235,7 @@ - + @@ -12375,7 +12259,7 @@ - + @@ -12383,11 +12267,11 @@ - + - + @@ -12419,7 +12303,7 @@ - + @@ -12479,7 +12363,7 @@ - + @@ -12583,7 +12467,7 @@ - + @@ -12619,7 +12503,7 @@ - + @@ -12651,7 +12535,7 @@ - + @@ -12679,7 +12563,7 @@ - + @@ -12703,19 +12587,15 @@ - + - - - - - - + + @@ -12782,8 +12662,8 @@ - - + + @@ -12823,7 +12703,7 @@ - + @@ -12843,7 +12723,7 @@ - + @@ -12867,7 +12747,7 @@ - + @@ -12939,7 +12819,7 @@ - + @@ -12971,7 +12851,7 @@ - + @@ -13001,10 +12881,6 @@ - - - - @@ -13087,7 +12963,7 @@ - + @@ -13275,7 +13151,7 @@ - + @@ -13323,11 +13199,11 @@ - + - + @@ -13367,7 +13243,7 @@ - + @@ -13415,7 +13291,7 @@ - + @@ -13423,7 +13299,7 @@ - + @@ -13431,7 +13307,7 @@ - + @@ -13495,7 +13371,7 @@ - + @@ -13559,7 +13435,7 @@ - + @@ -13567,7 +13443,7 @@ - + @@ -13599,7 +13475,7 @@ - + @@ -13607,7 +13483,7 @@ - + @@ -13625,10 +13501,6 @@ - - - - @@ -13667,7 +13539,7 @@ - + @@ -13774,7 +13646,7 @@ - + @@ -13851,7 +13723,7 @@ - + @@ -13862,7 +13734,7 @@ - + @@ -13943,7 +13815,7 @@ - + @@ -14051,7 +13923,7 @@ - + @@ -14111,7 +13983,7 @@ - + @@ -14122,8 +13994,8 @@ - - + + @@ -14169,10 +14041,6 @@ - - - - @@ -14181,10 +14049,6 @@ - - - - @@ -14211,11 +14075,11 @@ - + - + @@ -14231,7 +14095,7 @@ - + @@ -14371,7 +14235,7 @@ - + @@ -14515,7 +14379,7 @@ - + @@ -14611,7 +14475,7 @@ - + @@ -14623,16 +14487,12 @@ - + - - - - @@ -14683,7 +14543,7 @@ - + @@ -14693,10 +14553,6 @@ - - - - @@ -14715,7 +14571,7 @@ - + @@ -14745,10 +14601,6 @@ - - - - @@ -14762,8 +14614,8 @@ - - + + @@ -14783,7 +14635,7 @@ - + @@ -14815,7 +14667,7 @@ - + @@ -14871,7 +14723,7 @@ - + @@ -14887,7 +14739,7 @@ - + @@ -14915,15 +14767,15 @@ - + - + - + @@ -14939,7 +14791,7 @@ - + @@ -14995,7 +14847,7 @@ - + @@ -15018,8 +14870,8 @@ - - + + @@ -15047,7 +14899,7 @@ - + @@ -15163,7 +15015,7 @@ - + @@ -15175,7 +15027,7 @@ - + @@ -15191,7 +15043,7 @@ - + @@ -15227,7 +15079,7 @@ - + @@ -15235,7 +15087,7 @@ - + @@ -15251,7 +15103,7 @@ - + @@ -15279,7 +15131,7 @@ - + @@ -15323,7 +15175,7 @@ - + @@ -15387,7 +15239,7 @@ - + @@ -15399,11 +15251,11 @@ - + - + @@ -15419,7 +15271,7 @@ - + @@ -15791,7 +15643,7 @@ - + @@ -15871,7 +15723,7 @@ - + @@ -15910,12 +15762,8 @@ - - - - - - + + @@ -15937,10 +15785,6 @@ - - - - @@ -15979,7 +15823,7 @@ - + @@ -16047,15 +15891,15 @@ - + - + - + @@ -16087,7 +15931,7 @@ - + @@ -16123,7 +15967,7 @@ - + @@ -16175,7 +16019,7 @@ - + @@ -16183,7 +16027,7 @@ - + @@ -16303,7 +16147,7 @@ - + @@ -16353,10 +16197,6 @@ - - - - @@ -16367,7 +16207,7 @@ - + @@ -16467,7 +16307,7 @@ - + @@ -16531,7 +16371,7 @@ - + @@ -16579,7 +16419,7 @@ - + @@ -16591,7 +16431,7 @@ - + @@ -16699,7 +16539,7 @@ - + @@ -16755,7 +16595,7 @@ - + @@ -16779,7 +16619,7 @@ - + @@ -16837,10 +16677,6 @@ - - - - @@ -16923,7 +16759,7 @@ - + @@ -16947,7 +16783,7 @@ - + @@ -16963,7 +16799,7 @@ - + @@ -17023,7 +16859,7 @@ - + @@ -17033,10 +16869,6 @@ - - - - @@ -17159,7 +16991,7 @@ - + @@ -17175,7 +17007,7 @@ - + @@ -17227,7 +17059,7 @@ - + @@ -17423,7 +17255,7 @@ - + @@ -17477,10 +17309,6 @@ - - - - @@ -17507,7 +17335,7 @@ - + @@ -17531,11 +17359,11 @@ - + - + @@ -17579,7 +17407,7 @@ - + @@ -17643,7 +17471,7 @@ - + @@ -17659,7 +17487,7 @@ - + @@ -17679,7 +17507,7 @@ - + @@ -17931,7 +17759,7 @@ - + @@ -17971,7 +17799,7 @@ - + @@ -18005,10 +17833,6 @@ - - - - @@ -18031,7 +17855,7 @@ - + @@ -18053,10 +17877,6 @@ - - - - @@ -18163,7 +17983,7 @@ - + @@ -18211,7 +18031,7 @@ - + @@ -18235,7 +18055,7 @@ - + @@ -18303,11 +18123,11 @@ - + - + @@ -18351,7 +18171,7 @@ - + @@ -18371,7 +18191,7 @@ - + @@ -18394,12 +18214,8 @@ - - - - - - + + @@ -18427,7 +18243,7 @@ - + @@ -18515,7 +18331,7 @@ - + @@ -18555,7 +18371,7 @@ - + @@ -18587,7 +18403,7 @@ - + @@ -18627,7 +18443,7 @@ - + @@ -18651,7 +18467,7 @@ - + @@ -18711,7 +18527,7 @@ - + @@ -18755,7 +18571,7 @@ - + @@ -18767,11 +18583,11 @@ - + - + @@ -18875,7 +18691,7 @@ - + @@ -18906,7 +18722,7 @@ - + @@ -18933,17 +18749,13 @@ - - - - - + @@ -18959,7 +18771,7 @@ - + @@ -18994,7 +18806,7 @@ - + @@ -19075,7 +18887,7 @@ - + @@ -19083,7 +18895,7 @@ - + @@ -19239,7 +19051,7 @@ - + @@ -19283,7 +19095,7 @@ - + @@ -19379,7 +19191,7 @@ - + @@ -19391,7 +19203,7 @@ - + @@ -19402,8 +19214,8 @@ - - + + @@ -19427,7 +19239,7 @@ - + @@ -19475,7 +19287,7 @@ - + @@ -19505,10 +19317,6 @@ - - - - @@ -19521,10 +19329,6 @@ - - - - @@ -19741,10 +19545,6 @@ - - - - @@ -19763,7 +19563,7 @@ - + @@ -19859,7 +19659,7 @@ - + @@ -19947,7 +19747,7 @@ - + @@ -19987,7 +19787,7 @@ - + @@ -19995,7 +19795,7 @@ - + @@ -20007,7 +19807,7 @@ - + @@ -20135,7 +19935,7 @@ - + @@ -20143,7 +19943,7 @@ - + @@ -20163,11 +19963,11 @@ - + - + @@ -20227,7 +20027,7 @@ - + @@ -20275,7 +20075,7 @@ - + @@ -20299,15 +20099,15 @@ - + - + - + @@ -20387,7 +20187,7 @@ - + @@ -20455,7 +20255,7 @@ - + @@ -20535,7 +20335,7 @@ - + @@ -20601,17 +20401,13 @@ - - - - - + @@ -20637,13 +20433,9 @@ - - - - - + @@ -20663,7 +20455,7 @@ - + @@ -20679,7 +20471,7 @@ - + @@ -20690,12 +20482,12 @@ - + - + @@ -20939,11 +20731,11 @@ - + - + @@ -20955,7 +20747,7 @@ - + @@ -20995,7 +20787,7 @@ - + @@ -21127,11 +20919,7 @@ - - - - - + @@ -21203,7 +20991,7 @@ - + @@ -21235,7 +21023,7 @@ - + @@ -21395,7 +21183,7 @@ - + @@ -21507,7 +21295,7 @@ - + @@ -21547,11 +21335,11 @@ - + - + @@ -21563,7 +21351,7 @@ - + @@ -21575,7 +21363,7 @@ - + @@ -21587,7 +21375,7 @@ - + @@ -21595,7 +21383,7 @@ - + @@ -21667,11 +21455,11 @@ - + - + @@ -21695,7 +21483,7 @@ - + @@ -21707,7 +21495,7 @@ - + @@ -21983,7 +21771,7 @@ - + @@ -22103,7 +21891,7 @@ - + @@ -22323,7 +22111,7 @@ - + @@ -22379,7 +22167,7 @@ - + @@ -22395,7 +22183,7 @@ - + @@ -22423,7 +22211,7 @@ - + @@ -22483,7 +22271,7 @@ - + @@ -22531,11 +22319,11 @@ - + - + @@ -22551,7 +22339,7 @@ - + @@ -22563,7 +22351,7 @@ - + @@ -22635,7 +22423,7 @@ - + @@ -22651,7 +22439,7 @@ - + @@ -22735,7 +22523,7 @@ - + @@ -22835,7 +22623,7 @@ - + @@ -22859,7 +22647,7 @@ - + @@ -22927,7 +22715,7 @@ - + @@ -23027,7 +22815,7 @@ - + @@ -23087,7 +22875,7 @@ - + @@ -23119,7 +22907,7 @@ - + @@ -23131,7 +22919,7 @@ - + @@ -23237,10 +23025,6 @@ - - - - @@ -23269,10 +23053,6 @@ - - - - @@ -23299,7 +23079,7 @@ - + @@ -23399,7 +23179,7 @@ - + @@ -23425,10 +23205,6 @@ - - - - @@ -23611,7 +23387,7 @@ - + @@ -23690,12 +23466,8 @@ - - - - - - + + @@ -23763,7 +23535,7 @@ - + @@ -23819,7 +23591,7 @@ - + @@ -23855,7 +23627,7 @@ - + @@ -23883,7 +23655,7 @@ - + @@ -23891,7 +23663,7 @@ - + @@ -23939,7 +23711,7 @@ - + @@ -23947,7 +23719,7 @@ - + @@ -23991,7 +23763,7 @@ - + @@ -24083,7 +23855,7 @@ - + @@ -24299,7 +24071,7 @@ - + @@ -24407,7 +24179,7 @@ - + @@ -24419,7 +24191,7 @@ - + @@ -24471,7 +24243,7 @@ - + @@ -24527,7 +24299,7 @@ - + @@ -24563,7 +24335,7 @@ - + @@ -24582,8 +24354,8 @@ - - + + @@ -24687,7 +24459,7 @@ - + @@ -24711,7 +24483,7 @@ - + @@ -24737,10 +24509,6 @@ - - - - @@ -24751,7 +24519,7 @@ - + @@ -24783,7 +24551,7 @@ - + @@ -24839,7 +24607,7 @@ - + @@ -24867,10 +24635,10 @@ - + - + @@ -25026,8 +24794,8 @@ - - + + @@ -25079,7 +24847,7 @@ - + @@ -25123,7 +24891,7 @@ - + @@ -25157,10 +24925,6 @@ - - - - @@ -25175,15 +24939,11 @@ - + - - - - - - + + @@ -25243,7 +25003,7 @@ - + @@ -25343,7 +25103,7 @@ - + @@ -25371,7 +25131,7 @@ - + @@ -25423,7 +25183,7 @@ - + @@ -25439,7 +25199,7 @@ - + @@ -25475,7 +25235,7 @@ - + @@ -25494,7 +25254,7 @@ - + @@ -25631,7 +25391,7 @@ - + @@ -25671,7 +25431,7 @@ - + @@ -25834,12 +25594,8 @@ - - - - - - + + @@ -25847,7 +25603,7 @@ - + @@ -25907,7 +25663,7 @@ - + @@ -25997,10 +25753,6 @@ - - - - @@ -26015,7 +25767,7 @@ - + @@ -26039,7 +25791,7 @@ - + @@ -26111,7 +25863,7 @@ - + @@ -26122,8 +25874,8 @@ - - + + @@ -26183,11 +25935,11 @@ - + - + @@ -26207,7 +25959,7 @@ - + @@ -26219,7 +25971,7 @@ - + @@ -26403,11 +26155,11 @@ - + - + @@ -26475,7 +26227,7 @@ - + @@ -26523,7 +26275,7 @@ - + @@ -26579,7 +26331,7 @@ - + @@ -26683,7 +26435,7 @@ - + @@ -26706,8 +26458,8 @@ - - + + @@ -26723,7 +26475,7 @@ - + @@ -26739,15 +26491,15 @@ - + - - + + @@ -26791,7 +26543,7 @@ - + @@ -26919,7 +26671,7 @@ - + @@ -26975,7 +26727,7 @@ - + @@ -26987,7 +26739,7 @@ - + @@ -27019,7 +26771,7 @@ - + @@ -27039,7 +26791,7 @@ - + @@ -27058,24 +26810,24 @@ - - + + - - + + - - + + @@ -27214,12 +26966,12 @@ - + - + @@ -27263,7 +27015,7 @@ - + @@ -27387,7 +27139,7 @@ - + @@ -27411,7 +27163,7 @@ - + @@ -27467,11 +27219,11 @@ - + - + @@ -27489,10 +27241,6 @@ - - - - @@ -27615,7 +27363,7 @@ - + @@ -27623,7 +27371,7 @@ - + @@ -27683,7 +27431,7 @@ - + @@ -27707,11 +27455,11 @@ - + - + @@ -27975,7 +27723,7 @@ - + @@ -27991,7 +27739,7 @@ - + @@ -28023,7 +27771,7 @@ - + @@ -28046,8 +27794,8 @@ - - + + @@ -28063,7 +27811,7 @@ - + @@ -28175,7 +27923,7 @@ - + @@ -28183,7 +27931,7 @@ - + @@ -28229,10 +27977,6 @@ - - - - @@ -28367,7 +28111,7 @@ - + @@ -28395,7 +28139,7 @@ - + @@ -28419,7 +28163,7 @@ - + @@ -28427,7 +28171,7 @@ - + @@ -28499,7 +28243,7 @@ - + @@ -28523,7 +28267,7 @@ - + @@ -28563,7 +28307,7 @@ - + @@ -28607,7 +28351,7 @@ - + @@ -28630,8 +28374,8 @@ - - + + @@ -28651,7 +28395,7 @@ - + @@ -28699,7 +28443,7 @@ - + @@ -28723,7 +28467,7 @@ - + @@ -28731,7 +28475,7 @@ - + @@ -28741,10 +28485,6 @@ - - - - @@ -28771,7 +28511,7 @@ - + @@ -28799,7 +28539,7 @@ - + @@ -28811,16 +28551,12 @@ - + - - - - @@ -28831,7 +28567,7 @@ - + @@ -28881,10 +28617,6 @@ - - - - @@ -28959,7 +28691,7 @@ - + @@ -29135,7 +28867,7 @@ - + @@ -29175,7 +28907,7 @@ - + @@ -29215,11 +28947,11 @@ - + - + @@ -29267,7 +28999,7 @@ - + @@ -29301,10 +29033,6 @@ - - - - @@ -29327,7 +29055,7 @@ - + @@ -29359,7 +29087,7 @@ - + @@ -29367,7 +29095,7 @@ - + @@ -29578,12 +29306,8 @@ - - - - - - + + @@ -29611,7 +29335,7 @@ - + @@ -29633,10 +29357,6 @@ - - - - @@ -29687,7 +29407,7 @@ - + @@ -29727,7 +29447,7 @@ - + @@ -29743,7 +29463,7 @@ - + @@ -29795,7 +29515,7 @@ - + @@ -29839,7 +29559,7 @@ - + @@ -29909,10 +29629,6 @@ - - - - @@ -29959,7 +29675,7 @@ - + @@ -30185,10 +29901,6 @@ - - - - @@ -30299,7 +30011,7 @@ - + @@ -30311,11 +30023,11 @@ - + - + @@ -30339,7 +30051,7 @@ - + @@ -30391,7 +30103,7 @@ - + @@ -30431,7 +30143,7 @@ - + @@ -30455,7 +30167,7 @@ - + @@ -30475,7 +30187,7 @@ - + @@ -30535,7 +30247,7 @@ - + @@ -30599,7 +30311,7 @@ - + @@ -30727,7 +30439,7 @@ - + @@ -30799,7 +30511,7 @@ - + @@ -30851,7 +30563,7 @@ - + @@ -30899,7 +30611,7 @@ - + @@ -30907,7 +30619,7 @@ - + @@ -31031,7 +30743,7 @@ - + @@ -31099,7 +30811,7 @@ - + @@ -31115,7 +30827,7 @@ - + @@ -31138,8 +30850,8 @@ - - + + @@ -31403,7 +31115,7 @@ - + @@ -31463,7 +31175,7 @@ - + @@ -31519,7 +31231,7 @@ - + @@ -31571,7 +31283,7 @@ - + @@ -31643,7 +31355,7 @@ - + @@ -31675,7 +31387,7 @@ - + @@ -31709,10 +31421,6 @@ - - - - @@ -31791,7 +31499,7 @@ - + @@ -31839,7 +31547,7 @@ - + @@ -31891,7 +31599,7 @@ - + @@ -31949,21 +31657,13 @@ - - - - - - - - - + @@ -31971,7 +31671,7 @@ - + @@ -32023,7 +31723,7 @@ - + @@ -32182,8 +31882,8 @@ - - + + @@ -32339,11 +32039,11 @@ - + - + @@ -32379,7 +32079,7 @@ - + @@ -32429,17 +32129,13 @@ - - - - - + @@ -32483,7 +32179,7 @@ - + @@ -32535,7 +32231,7 @@ - + @@ -32629,10 +32325,6 @@ - - - - @@ -32699,7 +32391,7 @@ - + @@ -32807,11 +32499,11 @@ - + - + @@ -32831,7 +32523,7 @@ - + @@ -32955,7 +32647,7 @@ - + @@ -32981,10 +32673,6 @@ - - - - @@ -33178,8 +32866,8 @@ - - + + @@ -33191,7 +32879,7 @@ - + @@ -33251,7 +32939,7 @@ - + @@ -33351,7 +33039,7 @@ - + @@ -33363,7 +33051,7 @@ - + @@ -33415,7 +33103,7 @@ - + @@ -33439,7 +33127,7 @@ - + @@ -33487,7 +33175,7 @@ - + @@ -33603,7 +33291,7 @@ - + @@ -33675,7 +33363,7 @@ - + @@ -33759,7 +33447,7 @@ - + @@ -33815,7 +33503,7 @@ - + @@ -33841,10 +33529,6 @@ - - - - @@ -34069,10 +33753,6 @@ - - - - @@ -34291,7 +33971,7 @@ - + @@ -34315,7 +33995,7 @@ - + @@ -34431,7 +34111,7 @@ - + @@ -34527,7 +34207,7 @@ - + @@ -34571,7 +34251,7 @@ - + @@ -34675,7 +34355,7 @@ - + @@ -34711,7 +34391,7 @@ - + @@ -34867,7 +34547,7 @@ - + @@ -34891,7 +34571,7 @@ - + @@ -34911,7 +34591,7 @@ - + @@ -34929,10 +34609,6 @@ - - - - @@ -35063,7 +34739,7 @@ - + @@ -35123,7 +34799,7 @@ - + @@ -35131,7 +34807,7 @@ - + @@ -35167,7 +34843,7 @@ - + @@ -35175,7 +34851,7 @@ - + @@ -35187,7 +34863,7 @@ - + @@ -35215,7 +34891,7 @@ - + @@ -35223,7 +34899,7 @@ - + @@ -35239,7 +34915,7 @@ - + @@ -35299,11 +34975,11 @@ - + - + @@ -35483,7 +35159,7 @@ - + @@ -35527,7 +35203,7 @@ - + @@ -35719,7 +35395,7 @@ - + @@ -35929,10 +35605,6 @@ - - - - @@ -36015,7 +35687,7 @@ - + @@ -36050,8 +35722,8 @@ - - + + @@ -36203,7 +35875,7 @@ - + @@ -36338,8 +36010,8 @@ - - + + @@ -36371,7 +36043,7 @@ - + @@ -36463,7 +36135,7 @@ - + @@ -36489,17 +36161,13 @@ - - - - - + @@ -36514,8 +36182,8 @@ - - + + @@ -36539,7 +36207,7 @@ - + @@ -36559,7 +36227,7 @@ - + @@ -36591,7 +36259,7 @@ - + @@ -36615,7 +36283,7 @@ - + @@ -36679,7 +36347,7 @@ - + @@ -36723,7 +36391,7 @@ - + @@ -36731,7 +36399,7 @@ - + @@ -36759,7 +36427,7 @@ - + @@ -36807,7 +36475,7 @@ - + @@ -36879,7 +36547,7 @@ - + @@ -36907,7 +36575,7 @@ - + @@ -36951,7 +36619,7 @@ - + @@ -37113,17 +36781,13 @@ - - - - - + @@ -37273,10 +36937,6 @@ - - - - @@ -37315,7 +36975,7 @@ - + @@ -37363,7 +37023,7 @@ - + @@ -37435,7 +37095,7 @@ - + @@ -37583,7 +37243,7 @@ - + @@ -37627,7 +37287,7 @@ - + @@ -37643,7 +37303,7 @@ - + @@ -37895,7 +37555,7 @@ - + @@ -37907,7 +37567,7 @@ - + @@ -37951,7 +37611,7 @@ - + @@ -37963,7 +37623,7 @@ - + @@ -38007,7 +37667,7 @@ - + @@ -38067,7 +37727,7 @@ - + @@ -38119,7 +37779,7 @@ - + @@ -38127,7 +37787,7 @@ - + @@ -38139,7 +37799,7 @@ - + @@ -38231,7 +37891,7 @@ - + @@ -38311,7 +37971,7 @@ - + @@ -38331,7 +37991,7 @@ - + @@ -38363,7 +38023,7 @@ - + @@ -38563,7 +38223,7 @@ - + @@ -38695,7 +38355,7 @@ - + @@ -38743,7 +38403,7 @@ - + @@ -38775,7 +38435,7 @@ - + @@ -38827,7 +38487,7 @@ - + @@ -38835,7 +38495,7 @@ - + @@ -38947,7 +38607,7 @@ - + @@ -38955,7 +38615,7 @@ - + @@ -39039,7 +38699,7 @@ - + @@ -39061,10 +38721,6 @@ - - - - @@ -39147,7 +38803,7 @@ - + @@ -39239,7 +38895,7 @@ - + @@ -39307,7 +38963,7 @@ - + @@ -39363,7 +39019,7 @@ - + @@ -39549,13 +39205,9 @@ - - - - - + @@ -39590,7 +39242,7 @@ - + @@ -39639,7 +39291,7 @@ - + @@ -39731,7 +39383,7 @@ - + @@ -39783,7 +39435,7 @@ - + @@ -39855,7 +39507,7 @@ - + @@ -39871,7 +39523,7 @@ - + @@ -39915,7 +39567,7 @@ - + @@ -39975,7 +39627,7 @@ - + @@ -40015,7 +39667,7 @@ - + @@ -40029,13 +39681,9 @@ - - - - - + @@ -40115,7 +39763,7 @@ - + @@ -40303,7 +39951,7 @@ - + @@ -40347,7 +39995,7 @@ - + @@ -40383,7 +40031,7 @@ - + @@ -40419,7 +40067,7 @@ - + @@ -40519,11 +40167,11 @@ - + - + @@ -40587,11 +40235,11 @@ - + - + @@ -40609,10 +40257,6 @@ - - - - @@ -40675,7 +40319,7 @@ - + @@ -40771,7 +40415,7 @@ - + @@ -40871,7 +40515,7 @@ - + @@ -40951,7 +40595,7 @@ - + @@ -41003,7 +40647,7 @@ - + @@ -41055,7 +40699,7 @@ - + @@ -41099,7 +40743,7 @@ - + @@ -41151,11 +40795,11 @@ - + - + @@ -41367,7 +41011,7 @@ - + @@ -41447,7 +41091,7 @@ - + @@ -41455,7 +41099,7 @@ - + @@ -41502,8 +41146,8 @@ - - + + @@ -41606,8 +41250,8 @@ - - + + @@ -41691,7 +41335,7 @@ - + @@ -41825,13 +41469,9 @@ - - - - - + @@ -41911,7 +41551,7 @@ - + @@ -42015,7 +41655,7 @@ - + @@ -42115,7 +41755,7 @@ - + @@ -42203,7 +41843,7 @@ - + @@ -42239,7 +41879,7 @@ - + @@ -42327,7 +41967,7 @@ - + @@ -42379,7 +42019,7 @@ - + @@ -42443,7 +42083,7 @@ - + @@ -42507,7 +42147,7 @@ - + @@ -42571,7 +42211,7 @@ - + @@ -42627,7 +42267,7 @@ - + @@ -42707,7 +42347,7 @@ - + @@ -42787,11 +42427,11 @@ - + - + @@ -42799,7 +42439,7 @@ - + @@ -42883,7 +42523,7 @@ - + @@ -42903,7 +42543,7 @@ - + @@ -43063,7 +42703,7 @@ - + @@ -43275,7 +42915,7 @@ - + @@ -43307,7 +42947,7 @@ - + @@ -43331,11 +42971,11 @@ - + - + @@ -43379,7 +43019,7 @@ - + @@ -43391,7 +43031,7 @@ - + @@ -43511,7 +43151,7 @@ - + @@ -43543,7 +43183,7 @@ - + @@ -43683,7 +43323,7 @@ - + @@ -43695,7 +43335,7 @@ - + @@ -43783,7 +43423,7 @@ - + @@ -43807,7 +43447,7 @@ - + @@ -43839,7 +43479,7 @@ - + @@ -43890,7 +43530,7 @@ - + @@ -43967,7 +43607,7 @@ - + @@ -44087,7 +43727,7 @@ - + @@ -44131,7 +43771,7 @@ - + @@ -44143,7 +43783,7 @@ - + @@ -44171,7 +43811,7 @@ - + @@ -44235,7 +43875,7 @@ - + @@ -44255,7 +43895,7 @@ - + @@ -44333,10 +43973,6 @@ - - - - @@ -44395,7 +44031,7 @@ - + @@ -44555,7 +44191,7 @@ - + @@ -44563,7 +44199,7 @@ - + @@ -44775,7 +44411,7 @@ - + @@ -44795,7 +44431,7 @@ - + @@ -44823,7 +44459,7 @@ - + @@ -44851,7 +44487,7 @@ - + @@ -44919,7 +44555,7 @@ - + @@ -45007,7 +44643,7 @@ - + @@ -45031,7 +44667,7 @@ - + @@ -45051,7 +44687,7 @@ - + @@ -45099,7 +44735,7 @@ - + @@ -45138,12 +44774,8 @@ - - - - - - + + @@ -45155,7 +44787,7 @@ - + @@ -45218,12 +44850,8 @@ - - - - - - + + @@ -45249,10 +44877,6 @@ - - - - @@ -45390,8 +45014,8 @@ - - + + @@ -45486,12 +45110,8 @@ - - - - - - + + @@ -45523,7 +45143,7 @@ - + @@ -45563,7 +45183,7 @@ - + @@ -45611,7 +45231,7 @@ - + @@ -45643,7 +45263,7 @@ - + @@ -45759,7 +45379,7 @@ - + @@ -45783,7 +45403,7 @@ - + @@ -45843,7 +45463,7 @@ - + @@ -45955,7 +45575,7 @@ - + @@ -45963,7 +45583,7 @@ - + @@ -45983,19 +45603,15 @@ - + - - - - - - + + @@ -46063,7 +45679,7 @@ - + @@ -46107,7 +45723,7 @@ - + @@ -46150,8 +45766,8 @@ - - + + @@ -46183,7 +45799,7 @@ - + @@ -46207,7 +45823,7 @@ - + @@ -46227,7 +45843,7 @@ - + @@ -46235,7 +45851,7 @@ - + @@ -46307,7 +45923,7 @@ - + @@ -46343,7 +45959,7 @@ - + @@ -46426,7 +46042,7 @@ - + @@ -46447,7 +46063,7 @@ - + @@ -46471,7 +46087,7 @@ - + @@ -46531,7 +46147,7 @@ - + @@ -46759,7 +46375,7 @@ - + @@ -46843,7 +46459,7 @@ - + @@ -46863,7 +46479,7 @@ - + @@ -46879,7 +46495,7 @@ - + @@ -46975,7 +46591,7 @@ - + @@ -47035,7 +46651,7 @@ - + @@ -47047,7 +46663,7 @@ - + @@ -47135,7 +46751,7 @@ - + @@ -47183,7 +46799,7 @@ - + @@ -47209,10 +46825,6 @@ - - - - @@ -47245,9 +46857,5 @@ - - - -