From 0929b20ba1c3055bd9125151134c265c09696039 Mon Sep 17 00:00:00 2001 From: parax0 Date: Thu, 1 Sep 2016 00:24:46 -0600 Subject: [PATCH] Renamed file properties to asset properties and modified asset properties to store a CAssetID instead of a CResourceInfo --- src/Core/CAreaAttributes.cpp | 4 +- src/Core/Core.pro | 1 - src/Core/GameProject/CDependencyTree.cpp | 4 +- src/Core/Resource/CAnimationParameters.cpp | 46 +- src/Core/Resource/CAnimationParameters.h | 11 +- src/Core/Resource/CResourceInfo.h | 88 ---- src/Core/Resource/Cooker/CScriptCooker.cpp | 9 +- src/Core/Resource/Cooker/CTemplateWriter.cpp | 20 +- src/Core/Resource/Factory/CScriptLoader.cpp | 37 +- src/Core/Resource/Factory/CTemplateLoader.cpp | 16 +- src/Core/Resource/Script/CScriptTemplate.cpp | 11 +- src/Core/Resource/Script/EPropertyType.h | 2 +- src/Core/Resource/Script/IProperty.h | 8 +- .../Resource/Script/IPropertyTemplate.cpp | 4 +- src/Core/Resource/Script/IPropertyTemplate.h | 22 +- src/Core/Resource/Script/IPropertyValue.h | 10 +- src/Core/Scene/CScriptAttachNode.cpp | 4 +- src/Core/Scene/CScriptNode.cpp | 8 +- .../ScriptExtra/CDamageableTriggerExtra.cpp | 4 +- .../ScriptExtra/CDamageableTriggerExtra.h | 2 +- src/Core/ScriptExtra/CDoorExtra.cpp | 4 +- src/Core/ScriptExtra/CDoorExtra.h | 2 +- .../ScriptExtra/CPointOfInterestExtra.cpp | 6 +- src/Core/ScriptExtra/CPointOfInterestExtra.h | 2 +- src/Editor/Editor.pro | 2 - src/Editor/PropertyEdit/CPropertyDelegate.cpp | 38 +- src/Editor/PropertyEdit/CPropertyModel.cpp | 2 +- src/Editor/PropertyEdit/CPropertyView.cpp | 2 +- src/Editor/Widgets/WAnimParamsEditor.cpp | 240 ---------- src/Editor/Widgets/WAnimParamsEditor.h | 50 -- src/Editor/Widgets/WResourceSelector.cpp | 215 +++------ src/Editor/Widgets/WResourceSelector.h | 29 +- src/Editor/WorldEditor/CWorldEditor.cpp | 6 +- templates/dkcr/Script/AVIS.xml | 4 +- templates/dkcr/Script/Actor.xml | 4 +- templates/dkcr/Script/AreaAttributes.xml | 2 +- templates/dkcr/Script/AreaNode.xml | 14 +- templates/dkcr/Script/AreaPath.xml | 8 +- templates/dkcr/Script/BarrelBalloon.xml | 8 +- templates/dkcr/Script/BarrelCannon.xml | 6 +- templates/dkcr/Script/BeatUpHandler.xml | 2 +- templates/dkcr/Script/BirdBoss.xml | 8 +- templates/dkcr/Script/BouncyTire.xml | 6 +- templates/dkcr/Script/Cable.xml | 4 +- .../dkcr/Script/CameraFilterKeyframe.xml | 4 +- templates/dkcr/Script/CameraShaker.xml | 2 +- templates/dkcr/Script/Credits.xml | 6 +- templates/dkcr/Script/Debris.xml | 12 +- templates/dkcr/Script/DepthOfFieldTuner.xml | 2 +- templates/dkcr/Script/Effect.xml | 2 +- templates/dkcr/Script/FactorySwitch.xml | 8 +- templates/dkcr/Script/GenericCreature.xml | 26 +- templates/dkcr/Script/GuiMenu.xml | 2 +- templates/dkcr/Script/GuiSlider.xml | 2 +- templates/dkcr/Script/HUD.xml | 186 +++---- templates/dkcr/Script/IslandArea.xml | 32 +- templates/dkcr/Script/IslandHUD.xml | 452 +++++++++--------- templates/dkcr/Script/JungleBoss1.xml | 4 +- templates/dkcr/Script/LODController.xml | 20 +- templates/dkcr/Script/MineCart.xml | 8 +- templates/dkcr/Script/MoleCart.xml | 6 +- templates/dkcr/Script/MoleTrainManager.xml | 2 +- templates/dkcr/Script/MultiModelActor.xml | 4 +- templates/dkcr/Script/MusicTrack.xml | 2 +- templates/dkcr/Script/OceanBridge.xml | 50 +- templates/dkcr/Script/OceanWave.xml | 2 +- templates/dkcr/Script/OptionalAreaAsset.xml | 2 +- templates/dkcr/Script/Peanut.xml | 18 +- templates/dkcr/Script/Pickup.xml | 30 +- templates/dkcr/Script/Platform.xml | 4 +- templates/dkcr/Script/PlayerActor.xml | 2 +- templates/dkcr/Script/PlayerRespawn.xml | 2 +- templates/dkcr/Script/PlayerToken.xml | 2 +- templates/dkcr/Script/ReactiveObject.xml | 2 +- templates/dkcr/Script/RespawnBalloon.xml | 8 +- templates/dkcr/Script/RobotChicken.xml | 2 +- templates/dkcr/Script/RobotChickenFlyer.xml | 10 +- templates/dkcr/Script/RocketBarrel.xml | 6 +- templates/dkcr/Script/Sound.xml | 2 +- templates/dkcr/Script/Spinner.xml | 2 +- templates/dkcr/Script/StreamedAudio.xml | 2 +- templates/dkcr/Script/Subtitles.xml | 2 +- templates/dkcr/Script/SuspensionBridge.xml | 4 +- templates/dkcr/Script/SwingRope.xml | 6 +- templates/dkcr/Script/TPND.xml | 4 +- templates/dkcr/Script/TextPane.xml | 2 +- templates/dkcr/Script/TippyPlatform.xml | 4 +- templates/dkcr/Script/Tutorial.xml | 4 +- .../dkcr/Script/VerticalRocketBarrel.xml | 4 +- templates/dkcr/Script/VolcanoBossBodyPart.xml | 8 +- templates/dkcr/Structs/DamageEffectData.xml | 4 +- templates/dkcr/Structs/ForestBossStructA.xml | 2 +- templates/dkcr/Structs/ForestBossStructC.xml | 4 +- .../dkcr/Structs/GenericCreatureStructA.xml | 26 +- .../dkcr/Structs/GenericCreatureStructC.xml | 2 +- templates/dkcr/Structs/IslandAreaStruct.xml | 4 +- templates/dkcr/Structs/IslandHudStruct.xml | 20 +- templates/dkcr/Structs/JungleBossStructA.xml | 2 +- templates/dkcr/Structs/LayerToggle.xml | 2 +- templates/dkcr/Structs/MinecartStructC.xml | 8 +- templates/dkcr/Structs/MinecartStructD.xml | 16 +- templates/dkcr/Structs/MoleCartStruct.xml | 2 +- .../dkcr/Structs/MultiModelActorStruct.xml | 2 +- templates/dkcr/Structs/PatternedAI.xml | 10 +- templates/dkcr/Structs/PeanutStruct.xml | 4 +- .../dkcr/Structs/ProjectileBounceData.xml | 4 +- templates/dkcr/Structs/ProjectileData.xml | 12 +- .../dkcr/Structs/ProjectileRenderData.xml | 2 +- templates/dkcr/Structs/ShadowData.xml | 2 +- templates/dkcr/Structs/TextProperties.xml | 2 +- templates/dkcr/Structs/UnknownStruct.xml | 2 +- templates/dkcr/Structs/UnknownStruct25.xml | 2 +- templates/dkcr/Structs/UnknownStruct27.xml | 22 +- templates/dkcr/Structs/UnknownStruct28.xml | 28 +- templates/dkcr/Structs/UnknownStruct29.xml | 2 +- templates/dkcr/Structs/UnknownStruct30.xml | 106 ++-- templates/dkcr/Structs/UnknownStruct31.xml | 38 +- templates/dkcr/Structs/UnknownStruct33.xml | 6 +- templates/dkcr/Structs/UnknownStruct34.xml | 10 +- templates/dkcr/Structs/UnknownStruct36.xml | 6 +- templates/dkcr/Structs/UnknownStruct39.xml | 10 +- templates/dkcr/Structs/UnknownStruct41.xml | 6 +- templates/dkcr/Structs/UnknownStruct44.xml | 60 +-- templates/dkcr/Structs/UnknownStruct45.xml | 4 +- templates/dkcr/Structs/UnknownStruct47.xml | 4 +- templates/dkcr/Structs/UnknownStruct56.xml | 2 +- templates/dkcr/Structs/UnknownStruct7.xml | 2 +- templates/mp1/Script/Actor.xml | 2 +- templates/mp1/Script/ActorContraption.xml | 2 +- templates/mp1/Script/AreaAttributes.xml | 2 +- templates/mp1/Script/AtomicAlpha.xml | 4 +- templates/mp1/Script/AtomicBeta.xml | 6 +- templates/mp1/Script/Babygoth.xml | 22 +- templates/mp1/Script/Beetle.xml | 2 +- templates/mp1/Script/BloodFlower.xml | 14 +- templates/mp1/Script/Burrower.xml | 10 +- templates/mp1/Script/CameraFilterKeyframe.xml | 2 +- templates/mp1/Script/ChozoGhost.xml | 6 +- templates/mp1/Script/DamageableTrigger.xml | 6 +- templates/mp1/Script/Debris.xml | 4 +- templates/mp1/Script/DebrisExtended.xml | 8 +- templates/mp1/Script/Drone.xml | 8 +- templates/mp1/Script/Effect.xml | 4 +- templates/mp1/Script/ElectroMagneticPulse.xml | 2 +- templates/mp1/Script/ElitePirate.xml | 18 +- templates/mp1/Script/EnergyBall.xml | 8 +- templates/mp1/Script/Eyeball.xml | 10 +- templates/mp1/Script/FishCloud.xml | 4 +- templates/mp1/Script/Flaahgra.xml | 8 +- templates/mp1/Script/FlyingPirate.xml | 14 +- templates/mp1/Script/GunTurret.xml | 18 +- templates/mp1/Script/HUDMemo.xml | 2 +- templates/mp1/Script/IceSheegoth.xml | 20 +- templates/mp1/Script/Magdolite.xml | 6 +- templates/mp1/Script/MetroidBeta.xml | 10 +- templates/mp1/Script/MetroidPrimeStage1.xml | 26 +- templates/mp1/Script/MetroidPrimeStage2.xml | 6 +- templates/mp1/Script/Midi.xml | 2 +- templates/mp1/Script/NewIntroBoss.xml | 10 +- templates/mp1/Script/OmegaPirate.xml | 24 +- templates/mp1/Script/PhazonHealingNodule.xml | 2 +- templates/mp1/Script/PhazonPool.xml | 8 +- templates/mp1/Script/Pickup.xml | 4 +- templates/mp1/Script/Platform.xml | 4 +- templates/mp1/Script/PlayerActor.xml | 2 +- templates/mp1/Script/PuddleSpore.xml | 4 +- templates/mp1/Script/PuddleToadGamma.xml | 2 +- templates/mp1/Script/Puffer.xml | 4 +- templates/mp1/Script/Ridley.xml | 42 +- templates/mp1/Script/ScriptBeam.xml | 10 +- templates/mp1/Script/Seedling.xml | 4 +- templates/mp1/Script/SpacePirate.xml | 4 +- templates/mp1/Script/SpecialFunction.xml | 2 +- templates/mp1/Script/Steam.xml | 2 +- templates/mp1/Script/Thardus.xml | 52 +- .../mp1/Script/ThardusRockProjectile.xml | 4 +- templates/mp1/Script/VisorGoo.xml | 4 +- templates/mp1/Script/WallCrawlerSwarm.xml | 4 +- templates/mp1/Script/Warwasp.xml | 4 +- templates/mp1/Script/Water.xml | 24 +- templates/mp1/Script/WorldTeleporter.xml | 12 +- templates/mp1/Structs/ActorParameters.xml | 8 +- templates/mp1/Structs/FlareDef.xml | 2 +- templates/mp1/Structs/LightParameters.xml | 10 +- templates/mp1/Structs/PatternedInfo.xml | 6 +- templates/mp1/Structs/PrimeStruct4.xml | 16 +- templates/mp1/Structs/ScannableParameters.xml | 2 +- templates/mp2/Script/AIMannedTurret.xml | 6 +- templates/mp2/Script/Actor.xml | 6 +- templates/mp2/Script/AreaAttributes.xml | 2 +- templates/mp2/Script/AtomicAlpha.xml | 4 +- templates/mp2/Script/AtomicBeta.xml | 6 +- templates/mp2/Script/BacteriaSwarm.xml | 4 +- templates/mp2/Script/Blogg.xml | 2 +- templates/mp2/Script/Brizgee.xml | 4 +- templates/mp2/Script/CameraFilterKeyframe.xml | 2 +- templates/mp2/Script/CannonBall.xml | 2 +- templates/mp2/Script/Coin.xml | 8 +- templates/mp2/Script/CommandoPirate.xml | 16 +- templates/mp2/Script/DarkCommando.xml | 12 +- templates/mp2/Script/DarkSamus.xml | 52 +- templates/mp2/Script/DarkTrooper.xml | 6 +- templates/mp2/Script/Debris.xml | 4 +- templates/mp2/Script/DebrisExtended.xml | 8 +- templates/mp2/Script/DestructibleBarrier.xml | 20 +- templates/mp2/Script/DigitalGuardian.xml | 20 +- templates/mp2/Script/DigitalGuardianHead.xml | 30 +- templates/mp2/Script/Door.xml | 6 +- templates/mp2/Script/EMPulse.xml | 2 +- templates/mp2/Script/Effect.xml | 2 +- templates/mp2/Script/ElitePirate.xml | 16 +- templates/mp2/Script/EmperorIngStage1.xml | 6 +- templates/mp2/Script/EmperorIngStage3.xml | 4 +- templates/mp2/Script/EyeBall.xml | 10 +- templates/mp2/Script/FishCloud.xml | 10 +- templates/mp2/Script/FlyingPirate.xml | 14 +- templates/mp2/Script/FrontEndDataNetwork.xml | 6 +- templates/mp2/Script/Glowbug.xml | 12 +- templates/mp2/Script/Grenchler.xml | 36 +- templates/mp2/Script/GuiScreen.xml | 2 +- templates/mp2/Script/GunTurretBase.xml | 4 +- templates/mp2/Script/GunTurretTop.xml | 4 +- templates/mp2/Script/HUDHint.xml | 2 +- templates/mp2/Script/HUDMemo.xml | 2 +- templates/mp2/Script/Ing.xml | 22 +- templates/mp2/Script/IngBoostBallGuardian.xml | 34 +- templates/mp2/Script/IngPuddle.xml | 10 +- templates/mp2/Script/IngSnatchingSwarm.xml | 8 +- templates/mp2/Script/IngSpaceJumpGuardian.xml | 4 +- templates/mp2/Script/Kralee.xml | 4 +- templates/mp2/Script/Krocuss.xml | 2 +- templates/mp2/Script/Lumite.xml | 8 +- templates/mp2/Script/MediumIng.xml | 2 +- templates/mp2/Script/MetroidAlpha.xml | 2 +- templates/mp2/Script/Midi.xml | 2 +- templates/mp2/Script/MinorIng.xml | 16 +- templates/mp2/Script/MysteryFlyer.xml | 2 +- templates/mp2/Script/OctapedeSegment.xml | 2 +- templates/mp2/Script/Pickup.xml | 4 +- templates/mp2/Script/PickupGenerator.xml | 2 +- templates/mp2/Script/PlantScarabSwarm.xml | 8 +- templates/mp2/Script/Platform.xml | 4 +- templates/mp2/Script/PlayerActor.xml | 2 +- templates/mp2/Script/PlayerController.xml | 2 +- templates/mp2/Script/PlayerTurret.xml | 4 +- templates/mp2/Script/PortalTransition.xml | 4 +- templates/mp2/Script/Puffer.xml | 4 +- templates/mp2/Script/Rezbit.xml | 8 +- templates/mp2/Script/RiftPortal.xml | 8 +- templates/mp2/Script/RubiksPuzzle.xml | 2 +- templates/mp2/Script/SafeZone.xml | 2 +- templates/mp2/Script/SafeZoneCrystal.xml | 28 +- templates/mp2/Script/SandBoss.xml | 20 +- templates/mp2/Script/Sandworm.xml | 18 +- templates/mp2/Script/Shrieker.xml | 6 +- templates/mp2/Script/SpacePirate.xml | 12 +- templates/mp2/Script/Splinter.xml | 6 +- .../mp2/Script/SplitterCommandModule.xml | 2 +- templates/mp2/Script/SporbBase.xml | 4 +- templates/mp2/Script/SporbNeedle.xml | 6 +- templates/mp2/Script/SporbProjectile.xml | 4 +- templates/mp2/Script/Steam.xml | 2 +- templates/mp2/Script/Subtitle.xml | 2 +- templates/mp2/Script/SwampBossStage1.xml | 16 +- templates/mp2/Script/SwampBossStage2.xml | 24 +- templates/mp2/Script/TextPane.xml | 2 +- templates/mp2/Script/VisorGoo.xml | 4 +- templates/mp2/Script/WallWalker.xml | 10 +- templates/mp2/Script/Water.xml | 22 +- templates/mp2/Script/WorldTeleporter.xml | 14 +- templates/mp2/Structs/ActorParameters.xml | 8 +- .../mp2/Structs/BasicSwarmProperties.xml | 2 +- templates/mp2/Structs/FlareDef.xml | 2 +- templates/mp2/Structs/IngPossessionData.xml | 6 +- templates/mp2/Structs/LayerSwitch.xml | 2 +- templates/mp2/Structs/PatternedInfo.xml | 12 +- templates/mp2/Structs/PlasmaBeamInfo.xml | 12 +- templates/mp2/Structs/SafeZoneStructB.xml | 8 +- templates/mp2/Structs/SandBossStructA.xml | 18 +- templates/mp2/Structs/ScannableParameters.xml | 2 +- templates/mp2/Structs/ShockWaveInfo.xml | 4 +- templates/mp2/Structs/TextProperties.xml | 2 +- templates/mp2demo/Script/AIMannedTurret.xml | 6 +- templates/mp2demo/Script/Actor.xml | 4 +- templates/mp2demo/Script/AreaAttributes.xml | 2 +- templates/mp2demo/Script/AtomicAlpha.xml | 4 +- templates/mp2demo/Script/Blogg.xml | 2 +- templates/mp2demo/Script/Brizgee.xml | 4 +- .../mp2demo/Script/CameraFilterKeyframe.xml | 2 +- templates/mp2demo/Script/CannonBall.xml | 2 +- templates/mp2demo/Script/Coin.xml | 8 +- templates/mp2demo/Script/CommandoPirate.xml | 18 +- templates/mp2demo/Script/DarkSamus.xml | 24 +- templates/mp2demo/Script/Debris.xml | 4 +- templates/mp2demo/Script/DebrisExtended.xml | 8 +- .../mp2demo/Script/DigitalGuardianHead.xml | 8 +- templates/mp2demo/Script/Door.xml | 4 +- templates/mp2demo/Script/EMPulse.xml | 2 +- templates/mp2demo/Script/Effect.xml | 2 +- templates/mp2demo/Script/ElitePirate.xml | 4 +- templates/mp2demo/Script/EmperorIngStage1.xml | 2 +- templates/mp2demo/Script/FishCloud.xml | 6 +- templates/mp2demo/Script/FlyingPirate.xml | 14 +- .../mp2demo/Script/FrontEndDataNetwork.xml | 6 +- templates/mp2demo/Script/Glowbug.xml | 8 +- templates/mp2demo/Script/Grenchler.xml | 2 +- templates/mp2demo/Script/GunTurretBase.xml | 4 +- templates/mp2demo/Script/GunTurretTop.xml | 4 +- templates/mp2demo/Script/HUDMemo.xml | 2 +- templates/mp2demo/Script/Ing.xml | 20 +- .../mp2demo/Script/IngSnatchingSwarm.xml | 8 +- templates/mp2demo/Script/Kralee.xml | 4 +- templates/mp2demo/Script/Krocuss.xml | 2 +- templates/mp2demo/Script/Lumite.xml | 8 +- templates/mp2demo/Script/MediumIng.xml | 2 +- templates/mp2demo/Script/Midi.xml | 2 +- templates/mp2demo/Script/MinorIng.xml | 14 +- templates/mp2demo/Script/OctapedeSegment.xml | 2 +- templates/mp2demo/Script/Pickup.xml | 4 +- templates/mp2demo/Script/Platform.xml | 4 +- templates/mp2demo/Script/PlayerActor.xml | 2 +- templates/mp2demo/Script/PlayerController.xml | 2 +- templates/mp2demo/Script/PlayerTurret.xml | 4 +- templates/mp2demo/Script/Puffer.xml | 4 +- templates/mp2demo/Script/Rezbit.xml | 6 +- templates/mp2demo/Script/RiftPortal.xml | 8 +- templates/mp2demo/Script/SafeZone.xml | 2 +- templates/mp2demo/Script/Sandworm.xml | 10 +- templates/mp2demo/Script/Shrieker.xml | 6 +- templates/mp2demo/Script/SpacePirate.xml | 12 +- templates/mp2demo/Script/Splinter.xml | 4 +- .../mp2demo/Script/SplitterCommandModule.xml | 2 +- templates/mp2demo/Script/SporbBase.xml | 4 +- templates/mp2demo/Script/SporbNeedle.xml | 6 +- templates/mp2demo/Script/SporbProjectile.xml | 4 +- templates/mp2demo/Script/Steam.xml | 2 +- templates/mp2demo/Script/Subtitle.xml | 2 +- templates/mp2demo/Script/TextPane.xml | 2 +- templates/mp2demo/Script/TriggerEllipsoid.xml | 2 +- templates/mp2demo/Script/VisorGoo.xml | 4 +- templates/mp2demo/Script/WallCrawlerSwarm.xml | 4 +- templates/mp2demo/Script/WallWalker.xml | 10 +- templates/mp2demo/Script/Water.xml | 22 +- templates/mp2demo/Script/WorldTeleporter.xml | 12 +- templates/mp2demo/Structs/ActorParameters.xml | 8 +- templates/mp2demo/Structs/FlareDef.xml | 2 +- templates/mp2demo/Structs/LayerSwitch.xml | 2 +- templates/mp2demo/Structs/PatternedInfo.xml | 12 +- templates/mp2demo/Structs/PlasmaBeamInfo.xml | 12 +- templates/mp2demo/Structs/SafeZoneStruct.xml | 8 +- .../mp2demo/Structs/ScannableParameters.xml | 2 +- templates/mp2demo/Structs/ShockWaveInfo.xml | 4 +- templates/mp2demo/Structs/TextProperties.xml | 2 +- templates/mp3/Script/AIFuse.xml | 4 +- templates/mp3/Script/AVIS.xml | 4 +- templates/mp3/Script/AVMC.xml | 2 +- templates/mp3/Script/Achievement.xml | 2 +- templates/mp3/Script/Actor.xml | 6 +- templates/mp3/Script/AreaAttributes.xml | 6 +- templates/mp3/Script/AtomicAlpha.xml | 4 +- templates/mp3/Script/BeastRider.xml | 6 +- templates/mp3/Script/BlinkWolf.xml | 8 +- templates/mp3/Script/Cable.xml | 2 +- templates/mp3/Script/CameraFilterKeyframe.xml | 4 +- templates/mp3/Script/CameraShaker.xml | 2 +- templates/mp3/Script/CannonBall.xml | 2 +- templates/mp3/Script/CombatTrooper.xml | 8 +- .../Script/ContextActionCombinationLock.xml | 8 +- .../mp3/Script/ContextActionImageFocus.xml | 2 +- templates/mp3/Script/ContextActionWelding.xml | 36 +- templates/mp3/Script/DarkSamus.xml | 42 +- templates/mp3/Script/Debris.xml | 8 +- templates/mp3/Script/DefenseMechanoid.xml | 48 +- templates/mp3/Script/DialogueMenu.xml | 6 +- templates/mp3/Script/Door.xml | 6 +- templates/mp3/Script/Effect.xml | 2 +- templates/mp3/Script/EffectRepulsor.xml | 2 +- templates/mp3/Script/ElectroMagneticPulse.xml | 2 +- templates/mp3/Script/EyePod.xml | 4 +- templates/mp3/Script/FishCloud.xml | 16 +- templates/mp3/Script/FlyingPirate.xml | 44 +- templates/mp3/Script/Friendly.xml | 8 +- templates/mp3/Script/GellSac.xml | 6 +- templates/mp3/Script/GhorUpperBody.xml | 22 +- templates/mp3/Script/GragnolFlyer.xml | 4 +- templates/mp3/Script/GuiMenu.xml | 2 +- templates/mp3/Script/GuiScreen.xml | 2 +- templates/mp3/Script/GuiSlider.xml | 2 +- templates/mp3/Script/GunTurretBase.xml | 2 +- templates/mp3/Script/GunTurretTop.xml | 4 +- templates/mp3/Script/HUDHint.xml | 2 +- templates/mp3/Script/HUDMemo.xml | 10 +- templates/mp3/Script/Korakk.xml | 24 +- templates/mp3/Script/KorbaSnatcherSwarm.xml | 2 +- templates/mp3/Script/LODController.xml | 20 +- templates/mp3/Script/LUAScript.xml | 4 +- templates/mp3/Script/Metaree.xml | 2 +- templates/mp3/Script/MetroidHopper.xml | 6 +- templates/mp3/Script/MetroidPhazeoid.xml | 6 +- templates/mp3/Script/MinorIng.xml | 34 +- templates/mp3/Script/MultiModelActor.xml | 4 +- templates/mp3/Script/MysteryFlyer.xml | 2 +- templates/mp3/Script/Nightbarb.xml | 2 +- templates/mp3/Script/NoseTurret.xml | 4 +- templates/mp3/Script/OptionalAreaAsset.xml | 2 +- templates/mp3/Script/Phaazoid.xml | 2 +- templates/mp3/Script/PhazonHarvester.xml | 10 +- templates/mp3/Script/PhazonPuddle.xml | 42 +- templates/mp3/Script/PhazonPuffer.xml | 12 +- templates/mp3/Script/PhysicsDebris.xml | 8 +- templates/mp3/Script/Pickup.xml | 4 +- templates/mp3/Script/Platform.xml | 4 +- templates/mp3/Script/PlayerActor.xml | 34 +- templates/mp3/Script/Puffer.xml | 8 +- templates/mp3/Script/ReptilicusHunter.xml | 28 +- templates/mp3/Script/Ridley1.xml | 58 +-- templates/mp3/Script/Rundas.xml | 76 +-- templates/mp3/Script/SamusForm.xml | 14 +- templates/mp3/Script/ScanIncoming.xml | 2 +- .../mp3/Script/ScriptLayerController.xml | 2 +- templates/mp3/Script/SeedBoss1.xml | 96 ++-- templates/mp3/Script/SeedBoss1Orb.xml | 4 +- templates/mp3/Script/SeedBoss2BotSwarm.xml | 12 +- templates/mp3/Script/SeedBoss2PrimeBot.xml | 72 +-- templates/mp3/Script/Ship.xml | 18 +- templates/mp3/Script/ShipBombingRun.xml | 6 +- templates/mp3/Script/ShipCommandIcon.xml | 12 +- templates/mp3/Script/ShipHudControl.xml | 2 +- templates/mp3/Script/Sound.xml | 2 +- templates/mp3/Script/SpacePirate.xml | 38 +- templates/mp3/Script/SpecialFunction.xml | 6 +- templates/mp3/Script/Spinner.xml | 6 +- templates/mp3/Script/Steam.xml | 2 +- templates/mp3/Script/SteamBot.xml | 2 +- templates/mp3/Script/SteamDrone.xml | 2 +- templates/mp3/Script/SteamLord.xml | 8 +- templates/mp3/Script/StreamedAudio.xml | 2 +- templates/mp3/Script/Subtitles.xml | 2 +- templates/mp3/Script/SwarmBot.xml | 58 +-- templates/mp3/Script/TextPane.xml | 2 +- templates/mp3/Script/VenomWeed.xml | 12 +- templates/mp3/Script/VisorGoo.xml | 6 +- templates/mp3/Script/WallCrawlerSwarm.xml | 2 +- templates/mp3/Script/Water.xml | 54 +-- templates/mp3/Script/WeaponGenerator.xml | 4 +- templates/mp3/Script/WorldAttributes.xml | 4 +- templates/mp3/Script/WorldTeleporter.xml | 16 +- .../mp3/Script/WorldTeleporterAttributes.xml | 40 +- .../mp3/Script/WorldTransitionChoiceRelay.xml | 40 +- templates/mp3/Structs/ActorParameters.xml | 4 +- templates/mp3/Structs/AuroraUnit1Data.xml | 12 +- templates/mp3/Structs/AuroraUnit2Data.xml | 14 +- templates/mp3/Structs/BerserkerData.xml | 16 +- templates/mp3/Structs/DarkSamusEchoData.xml | 8 +- templates/mp3/Structs/ElectricBeamInfo.xml | 10 +- templates/mp3/Structs/FlareDef.xml | 2 +- templates/mp3/Structs/GandraydaData.xml | 26 +- templates/mp3/Structs/GhorStructA.xml | 4 +- templates/mp3/Structs/GhorStructB.xml | 10 +- templates/mp3/Structs/GhorStructC.xml | 2 +- templates/mp3/Structs/GrappleData.xml | 2 +- .../mp3/Structs/HoverThenHomeProjectile.xml | 2 +- .../mp3/Structs/LaunchProjectileData.xml | 6 +- templates/mp3/Structs/MetroidHatcherData.xml | 10 +- .../mp3/Structs/MultiModelActorStruct.xml | 2 +- templates/mp3/Structs/PatternedAI.xml | 24 +- templates/mp3/Structs/PlasmaBeamInfo.xml | 18 +- templates/mp3/Structs/PlayerActorStruct.xml | 6 +- templates/mp3/Structs/PuddleControlData.xml | 2 +- templates/mp3/Structs/RagDollData.xml | 2 +- templates/mp3/Structs/ScanBeamInfo.xml | 2 +- templates/mp3/Structs/ScannableParameters.xml | 2 +- templates/mp3/Structs/SeedBoss3Data.xml | 34 +- .../mp3/Structs/ShipDecalControllerStruct.xml | 2 +- templates/mp3/Structs/ShockWaveInfo.xml | 8 +- templates/mp3/Structs/SpacePirateStruct.xml | 4 +- .../mp3/Structs/SpacePirateWeaponData.xml | 24 +- templates/mp3/Structs/SwarmBasicsData.xml | 6 +- templates/mp3/Structs/SwarmSoundData.xml | 2 +- templates/mp3/Structs/TextProperties.xml | 2 +- templates/mp3/Structs/UnknownStruct10.xml | 2 +- templates/mp3proto/Script/Actor.xml | 6 +- templates/mp3proto/Script/AreaAttributes.xml | 2 +- templates/mp3proto/Script/AtomicAlpha.xml | 4 +- templates/mp3proto/Script/BeastRider.xml | 4 +- templates/mp3proto/Script/Berserker.xml | 16 +- templates/mp3proto/Script/BlinkWolf.xml | 4 +- templates/mp3proto/Script/Cable.xml | 2 +- .../mp3proto/Script/CameraFilterKeyframe.xml | 2 +- templates/mp3proto/Script/CameraShaker.xml | 2 +- templates/mp3proto/Script/CannonBall.xml | 2 +- templates/mp3proto/Script/DarkSamus.xml | 8 +- templates/mp3proto/Script/Debris.xml | 8 +- .../mp3proto/Script/DefenseMechanoid.xml | 16 +- .../mp3proto/Script/DestructibleBarrier.xml | 30 +- templates/mp3proto/Script/Door.xml | 6 +- templates/mp3proto/Script/Effect.xml | 2 +- templates/mp3proto/Script/EffectRepulsor.xml | 2 +- .../mp3proto/Script/ElectroMagneticPulse.xml | 2 +- templates/mp3proto/Script/EyePod.xml | 4 +- templates/mp3proto/Script/FishCloud.xml | 14 +- templates/mp3proto/Script/FlyingPirate.xml | 36 +- .../mp3proto/Script/FrontEndDataNetwork.xml | 6 +- templates/mp3proto/Script/GragnolFlyer.xml | 4 +- templates/mp3proto/Script/GuiMenu.xml | 2 +- templates/mp3proto/Script/GuiScreen.xml | 2 +- templates/mp3proto/Script/GuiSlider.xml | 2 +- templates/mp3proto/Script/GunTurretBase.xml | 2 +- templates/mp3proto/Script/GunTurretTop.xml | 6 +- templates/mp3proto/Script/HUDHint.xml | 2 +- templates/mp3proto/Script/HUDMemo.xml | 2 +- templates/mp3proto/Script/Korakk.xml | 22 +- templates/mp3proto/Script/MysteryFlyer.xml | 2 +- .../mp3proto/Script/OptionalAreaAsset.xml | 2 +- templates/mp3proto/Script/PTCNoseTurret.xml | 4 +- templates/mp3proto/Script/PhazonPuddle.xml | 42 +- templates/mp3proto/Script/PhysicsDebris.xml | 8 +- templates/mp3proto/Script/Pickup.xml | 4 +- templates/mp3proto/Script/PirateDrone.xml | 2 +- templates/mp3proto/Script/Platform.xml | 4 +- templates/mp3proto/Script/PlayerActor.xml | 2 +- .../mp3proto/Script/PlayerController.xml | 2 +- templates/mp3proto/Script/PlayerTurret.xml | 14 +- .../mp3proto/Script/ReptilicusHunter.xml | 24 +- templates/mp3proto/Script/Ridley1.xml | 22 +- templates/mp3proto/Script/Rundas.xml | 60 +-- templates/mp3proto/Script/SeedBoss1.xml | 68 +-- templates/mp3proto/Script/SeedBoss1Orb.xml | 2 +- templates/mp3proto/Script/Ship.xml | 10 +- templates/mp3proto/Script/ShipCommandIcon.xml | 6 +- templates/mp3proto/Script/Sound.xml | 2 +- templates/mp3proto/Script/SpacePirate.xml | 24 +- templates/mp3proto/Script/SpecialFunction.xml | 6 +- templates/mp3proto/Script/Spinner.xml | 6 +- templates/mp3proto/Script/Steam.xml | 2 +- templates/mp3proto/Script/Subtitles.xml | 2 +- templates/mp3proto/Script/SwarmBot.xml | 48 +- templates/mp3proto/Script/TextPane.xml | 2 +- templates/mp3proto/Script/VisorGoo.xml | 6 +- templates/mp3proto/Script/Water.xml | 36 +- templates/mp3proto/Script/WeaponGenerator.xml | 4 +- templates/mp3proto/Script/WorldTeleporter.xml | 14 +- .../mp3proto/Structs/ActorParameters.xml | 8 +- .../mp3proto/Structs/ElectricBeamInfo.xml | 10 +- templates/mp3proto/Structs/FlareDef.xml | 2 +- templates/mp3proto/Structs/FriendlyData.xml | 8 +- .../mp3proto/Structs/LaunchProjectileData.xml | 6 +- templates/mp3proto/Structs/LayerSwitch.xml | 2 +- .../mp3proto/Structs/PatternedAITypedef.xml | 18 +- templates/mp3proto/Structs/PlasmaBeamInfo.xml | 12 +- templates/mp3proto/Structs/RagDollData.xml | 2 +- .../mp3proto/Structs/ScannableParameters.xml | 2 +- templates/mp3proto/Structs/ShockWaveInfo.xml | 6 +- .../Structs/SpacePirateWeaponData.xml | 20 +- .../mp3proto/Structs/SwarmBasicsData.xml | 6 +- templates/mp3proto/Structs/TextProperties.xml | 2 +- 556 files changed, 2992 insertions(+), 3461 deletions(-) delete mode 100644 src/Core/Resource/CResourceInfo.h delete mode 100644 src/Editor/Widgets/WAnimParamsEditor.cpp delete mode 100644 src/Editor/Widgets/WAnimParamsEditor.h diff --git a/src/Core/CAreaAttributes.cpp b/src/Core/CAreaAttributes.cpp index c022ecd0..8df21edf 100644 --- a/src/Core/CAreaAttributes.cpp +++ b/src/Core/CAreaAttributes.cpp @@ -47,13 +47,13 @@ CModel* CAreaAttributes::SkyModel() const switch (mGame) { case ePrime: - return (CModel*) static_cast(pBaseStruct->PropertyByIndex(7))->Get().Load(); + return (CModel*) gpResourceStore->LoadResource( static_cast(pBaseStruct->PropertyByIndex(7))->Get(), "CMDL" ); case eEchoesDemo: case eEchoes: case eCorruptionProto: case eCorruption: case eReturns: - return (CModel*) static_cast(pBaseStruct->PropertyByID(0xD208C9FA))->Get().Load(); + return (CModel*) gpResourceStore->LoadResource( static_cast(pBaseStruct->PropertyByID(0xD208C9FA))->Get(), "CMDL" ); default: return nullptr; } diff --git a/src/Core/Core.pro b/src/Core/Core.pro index 99acbc51..9077d4e1 100644 --- a/src/Core/Core.pro +++ b/src/Core/Core.pro @@ -170,7 +170,6 @@ HEADERS += \ Scene/FShowFlags.h \ Scene/CScene.h \ Scene/CSceneIterator.h \ - Resource/CResourceInfo.h \ Resource/CPoiToWorld.h \ Resource/Factory/CPoiToWorldLoader.h \ Resource/Cooker/CPoiToWorldCooker.h \ diff --git a/src/Core/GameProject/CDependencyTree.cpp b/src/Core/GameProject/CDependencyTree.cpp index 2e49b604..9e18e731 100644 --- a/src/Core/GameProject/CDependencyTree.cpp +++ b/src/Core/GameProject/CDependencyTree.cpp @@ -120,9 +120,9 @@ void CScriptInstanceDependency::ParseStructDependencies(CScriptInstanceDependenc if (Type == eStructProperty || Type == eArrayProperty) ParseStructDependencies(pInst, static_cast(pProp)); - else if (Type == eFileProperty) + else if (Type == eAssetProperty) { - CAssetID ID = static_cast(pProp)->Get().ID(); + CAssetID ID = static_cast(pProp)->Get(); if (ID.IsValid()) { diff --git a/src/Core/Resource/CAnimationParameters.cpp b/src/Core/Resource/CAnimationParameters.cpp index bcdf5a01..39ce4ad8 100644 --- a/src/Core/Resource/CAnimationParameters.cpp +++ b/src/Core/Resource/CAnimationParameters.cpp @@ -1,6 +1,5 @@ #include "CAnimationParameters.h" #include "CAnimSet.h" -#include "CResourceInfo.h" #include "Core/GameProject/CResourceStore.h" #include #include @@ -32,14 +31,14 @@ CAnimationParameters::CAnimationParameters(IInputStream& rSCLY, EGame Game) { if (Game <= eEchoes) { - mCharacter = CResourceInfo(rSCLY.ReadLong(), "ANCS"); + mCharacterID = CAssetID(rSCLY, Game); mCharIndex = rSCLY.ReadLong(); mAnimIndex = rSCLY.ReadLong(); } else if (Game <= eCorruption) { - mCharacter = CResourceInfo(rSCLY.ReadLongLong(), "CHAR"); + mCharacterID = CAssetID(rSCLY, Game); mAnimIndex = rSCLY.ReadLong(); } @@ -56,7 +55,7 @@ CAnimationParameters::CAnimationParameters(IInputStream& rSCLY, EGame Game) return; } - mCharacter = CResourceInfo(rSCLY.ReadLongLong(), "CHAR"); + mCharacterID = CAssetID(rSCLY, Game); // 0x20 - Default Anim is present if (Flags & 0x20) @@ -82,9 +81,9 @@ void CAnimationParameters::Write(IOutputStream& rSCLY) { if (mGame <= eEchoes) { - if (mCharacter.IsValid()) + if (mCharacterID.IsValid()) { - rSCLY.WriteLong(mCharacter.ID().ToLong()); + mCharacterID.Write(rSCLY); rSCLY.WriteLong(mCharIndex); rSCLY.WriteLong(mAnimIndex); } @@ -98,9 +97,9 @@ void CAnimationParameters::Write(IOutputStream& rSCLY) else if (mGame <= eCorruption) { - if (mCharacter.IsValid()) + if (mCharacterID.IsValid()) { - rSCLY.WriteLongLong(mCharacter.ID().ToLongLong()); + mCharacterID.Write(rSCLY); rSCLY.WriteLong(mAnimIndex); } @@ -113,7 +112,7 @@ void CAnimationParameters::Write(IOutputStream& rSCLY) else { - if (!mCharacter.IsValid()) + if (!mCharacterID.IsValid()) rSCLY.WriteByte((u8) 0x80); else @@ -123,7 +122,7 @@ void CAnimationParameters::Write(IOutputStream& rSCLY) if (mUnknown2 != 0 || mUnknown3 != 0) Flag |= 0x40; rSCLY.WriteByte(Flag); - rSCLY.WriteLongLong(mCharacter.ID().ToLongLong()); + mCharacterID.Write(rSCLY); if (Flag & 0x20) rSCLY.WriteLong(mAnimIndex); @@ -139,9 +138,9 @@ void CAnimationParameters::Write(IOutputStream& rSCLY) CModel* CAnimationParameters::GetCurrentModel(s32 NodeIndex /*= -1*/) { - if (!mCharacter.IsValid()) return nullptr; + if (!mCharacterID.IsValid()) return nullptr; - CAnimSet *pSet = (CAnimSet*) mCharacter.Load(); + CAnimSet *pSet = AnimSet(); if (!pSet) return nullptr; if (pSet->Type() != eAnimSet) return nullptr; if (NodeIndex == -1) NodeIndex = mCharIndex; @@ -152,9 +151,9 @@ CModel* CAnimationParameters::GetCurrentModel(s32 NodeIndex /*= -1*/) TString CAnimationParameters::GetCurrentCharacterName(s32 NodeIndex /*= -1*/) { - if (!mCharacter.IsValid()) return ""; + if (!mCharacterID.IsValid()) return ""; - CAnimSet *pSet = (CAnimSet*) mCharacter.Load(); + CAnimSet *pSet = AnimSet(); if (!pSet) return ""; if (pSet->Type() != eAnimSet) return ""; if (NodeIndex == -1) NodeIndex = mCharIndex; @@ -177,15 +176,22 @@ u32 CAnimationParameters::Unknown(u32 Index) } } -void CAnimationParameters::SetResource(CResourceInfo Res) +void CAnimationParameters::SetResource(const CAssetID& rkID) { - if (Res.Type() == "ANCS" || Res.Type() == "CHAR") + mCharacterID = rkID; + mCharIndex = 0; + mAnimIndex = 0; + + // Validate ID + if (mCharacterID.IsValid()) { - mCharacter = Res; - mCharIndex = 0; + CResourceEntry *pEntry = gpResourceStore->FindEntry(rkID); + + if (!pEntry) + Log::Error("Invalid resource ID passed to CAnimationParameters: " + rkID.ToString()); + else if (pEntry->ResourceType() != eAnimSet) + Log::Error("Resource with invalid type passed to CAnimationParameters: " + pEntry->CookedAssetPath().GetFileName()); } - else - Log::Error("Resource with invalid type passed to CAnimationParameters: " + Res.ToString()); } void CAnimationParameters::SetUnknown(u32 Index, u32 Value) diff --git a/src/Core/Resource/CAnimationParameters.h b/src/Core/Resource/CAnimationParameters.h index 8100a4b6..42e6213e 100644 --- a/src/Core/Resource/CAnimationParameters.h +++ b/src/Core/Resource/CAnimationParameters.h @@ -2,7 +2,6 @@ #define CANIMATIONPARAMETERS_H #include "CAnimSet.h" -#include "CResourceInfo.h" #include "TResPtr.h" #include "Core/Resource/Model/CModel.h" #include @@ -10,7 +9,7 @@ class CAnimationParameters { EGame mGame; - CResourceInfo mCharacter; + CAssetID mCharacterID; u32 mCharIndex; u32 mAnimIndex; @@ -28,22 +27,22 @@ public: // Accessors inline EGame Version() const { return mGame; } - inline CAssetID ID() const { return mCharacter.ID(); } - inline CAnimSet* AnimSet() const { return (CAnimSet*) mCharacter.Load(); } + inline CAssetID ID() const { return mCharacterID; } + inline CAnimSet* AnimSet() const { return (CAnimSet*) gpResourceStore->LoadResource(mCharacterID, (mGame < eCorruptionProto ? "ANCS" : "CHAR")); } inline u32 CharacterIndex() const { return mCharIndex; } inline u32 AnimIndex() const { return mAnimIndex; } inline void SetCharIndex(u32 Index) { mCharIndex = Index; } inline void SetAnimIndex(u32 Index) { mAnimIndex = Index; } u32 Unknown(u32 Index); - void SetResource(CResourceInfo Res); + void SetResource(const CAssetID& rkID); void SetUnknown(u32 Index, u32 Value); // Operators inline bool operator==(const CAnimationParameters& rkOther) const { return ( (mGame == rkOther.mGame) && - (mCharacter == rkOther.mCharacter) && + (mCharacterID == rkOther.mCharacterID) && (mCharIndex == rkOther.mCharIndex) && (mAnimIndex == rkOther.mAnimIndex) && (mUnknown2 == rkOther.mUnknown2) && diff --git a/src/Core/Resource/CResourceInfo.h b/src/Core/Resource/CResourceInfo.h deleted file mode 100644 index 019b333e..00000000 --- a/src/Core/Resource/CResourceInfo.h +++ /dev/null @@ -1,88 +0,0 @@ -#ifndef CRESOURCEINFO -#define CRESOURCEINFO - -#include "CResource.h" -#include "Core/GameProject/CResourceStore.h" -#include -#include -#include - -class CResourceInfo -{ - TString mPath; - bool mIsPath; - bool mIsValidPath; - -public: - CResourceInfo() - : mPath("FFFFFFFFFFFFFFFF"), mIsPath(false), mIsValidPath(false) {} - - CResourceInfo(const TString& rkPath) - : mPath(rkPath), mIsPath(true) - { - mIsValidPath = FileUtil::Exists(rkPath); - } - - CResourceInfo(const CAssetID& rkID, CFourCC Type) - : mIsPath(false), mIsValidPath(false) - { - mPath = rkID.ToString() + "." + Type.ToString(); - } - - inline CAssetID ID() const - { - TString FileName = mPath.GetFileName(false); - - if (!mIsPath) - return CAssetID::FromString(FileName); - - else - { - if (FileName.IsHexString() && (FileName.Size() == 8 || FileName.Size() == 16)) - return CAssetID::FromString(FileName); - else - return CAssetID::skInvalidID64; - } - } - - inline CFourCC Type() const - { - return mPath.GetFileExtension(); - } - - inline TString ToString() const - { - return mPath; - } - - inline CResource* Load() const - { - if (!IsValid()) - return nullptr; - if (mIsPath) - return gpResourceStore->LoadResource(mPath); - else - return gpResourceStore->LoadResource(ID(), Type()); - } - - inline bool IsValid() const - { - if (!mIsPath) - return ID().IsValid(); - else - return mIsValidPath; - } - - inline bool operator==(const CResourceInfo& rkOther) const - { - return (mPath.GetFileName() == rkOther.mPath.GetFileName()); - } - - inline bool operator!=(const CResourceInfo& rkOther) const - { - return (!(*this == rkOther)); - } -}; - -#endif // CRESOURCEINFO - diff --git a/src/Core/Resource/Cooker/CScriptCooker.cpp b/src/Core/Resource/Cooker/CScriptCooker.cpp index 9ef065d0..c58fd83c 100644 --- a/src/Core/Resource/Cooker/CScriptCooker.cpp +++ b/src/Core/Resource/Cooker/CScriptCooker.cpp @@ -86,13 +86,10 @@ void CScriptCooker::WriteProperty(IProperty *pProp, bool InSingleStruct) break; } - case eFileProperty: + case eAssetProperty: { - TFileProperty *pFileCast = static_cast(pProp); - if (mVersion <= eEchoes) - mpSCLY->WriteLong(pFileCast->Get().ID().ToLong()); - else - mpSCLY->WriteLongLong(pFileCast->Get().ID().ToLongLong()); + TAssetProperty *pAssetCast = static_cast(pProp); + pAssetCast->Get().Write(*mpSCLY); break; } diff --git a/src/Core/Resource/Cooker/CTemplateWriter.cpp b/src/Core/Resource/Cooker/CTemplateWriter.cpp index a4f54ee9..858f5ed3 100644 --- a/src/Core/Resource/Cooker/CTemplateWriter.cpp +++ b/src/Core/Resource/Cooker/CTemplateWriter.cpp @@ -620,11 +620,11 @@ void CTemplateWriter::SaveProperties(XMLDocument *pDoc, XMLElement *pParent, CSt pElem->LinkEndChild(pCookPref); } - // File-specific parameters - if (pProp->Type() == eFileProperty) + // Asset-specific parameters + if (pProp->Type() == eAssetProperty) { - CFileTemplate *pFile = static_cast(pProp); - const TStringList& rkExtensions = pFile->Extensions(); + CAssetTemplate *pAsset = static_cast(pProp); + const TStringList& rkExtensions = pAsset->AllowedExtensions(); TString ExtensionsString; for (auto it = rkExtensions.begin(); it != rkExtensions.end(); it++) @@ -790,17 +790,17 @@ void CTemplateWriter::SavePropertyOverrides(XMLDocument *pDoc, XMLElement *pPare pElem->LinkEndChild(pCookPref); } - // File-specific parameters - if (pProp->Type() == eFileProperty) + // Asset-specific parameters + if (pProp->Type() == eAssetProperty) { - CFileTemplate *pFile = static_cast(pProp); - CFileTemplate *pSourceFile = static_cast(pSource); + CAssetTemplate *pAsset = static_cast(pProp); + CAssetTemplate *pSourceAsset = static_cast(pSource); - if (pFile->Extensions() != pSourceFile->Extensions()) + if (pAsset->AllowedExtensions() != pSourceAsset->AllowedExtensions()) { TString ExtensionsString; - for (auto it = pFile->Extensions().begin(); it != pFile->Extensions().end(); it++) + for (auto it = pAsset->AllowedExtensions().begin(); it != pAsset->AllowedExtensions().end(); it++) ExtensionsString += *it + ","; ExtensionsString = ExtensionsString.ChopBack(1); diff --git a/src/Core/Resource/Factory/CScriptLoader.cpp b/src/Core/Resource/Factory/CScriptLoader.cpp index c8538f5c..2bcb5892 100644 --- a/src/Core/Resource/Factory/CScriptLoader.cpp +++ b/src/Core/Resource/Factory/CScriptLoader.cpp @@ -106,22 +106,37 @@ void CScriptLoader::ReadProperty(IProperty *pProp, u32 Size, IInputStream& rSCLY break; } - case eFileProperty: + case eAssetProperty: { - TFileProperty *pFileCast = static_cast(pProp); + TAssetProperty *pAssetCast = static_cast(pProp); + CAssetID ID(rSCLY, mVersion); + pAssetCast->Set(ID); - CAssetID ResID(rSCLY, mVersion); - const TStringList& rkExtensions = static_cast(pTemp)->Extensions(); - - CResourceInfo Info(ResID, CFourCC(!rkExtensions.empty() ? rkExtensions.front() : "UNKN")); - - if (ResID.IsValid()) + // Verify this is a valid resource type for this property + if (ID.IsValid()) { - CFourCC Type = gpResourceStore->ResourceTypeByID(ResID, rkExtensions); - Info = CResourceInfo(ResID, Type); + CResourceEntry *pEntry = gpResourceStore->FindEntry(ID); + + if (pEntry) + { + TString CookedExt = pEntry->CookedExtension().ToString(); + const TStringList& rkExtensions = static_cast(pTemp)->AllowedExtensions(); + bool Valid = false; + + for (auto It = rkExtensions.begin(); It != rkExtensions.end(); It++) + { + if (*It == CookedExt) + { + Valid = true; + break; + } + } + + if (!Valid) + Log::FileWarning(rSCLY.GetSourceString(), rSCLY.Tell() - ID.Length(), "Asset property " + pTemp->IDString(true) + " in object " + pTemp->ScriptTemplate()->Name() + " has a reference to an illegal asset type: " + CookedExt); + } } - pFileCast->Set(Info); break; } diff --git a/src/Core/Resource/Factory/CTemplateLoader.cpp b/src/Core/Resource/Factory/CTemplateLoader.cpp index 90108a37..e4339691 100644 --- a/src/Core/Resource/Factory/CTemplateLoader.cpp +++ b/src/Core/Resource/Factory/CTemplateLoader.cpp @@ -106,12 +106,16 @@ IPropertyTemplate* CTemplateLoader::LoadProperty(XMLElement *pElem, CScriptTempl } // File-specific parameters - if (Type == eFileProperty) + if (Type == eAssetProperty) { - CFileTemplate *pFile = static_cast(pProp); TString ExtensionsAttr = pElem->Attribute("extensions"); - TStringList ExtensionsList = ExtensionsAttr.Split(", "); - pFile->SetAllowedExtensions(ExtensionsList); + + if (!ExtensionsAttr.IsEmpty()) + { + TStringList ExtensionsList = ExtensionsAttr.Split(", "); + CAssetTemplate *pAsset = static_cast(pProp); + pAsset->SetAllowedExtensions(ExtensionsList); + } } // Enum-specific parameters @@ -186,7 +190,7 @@ IPropertyTemplate* CTemplateLoader::CreateProperty(u32 ID, EPropertyType Type, c case eStringProperty: pOut = CREATE_PROP_TEMP(TStringTemplate); break; case eVector3Property: pOut = CREATE_PROP_TEMP(TVector3Template); break; case eColorProperty: pOut = CREATE_PROP_TEMP(TColorTemplate); break; - case eFileProperty: pOut = CREATE_PROP_TEMP(CFileTemplate); break; + case eAssetProperty: pOut = CREATE_PROP_TEMP(CAssetTemplate); break; case eCharacterProperty: pOut = CREATE_PROP_TEMP(TCharacterTemplate); break; case eMayaSplineProperty: pOut = CREATE_PROP_TEMP(TMayaSplineTemplate); break; case eEnumProperty: pOut = CREATE_PROP_TEMP(CEnumTemplate); break; @@ -601,7 +605,7 @@ CScriptTemplate* CTemplateLoader::LoadScriptTemplate(XMLDocument *pDoc, const TS if (!pProp) Log::Error(rkTemplateName + ": Invalid property for attachment " + TString::FromInt32(AttachIdx) + ": " + Attachment.AttachProperty); - else if (pProp->Type() != eCharacterProperty && (pProp->Type() != eFileProperty || !static_cast(pProp)->AcceptsExtension("CMDL"))) + else if (pProp->Type() != eCharacterProperty && (pProp->Type() != eAssetProperty || !static_cast(pProp)->AcceptsExtension("CMDL"))) Log::Error(rkTemplateName + ": Property referred to by attachment " + TString::FromInt32(AttachIdx) + " is not an attachable asset! Must be a file property that accepts CMDLs, or a character property."); else diff --git a/src/Core/Resource/Script/CScriptTemplate.cpp b/src/Core/Resource/Script/CScriptTemplate.cpp index ddee15f9..9b095d90 100644 --- a/src/Core/Resource/Script/CScriptTemplate.cpp +++ b/src/Core/Resource/Script/CScriptTemplate.cpp @@ -185,8 +185,9 @@ CResource* CScriptTemplate::FindDisplayAsset(CPropertyStruct *pProperties, u32& else { - TFileProperty *pFile = static_cast(pProp); - pRes = pFile->Get().Load(); + TAssetProperty *pAsset = static_cast(pProp); + CResourceEntry *pEntry = gpResourceStore->FindEntry(pAsset->Get()); + if (pEntry) pRes = pEntry->Load(); } } @@ -218,10 +219,10 @@ CCollisionMeshGroup* CScriptTemplate::FindCollision(CPropertyStruct *pProperties { IProperty *pProp = pProperties->PropertyByIDString(it->AssetLocation); - if (pProp->Type() == eFileProperty) + if (pProp->Type() == eAssetProperty) { - TFileProperty *pFile = static_cast(pProp); - pRes = pFile->Get().Load(); + TAssetProperty *pAsset = static_cast(pProp); + pRes = gpResourceStore->LoadResource( pAsset->Get(), "DCLN" ); } } diff --git a/src/Core/Resource/Script/EPropertyType.h b/src/Core/Resource/Script/EPropertyType.h index 2e8d4309..4e90e8b2 100644 --- a/src/Core/Resource/Script/EPropertyType.h +++ b/src/Core/Resource/Script/EPropertyType.h @@ -15,7 +15,7 @@ enum EPropertyType eStringProperty, eVector3Property, eColorProperty, - eFileProperty, + eAssetProperty, eStructProperty, eArrayProperty, eCharacterProperty, diff --git a/src/Core/Resource/Script/IProperty.h b/src/Core/Resource/Script/IProperty.h index 0e83d1a4..17c3723e 100644 --- a/src/Core/Resource/Script/IProperty.h +++ b/src/Core/Resource/Script/IProperty.h @@ -124,7 +124,7 @@ typedef TTypedProperty typedef TTypedProperty, eUnknownProperty, CUnknownValue> TUnknownProperty; /* - * TStringProperty, TFileProperty, and TCharacterProperty get little subclasses in order to override some virtual functions. + * TStringProperty, TAssetProperty, and TCharacterProperty get little subclasses in order to override some virtual functions. */ #define IMPLEMENT_PROPERTY_CTORS(ClassName, ValueType) \ ClassName(IPropertyTemplate *pTemp, CScriptObject *pInstance, CPropertyStruct *pParent) \ @@ -142,11 +142,11 @@ public: virtual bool ShouldCook() { return true; } }; -class TFileProperty : public TTypedProperty +class TAssetProperty : public TTypedProperty { public: - IMPLEMENT_PROPERTY_CTORS(TFileProperty, CResourceInfo) - IMPLEMENT_PROPERTY_CLONE(TFileProperty) + IMPLEMENT_PROPERTY_CTORS(TAssetProperty, CAssetID) + IMPLEMENT_PROPERTY_CLONE(TAssetProperty) virtual bool MatchesDefault() { return !Get().IsValid(); } virtual bool ShouldCook() { return true; } }; diff --git a/src/Core/Resource/Script/IPropertyTemplate.cpp b/src/Core/Resource/Script/IPropertyTemplate.cpp index 17fe5da5..57bd0ea6 100644 --- a/src/Core/Resource/Script/IPropertyTemplate.cpp +++ b/src/Core/Resource/Script/IPropertyTemplate.cpp @@ -229,7 +229,7 @@ TString PropEnumToPropString(EPropertyType Prop) case eStringProperty: return "string"; case eColorProperty: return "color"; case eVector3Property: return "vector3f"; - case eFileProperty: return "file"; + case eAssetProperty: return "asset"; case eStructProperty: return "struct"; case eArrayProperty: return "array"; case eCharacterProperty: return "character"; @@ -255,7 +255,7 @@ EPropertyType PropStringToPropEnum(TString Prop) if (Prop == "string") return eStringProperty; if (Prop == "color") return eColorProperty; if (Prop == "vector3f") return eVector3Property; - if (Prop == "file") return eFileProperty; + if (Prop == "asset") return eAssetProperty; if (Prop == "struct") return eStructProperty; if (Prop == "array") return eArrayProperty; if (Prop == "character") return eCharacterProperty; diff --git a/src/Core/Resource/Script/IPropertyTemplate.h b/src/Core/Resource/Script/IPropertyTemplate.h index 778858e4..fc08dbaf 100644 --- a/src/Core/Resource/Script/IPropertyTemplate.h +++ b/src/Core/Resource/Script/IPropertyTemplate.h @@ -363,44 +363,44 @@ public: } }; -// CFileTemplate - Property template for files. Tracks a list of file types that +// CAssetTemplate - Property template for assets. Tracks a list of resource types that // the property is allowed to accept. -class CFileTemplate : public IPropertyTemplate +class CAssetTemplate : public IPropertyTemplate { friend class CTemplateLoader; friend class CTemplateWriter; TStringList mAcceptedExtensions; public: - CFileTemplate(u32 ID, CScriptTemplate *pScript, CMasterTemplate *pMaster, CStructTemplate *pParent = 0) + CAssetTemplate(u32 ID, CScriptTemplate *pScript, CMasterTemplate *pMaster, CStructTemplate *pParent = 0) : IPropertyTemplate(ID, pScript, pMaster, pParent) {} - CFileTemplate(u32 ID, const TString& rkName, ECookPreference CookPreference, CScriptTemplate *pScript, CMasterTemplate *pMaster, CStructTemplate *pParent = 0) + CAssetTemplate(u32 ID, const TString& rkName, ECookPreference CookPreference, CScriptTemplate *pScript, CMasterTemplate *pMaster, CStructTemplate *pParent = 0) : IPropertyTemplate(ID, rkName, CookPreference, pScript, pMaster, pParent) {} - virtual EPropertyType Type() const { return eFileProperty; } + virtual EPropertyType Type() const { return eAssetProperty; } virtual bool CanHaveDefault() const { return false; } virtual bool IsNumerical() const { return false; } IProperty* InstantiateProperty(CScriptObject *pInstance, CPropertyStruct *pParent) { - return new TFileProperty(this, pInstance, pParent); + return new TAssetProperty(this, pInstance, pParent); } - IMPLEMENT_TEMPLATE_CLONE(CFileTemplate) + IMPLEMENT_TEMPLATE_CLONE(CAssetTemplate) virtual void Copy(const IPropertyTemplate *pkTemp) { IPropertyTemplate::Copy(pkTemp); - mAcceptedExtensions = static_cast(pkTemp)->mAcceptedExtensions; + mAcceptedExtensions = static_cast(pkTemp)->mAcceptedExtensions; } virtual bool Matches(const IPropertyTemplate *pkTemp) const { - const CFileTemplate *pkFile = static_cast(pkTemp); + const CAssetTemplate *pkAsset = static_cast(pkTemp); return ( (IPropertyTemplate::Matches(pkTemp)) && - (mAcceptedExtensions == pkFile->mAcceptedExtensions) ); + (mAcceptedExtensions == pkAsset->mAcceptedExtensions) ); } bool AcceptsExtension(const TString& rkExtension) @@ -411,7 +411,7 @@ public: } void SetAllowedExtensions(const TStringList& rkExtensions) { mAcceptedExtensions = rkExtensions; } - const TStringList& Extensions() const { return mAcceptedExtensions; } + const TStringList& AllowedExtensions() const { return mAcceptedExtensions; } }; // CEnumTemplate - Property template for enums. Tracks a list of possible values (enumerators). diff --git a/src/Core/Resource/Script/IPropertyValue.h b/src/Core/Resource/Script/IPropertyValue.h index 6e1f374d..4be0edb1 100644 --- a/src/Core/Resource/Script/IPropertyValue.h +++ b/src/Core/Resource/Script/IPropertyValue.h @@ -2,10 +2,10 @@ #define IPROPERTYVALUE_H #include "EPropertyType.h" +#include #include #include "Core/Resource/CAnimationParameters.h" #include "Core/Resource/CResource.h" -#include "Core/Resource/CResourceInfo.h" #include "Core/Resource/TResPtr.h" #include @@ -342,18 +342,18 @@ public: } }; -class CFileValue : public TTypedPropertyValue +class CAssetValue : public TTypedPropertyValue { public: - CFileValue() {} - CFileValue(const CResourceInfo& rkInfo) { mValue = rkInfo; } + CAssetValue() {} + CAssetValue(const CAssetID& rkID) { mValue = rkID; } TString ToString() const { return ""; } void FromString(const TString&) {} IPropertyValue* Clone() const { - return new CFileValue(mValue); + return new CAssetValue(mValue); } }; diff --git a/src/Core/Scene/CScriptAttachNode.cpp b/src/Core/Scene/CScriptAttachNode.cpp index 54053bd8..9d5ba826 100644 --- a/src/Core/Scene/CScriptAttachNode.cpp +++ b/src/Core/Scene/CScriptAttachNode.cpp @@ -21,8 +21,8 @@ void CScriptAttachNode::AttachPropertyModified() { if (mpAttachAssetProp) { - if (mpAttachAssetProp->Type() == eFileProperty) - mpAttachAsset = TPropCast(mpAttachAssetProp)->Get().Load(); + if (mpAttachAssetProp->Type() == eAssetProperty) + mpAttachAsset = gpResourceStore->LoadResource( TPropCast(mpAttachAssetProp)->Get(), "CMDL" ); else if (mpAttachAssetProp->Type() == eCharacterProperty) mpAttachAsset = TPropCast(mpAttachAssetProp)->Get().AnimSet(); diff --git a/src/Core/Scene/CScriptNode.cpp b/src/Core/Scene/CScriptNode.cpp index d26e0e51..a293f805 100644 --- a/src/Core/Scene/CScriptNode.cpp +++ b/src/Core/Scene/CScriptNode.cpp @@ -472,16 +472,16 @@ void CScriptNode::PropertyModified(IProperty *pProp) SetDisplayAsset(mpInstance->DisplayAsset()); } - else if (pProp->Type() == eFileProperty) + else if (pProp->Type() == eAssetProperty) { - CFileTemplate *pFileTemp = static_cast(pProp->Template()); + CAssetTemplate *pAssetTemp = static_cast(pProp->Template()); - if (pFileTemp->AcceptsExtension("CMDL") || pFileTemp->AcceptsExtension("TXTR") || pFileTemp->AcceptsExtension("ANCS") || pFileTemp->AcceptsExtension("CHAR")) + if (pAssetTemp->AcceptsExtension("CMDL") || pAssetTemp->AcceptsExtension("TXTR") || pAssetTemp->AcceptsExtension("ANCS") || pAssetTemp->AcceptsExtension("CHAR")) { mpInstance->EvaluateDisplayAsset(); SetDisplayAsset(mpInstance->DisplayAsset()); } - else if (pFileTemp->AcceptsExtension("DCLN")) + else if (pAssetTemp->AcceptsExtension("DCLN")) { mpInstance->EvaluateCollisionModel(); mpCollisionNode->SetCollision(mpInstance->Collision()); diff --git a/src/Core/ScriptExtra/CDamageableTriggerExtra.cpp b/src/Core/ScriptExtra/CDamageableTriggerExtra.cpp index 24ebde3e..4086353a 100644 --- a/src/Core/ScriptExtra/CDamageableTriggerExtra.cpp +++ b/src/Core/ScriptExtra/CDamageableTriggerExtra.cpp @@ -28,7 +28,7 @@ CDamageableTriggerExtra::CDamageableTriggerExtra(CScriptObject *pInstance, CScen // Fetch textures for (u32 iTex = 0; iTex < 3; iTex++) { - mpTextureProps[iTex] = TPropCast(pBaseStruct->PropertyByIndex(0x6 + iTex)); + mpTextureProps[iTex] = TPropCast(pBaseStruct->PropertyByIndex(0x6 + iTex)); if (mpTextureProps[iTex]) PropertyModified(mpTextureProps[iTex]); } } @@ -200,7 +200,7 @@ void CDamageableTriggerExtra::PropertyModified(IProperty *pProperty) { if (pProperty == mpTextureProps[iTex]) { - mpTextures[iTex] = mpTextureProps[iTex]->Get().Load(); + mpTextures[iTex] = gpResourceStore->LoadResource( mpTextureProps[iTex]->Get(), "TXTR" ); if (mpTextures[iTex] && mpTextures[iTex]->Type() != eTexture) mpTextures[iTex] = nullptr; diff --git a/src/Core/ScriptExtra/CDamageableTriggerExtra.h b/src/Core/ScriptExtra/CDamageableTriggerExtra.h index 56e88c76..f1b7b8db 100644 --- a/src/Core/ScriptExtra/CDamageableTriggerExtra.h +++ b/src/Core/ScriptExtra/CDamageableTriggerExtra.h @@ -19,7 +19,7 @@ class CDamageableTriggerExtra : public CScriptExtra TVector3Property *mpSizeProp; TEnumProperty *mpRenderSideProp; - TFileProperty *mpTextureProps[3]; + TAssetProperty *mpTextureProps[3]; CVector3f mPlaneSize; ERenderSide mRenderSide; diff --git a/src/Core/ScriptExtra/CDoorExtra.cpp b/src/Core/ScriptExtra/CDoorExtra.cpp index 84a8bb3e..865fa033 100644 --- a/src/Core/ScriptExtra/CDoorExtra.cpp +++ b/src/Core/ScriptExtra/CDoorExtra.cpp @@ -9,7 +9,7 @@ CDoorExtra::CDoorExtra(CScriptObject *pInstance, CScene *pScene, CScriptNode *pP { CPropertyStruct *pBaseStruct = pInstance->Properties(); - mpShieldModelProp = TPropCast(pBaseStruct->PropertyByID(0xB20CC271)); + mpShieldModelProp = TPropCast(pBaseStruct->PropertyByID(0xB20CC271)); if (mpShieldModelProp) PropertyModified(mpShieldModelProp); if (mGame >= eEchoes) @@ -29,7 +29,7 @@ void CDoorExtra::PropertyModified(IProperty *pProperty) { if (pProperty == mpShieldModelProp) { - mpShieldModel = mpShieldModelProp->Get().Load(); + mpShieldModel = gpResourceStore->LoadResource( mpShieldModelProp->Get(), "CMDL" ); if (mpShieldModel) mLocalAABox = mpShieldModel->AABox(); diff --git a/src/Core/ScriptExtra/CDoorExtra.h b/src/Core/ScriptExtra/CDoorExtra.h index 310335e7..b1e22a27 100644 --- a/src/Core/ScriptExtra/CDoorExtra.h +++ b/src/Core/ScriptExtra/CDoorExtra.h @@ -6,7 +6,7 @@ class CDoorExtra : public CScriptExtra { // Render colored door shield in MP2/3 - TFileProperty *mpShieldModelProp; + TAssetProperty *mpShieldModelProp; TColorProperty *mpShieldColorProp; TBoolProperty *mpDisabledProp; TResPtr mpShieldModel; diff --git a/src/Core/ScriptExtra/CPointOfInterestExtra.cpp b/src/Core/ScriptExtra/CPointOfInterestExtra.cpp index 60ecddae..07e39072 100644 --- a/src/Core/ScriptExtra/CPointOfInterestExtra.cpp +++ b/src/Core/ScriptExtra/CPointOfInterestExtra.cpp @@ -11,15 +11,15 @@ CPointOfInterestExtra::CPointOfInterestExtra(CScriptObject *pInstance, CScene *p // Fetch scan data property CPropertyStruct *pBaseProp = pInstance->Properties(); - if (mGame <= ePrime) mpScanProperty = TPropCast(pBaseProp->PropertyByIDString("0x04:0x00")); - else mpScanProperty = (TFileProperty*) pBaseProp->PropertyByIDString("0xBDBEC295:0xB94E9BE7"); + if (mGame <= ePrime) mpScanProperty = TPropCast(pBaseProp->PropertyByIDString("0x04:0x00")); + else mpScanProperty = (TAssetProperty*) pBaseProp->PropertyByIDString("0xBDBEC295:0xB94E9BE7"); if (mpScanProperty) PropertyModified(mpScanProperty); } void CPointOfInterestExtra::PropertyModified(IProperty* pProperty) { if (mpScanProperty == pProperty) - mpScanData = mpScanProperty->Get().Load(); + mpScanData = gpResourceStore->LoadResource( mpScanProperty->Get(), "SCAN" ); } void CPointOfInterestExtra::ModifyTintColor(CColor& Color) diff --git a/src/Core/ScriptExtra/CPointOfInterestExtra.h b/src/Core/ScriptExtra/CPointOfInterestExtra.h index 123b3676..195a2a27 100644 --- a/src/Core/ScriptExtra/CPointOfInterestExtra.h +++ b/src/Core/ScriptExtra/CPointOfInterestExtra.h @@ -8,7 +8,7 @@ class CPointOfInterestExtra : public CScriptExtra { // Tint POI billboard orange/red depending on scan importance - TFileProperty *mpScanProperty; + TAssetProperty *mpScanProperty; TResPtr mpScanData; public: diff --git a/src/Editor/Editor.pro b/src/Editor/Editor.pro index 126c4a85..740fa849 100644 --- a/src/Editor/Editor.pro +++ b/src/Editor/Editor.pro @@ -97,7 +97,6 @@ HEADERS += \ Undo/EUndoCommand.h \ Undo/UndoCommands.h \ Widgets/IPreviewPanel.h \ - Widgets/WAnimParamsEditor.h \ Widgets/WColorPicker.h \ Widgets/WDraggableSpinBox.h \ Widgets/WIntegralSpinBox.h \ @@ -180,7 +179,6 @@ SOURCES += \ Undo/CScaleNodeCommand.cpp \ Undo/CTranslateNodeCommand.cpp \ Widgets/IPreviewPanel.cpp \ - Widgets/WAnimParamsEditor.cpp \ Widgets/WColorPicker.cpp \ Widgets/WDraggableSpinBox.cpp \ Widgets/WIntegralSpinBox.cpp \ diff --git a/src/Editor/PropertyEdit/CPropertyDelegate.cpp b/src/Editor/PropertyEdit/CPropertyDelegate.cpp index 29aca05b..89ab6737 100644 --- a/src/Editor/PropertyEdit/CPropertyDelegate.cpp +++ b/src/Editor/PropertyEdit/CPropertyDelegate.cpp @@ -126,14 +126,14 @@ QWidget* CPropertyDelegate::createEditor(QWidget *pParent, const QStyleOptionVie break; } - case eFileProperty: + case eAssetProperty: { WResourceSelector *pSelector = new WResourceSelector(pParent); - CFileTemplate *pTemp = static_cast(pProp->Template()); - pSelector->SetAllowedExtensions(pTemp->Extensions()); + CAssetTemplate *pTemp = static_cast(pProp->Template()); + pSelector->SetAllowedExtensions(pTemp->AllowedExtensions()); pSelector->setFont(qobject_cast(parent())->font()); // bit of a hack to stop the resource selector font from changing - CONNECT_RELAY(pSelector, rkIndex, ResourceChanged(QString)) + CONNECT_RELAY(pSelector, rkIndex, ResourceChanged(CResourceEntry*)) pOut = pSelector; break; } @@ -294,11 +294,11 @@ void CPropertyDelegate::setEditorData(QWidget *pEditor, const QModelIndex &rkInd break; } - case eFileProperty: + case eAssetProperty: { WResourceSelector *pSelector = static_cast(pEditor); - TFileProperty *pFile = static_cast(pProp); - pSelector->SetResource(pFile->Get()); + TAssetProperty *pAsset = static_cast(pProp); + pSelector->SetResource(pAsset->Get()); break; } @@ -448,11 +448,13 @@ void CPropertyDelegate::setModelData(QWidget *pEditor, QAbstractItemModel* /*pMo break; } - case eFileProperty: + case eAssetProperty: { WResourceSelector *pSelector = static_cast(pEditor); - TFileProperty *pFile = static_cast(pProp); - pFile->Set(pSelector->GetResourceInfo()); + CResourceEntry *pEntry = pSelector->GetResourceEntry(); + + TAssetProperty *pAsset = static_cast(pProp); + pAsset->Set(pEntry ? pEntry->ID() : CAssetID::InvalidID(mpEditor->CurrentGame())); break; } @@ -581,7 +583,7 @@ QWidget* CPropertyDelegate::CreateCharacterEditor(QWidget *pParent, const QModel if (Type == eUnknownProperty) return nullptr; // Create widget - if (Type == eFileProperty) + if (Type == eAssetProperty) { WResourceSelector *pSelector = new WResourceSelector(pParent); pSelector->setFont(qobject_cast(parent())->font()); // hack to keep the selector font from changing @@ -627,7 +629,7 @@ void CPropertyDelegate::SetCharacterEditorData(QWidget *pEditor, const QModelInd CAnimationParameters Params = pProp->Get(); EPropertyType Type = DetermineCharacterPropType(Params.Version(), rkIndex); - if (Type == eFileProperty) + if (Type == eAssetProperty) { static_cast(pEditor)->SetResource(Params.AnimSet()); } @@ -651,9 +653,9 @@ void CPropertyDelegate::SetCharacterModelData(QWidget *pEditor, const QModelInde CAnimationParameters Params = pProp->Get(); EPropertyType Type = DetermineCharacterPropType(Params.Version(), rkIndex); - if (Type == eFileProperty) + if (Type == eAssetProperty) { - Params.SetResource( static_cast(pEditor)->GetResourceInfo() ); + Params.SetResource( static_cast(pEditor)->GetResourceEntry()->ID() ); // Reset all other parameters to 0 Params.SetCharIndex(0); for (u32 iUnk = 0; iUnk < 3; iUnk++) @@ -675,7 +677,7 @@ void CPropertyDelegate::SetCharacterModelData(QWidget *pEditor, const QModelInde // If we just updated the resource, make sure all the sub-properties of the character are flagged as changed. // We want to do this -after- updating the anim params on the property, which is why we have a second type check. - if (Type == eFileProperty) + if (Type == eAssetProperty) { QModelIndex ParentIndex = rkIndex.parent(); mpModel->dataChanged(mpModel->index(1, 1, ParentIndex), mpModel->index(mpModel->rowCount(ParentIndex) - 1, 1, ParentIndex)); @@ -686,18 +688,18 @@ EPropertyType CPropertyDelegate::DetermineCharacterPropType(EGame Game, const QM { if (Game <= eEchoes) { - if (rkIndex.row() == 0) return eFileProperty; + if (rkIndex.row() == 0) return eAssetProperty; else if (rkIndex.row() == 1) return eEnumProperty; else if (rkIndex.row() == 2) return eLongProperty; } else if (Game <= eCorruption) { - if (rkIndex.row() == 0) return eFileProperty; + if (rkIndex.row() == 0) return eAssetProperty; else if (rkIndex.row() == 1) return eLongProperty; } else { - if (rkIndex.row() == 0) return eFileProperty; + if (rkIndex.row() == 0) return eAssetProperty; else if (rkIndex.row() <= 2) return eLongProperty; } return eUnknownProperty; diff --git a/src/Editor/PropertyEdit/CPropertyModel.cpp b/src/Editor/PropertyEdit/CPropertyModel.cpp index 87938772..b0a6e06c 100644 --- a/src/Editor/PropertyEdit/CPropertyModel.cpp +++ b/src/Editor/PropertyEdit/CPropertyModel.cpp @@ -316,7 +316,7 @@ QVariant CPropertyModel::data(const QModelIndex& rkIndex, int Role) const // No display text on properties with persistent editors case eBoolProperty: - case eFileProperty: + case eAssetProperty: case eColorProperty: if (Role == Qt::DisplayRole) return ""; diff --git a/src/Editor/PropertyEdit/CPropertyView.cpp b/src/Editor/PropertyEdit/CPropertyView.cpp index e07355af..46eaf3cf 100644 --- a/src/Editor/PropertyEdit/CPropertyView.cpp +++ b/src/Editor/PropertyEdit/CPropertyView.cpp @@ -166,7 +166,7 @@ void CPropertyView::SetPersistentEditors(const QModelIndex& rkParent) case eBoolProperty: case eEnumProperty: case eColorProperty: - case eFileProperty: + case eAssetProperty: openPersistentEditor(ChildIndex); break; case eStructProperty: diff --git a/src/Editor/Widgets/WAnimParamsEditor.cpp b/src/Editor/Widgets/WAnimParamsEditor.cpp deleted file mode 100644 index 5a6e8e0f..00000000 --- a/src/Editor/Widgets/WAnimParamsEditor.cpp +++ /dev/null @@ -1,240 +0,0 @@ -#include "WAnimParamsEditor.h" -#include "Editor/UICommon.h" -#include -#include -#include - -WAnimParamsEditor::WAnimParamsEditor(QWidget *pParent) - : QWidget(pParent) - , mpGroupBox(new QGroupBox("Animation Parameters", this)) - , mpGroupLayout(nullptr) - , mpSelector(nullptr) - , mpCharComboBox(nullptr) -{ - for (u32 iBox = 0; iBox < 4; iBox++) - mpSpinBoxes[iBox] = nullptr; - - for (u32 iLabel = 0; iLabel < 5; iLabel++) { - mpLabels[iLabel] = nullptr; - mpValueLayouts[iLabel] = nullptr; - } - - QVBoxLayout *pLayout = new QVBoxLayout(this); - pLayout->addWidget(mpGroupBox); - pLayout->setContentsMargins(0,0,0,0); - setLayout(pLayout); -} - -WAnimParamsEditor::WAnimParamsEditor(const CAnimationParameters& rkParams, QWidget *pParent) - : QWidget(pParent) - , mpGroupBox(new QGroupBox("Animation Parameters", this)) - , mpGroupLayout(nullptr) - , mpSelector(nullptr) - , mpCharComboBox(nullptr) -{ - for (u32 iBox = 0; iBox < 4; iBox++) - mpSpinBoxes[iBox] = nullptr; - - for (u32 iLabel = 0; iLabel < 5; iLabel++) { - mpLabels[iLabel] = nullptr; - mpValueLayouts[iLabel] = nullptr; - } - - QVBoxLayout *pLayout = new QVBoxLayout(this); - pLayout->addWidget(mpGroupBox); - pLayout->setContentsMargins(0,0,0,0); - setLayout(pLayout); - - mParams = rkParams; - SetupUI(); -} - -WAnimParamsEditor::~WAnimParamsEditor() -{ -} - -void WAnimParamsEditor::SetTitle(const QString& rkTitle) -{ - mpGroupBox->setTitle(rkTitle); -} - -void WAnimParamsEditor::SetParameters(const CAnimationParameters& rkParams) -{ - mParams = rkParams; - SetupUI(); -} - -// ************ PRIVATE SLOTS ************ -void WAnimParamsEditor::OnResourceChanged(QString Path) -{ - CResourceInfo ResInfo(Path.toStdString()); - if (ResInfo.Type() != "ANCS" && ResInfo.Type() != "CHAR") ResInfo = CResourceInfo(); - - mParams.SetResource(ResInfo); - emit ParametersChanged(mParams); -} - -void WAnimParamsEditor::OnCharacterChanged(int Index) -{ - mParams.SetCharIndex(Index); - emit ParametersChanged(mParams); -} - -void WAnimParamsEditor::OnUnknownChanged() -{ - for (u32 iBox = 0; iBox < 4; iBox++) - if (mpSpinBoxes[iBox]) - mParams.SetUnknown(iBox, mpSpinBoxes[iBox]->value()); - emit ParametersChanged(mParams); -} - -// ************ PRIVATE ************ -void WAnimParamsEditor::SetupUI() -{ - // Clean existing layout - if (!mLayoutWidgets.isEmpty()) - { - foreach (QObject *pObject, mLayoutWidgets) - delete pObject; - - mpSelector = nullptr; - mpCharComboBox = nullptr; - - for (u32 iBox = 0; iBox < 4; iBox++) - mpSpinBoxes[iBox] = nullptr; - - for (u32 iLabel = 0; iLabel < 5; iLabel++) { - mpLabels[iLabel] = nullptr; - mpValueLayouts[iLabel] = nullptr; - } - - mLayoutWidgets.clear(); - } - - delete mpGroupLayout; - mpGroupLayout = new QVBoxLayout(mpGroupBox); - mpGroupLayout->setContentsMargins(5,5,5,5); - mpGroupBox->setLayout(mpGroupLayout); - - // Create resource selector - mpLabels[0] = new QLabel(mParams.Version() <= eEchoes ? "AnimSet" : "Character"); - mpSelector = new WResourceSelector(this); - mpSelector->SetAllowedExtensions(mParams.Version() <= eEchoes ? "ANCS" : "CHAR"); - mpSelector->AdjustPreviewToParent(true); - mpSelector->SetResource(mParams.AnimSet()); - - mpValueLayouts[0] = new QHBoxLayout(this); - mpValueLayouts[0]->addWidget(mpLabels[0], 0); - mpValueLayouts[0]->addWidget(mpSelector, 1); - mpValueLayouts[0]->setSpacing(5); - mpGroupLayout->addLayout(mpValueLayouts[0]); - - mLayoutWidgets << mpLabels[0] << mpSelector << mpValueLayouts[0]; - connect(mpSelector, SIGNAL(ResourceChanged(QString)), this, SLOT(OnResourceChanged(QString))); - - // Create MP1/2 widgets - if (mParams.Version() <= eEchoes) - { - // Create character select combo box - mpCharComboBox = new QComboBox(this); - CAnimSet *pSet = static_cast(mParams.AnimSet()); - - if (pSet) - for (u32 iChar = 0; iChar < pSet->NumNodes(); iChar++) - mpCharComboBox->addItem(TO_QSTRING(pSet->NodeName(iChar))); - - mpCharComboBox->setCurrentIndex(mParams.CharacterIndex()); - mpLabels[1] = new QLabel("Character", this); - - // Create unknown spin box - mpSpinBoxes[0] = new WIntegralSpinBox(this); - mpSpinBoxes[0]->setRange(INT32_MIN, INT32_MAX); - mpSpinBoxes[0]->setFocusPolicy(Qt::StrongFocus); - mpSpinBoxes[0]->setContextMenuPolicy(Qt::NoContextMenu); - mpSpinBoxes[0]->setValue(mParams.Unknown(0)); - mpLabels[2] = new QLabel("Unknown", this); - - // Create layouts - mpValueLayouts[1] = new QHBoxLayout(this); - mpValueLayouts[1]->addWidget(mpLabels[1], 0); - mpValueLayouts[1]->addWidget(mpCharComboBox, 1); - mpValueLayouts[1]->setSpacing(5); - - mpValueLayouts[2] = new QHBoxLayout(this); - mpValueLayouts[2]->addWidget(mpLabels[2], 0); - mpValueLayouts[2]->addWidget(mpSpinBoxes[0], 1); - mpValueLayouts[2]->setSpacing(5); - - mpGroupLayout->addLayout(mpValueLayouts[1]); - mpGroupLayout->addLayout(mpValueLayouts[2]); - - // Finish UI - mLayoutWidgets << mpLabels[1] << mpCharComboBox << mpLabels[2] << mpSpinBoxes[0] << mpValueLayouts[1] << mpValueLayouts[2]; - connect(mpCharComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnCharacterChanged(int))); - connect(mpSpinBoxes[0], SIGNAL(valueChanged(int)), this, SLOT(OnUnknownChanged())); - } - - // Create MP3 widgets - else if (mParams.Version() <= eCorruption) - { - // Create unknown spin box - mpSpinBoxes[0] = new WIntegralSpinBox(this); - mpSpinBoxes[0]->setRange(INT32_MIN, INT32_MAX); - mpSpinBoxes[0]->setFocusPolicy(Qt::StrongFocus); - mpSpinBoxes[0]->setContextMenuPolicy(Qt::NoContextMenu); - mpSpinBoxes[0]->setValue(mParams.Unknown(0)); - mpLabels[1] = new QLabel("Unknown", this); - - // Create layouts - mpValueLayouts[1] = new QHBoxLayout(this); - mpValueLayouts[1]->addWidget(mpLabels[1], 0); - mpValueLayouts[1]->addWidget(mpSpinBoxes[0], 1); - mpValueLayouts[1]->setSpacing(5); - mpGroupLayout->addLayout(mpValueLayouts[1]); - - // Finish UI - mLayoutWidgets << mpLabels[1] << mpSpinBoxes[0] << mpValueLayouts[1]; - connect(mpSpinBoxes[0], SIGNAL(valueChanged(int)), this, SLOT(OnUnknownChanged())); - } - - // Create DKCR widgets - else if (mParams.Version() == eReturns) - { - // Create unknown spin box A - mpSpinBoxes[0] = new WIntegralSpinBox(this); - mpSpinBoxes[0]->setRange(0, 255); - mpSpinBoxes[0]->setFocusPolicy(Qt::StrongFocus); - mpSpinBoxes[0]->setContextMenuPolicy(Qt::NoContextMenu); - mpSpinBoxes[0]->setValue(mParams.Unknown(0)); - mpLabels[1] = new QLabel("Unknown", this); - - mpValueLayouts[1] = new QHBoxLayout(this); - mpValueLayouts[1]->addWidget(mpLabels[1], 0); - mpValueLayouts[1]->addWidget(mpSpinBoxes[0], 1); - mpValueLayouts[1]->setSpacing(5); - mpGroupLayout->addLayout(mpValueLayouts[1]); - - mLayoutWidgets << mpLabels[1] << mpSpinBoxes[0] << mpValueLayouts[1]; - connect(mpSpinBoxes[0], SIGNAL(valueChanged(int)), this, SLOT(OnUnknownChanged())); - - // Create unknown spin box B/C/D - for (u32 iBox = 1; iBox < 3; iBox++) - { - mpSpinBoxes[iBox] = new WIntegralSpinBox(this); - mpSpinBoxes[iBox]->setRange(INT32_MIN, INT32_MAX); - mpSpinBoxes[iBox]->setFocusPolicy(Qt::StrongFocus); - mpSpinBoxes[iBox]->setContextMenuPolicy(Qt::NoContextMenu); - mpSpinBoxes[iBox]->setValue(mParams.Unknown(iBox)); - mpLabels[iBox+1] = new QLabel("Unknown", this); - - mpValueLayouts[iBox+1] = new QHBoxLayout(this); - mpValueLayouts[iBox+1]->addWidget(mpLabels[iBox+1], 0); - mpValueLayouts[iBox+1]->addWidget(mpSpinBoxes[iBox], 1); - mpValueLayouts[iBox+1]->setSpacing(5); - mpGroupLayout->addLayout(mpValueLayouts[iBox+1]); - - mLayoutWidgets << mpLabels[iBox+1] << mpSpinBoxes[iBox] << mpValueLayouts[iBox+1]; - connect(mpSpinBoxes[iBox], SIGNAL(valueChanged(int)), this, SLOT(OnUnknownChanged())); - } - } -} diff --git a/src/Editor/Widgets/WAnimParamsEditor.h b/src/Editor/Widgets/WAnimParamsEditor.h deleted file mode 100644 index ca86e073..00000000 --- a/src/Editor/Widgets/WAnimParamsEditor.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef WANIMPARAMSEDITOR_H -#define WANIMPARAMSEDITOR_H - -#include "WIntegralSpinBox.h" -#include "WResourceSelector.h" -#include - -#include -#include -#include -#include -#include -#include -#include - -class WAnimParamsEditor : public QWidget -{ - Q_OBJECT - CAnimationParameters mParams; - - QGroupBox *mpGroupBox; - QVBoxLayout *mpGroupLayout; - - QHBoxLayout *mpValueLayouts[5]; - QLabel *mpLabels[5]; - WResourceSelector *mpSelector; - QComboBox *mpCharComboBox; - WIntegralSpinBox *mpSpinBoxes[4]; - QVector mLayoutWidgets; - -public: - WAnimParamsEditor(QWidget *pParent = 0); - WAnimParamsEditor(const CAnimationParameters& rkParams, QWidget *pParent = 0); - ~WAnimParamsEditor(); - void SetTitle(const QString& rkTitle); - void SetParameters(const CAnimationParameters& rkParams); - -signals: - void ParametersChanged(const CAnimationParameters& rkParams); - -private slots: - void OnResourceChanged(QString Path); - void OnCharacterChanged(int Index); - void OnUnknownChanged(); - -private: - void SetupUI(); -}; - -#endif // WANIMPARAMSEDITOR_H diff --git a/src/Editor/Widgets/WResourceSelector.cpp b/src/Editor/Widgets/WResourceSelector.cpp index 4e0a58b9..b66d4f6b 100644 --- a/src/Editor/Widgets/WResourceSelector.cpp +++ b/src/Editor/Widgets/WResourceSelector.cpp @@ -12,9 +12,6 @@ WResourceSelector::WResourceSelector(QWidget *parent) : QWidget(parent) - // Selector Members - , mShowEditButton(false) - , mShowExportButton(false) // Preview Panel Members , mpPreviewPanel(nullptr) , mEnablePreviewPanel(true) @@ -22,21 +19,18 @@ WResourceSelector::WResourceSelector(QWidget *parent) , mShowingPreviewPanel(false) , mAdjustPreviewToParent(false) // Resource Members + , mpResource(nullptr) , mResourceValid(false) { // Create Widgets mUI.LineEdit = new QLineEdit(this); mUI.BrowseButton = new QPushButton(this); - mUI.EditButton = new QPushButton("Edit", this); - mUI.ExportButton = new QPushButton("Export", this); // Create Layout mUI.Layout = new QHBoxLayout(this); setLayout(mUI.Layout); mUI.Layout->addWidget(mUI.LineEdit); mUI.Layout->addWidget(mUI.BrowseButton); - mUI.Layout->addWidget(mUI.EditButton); - mUI.Layout->addWidget(mUI.ExportButton); mUI.Layout->setContentsMargins(0,0,0,0); mUI.Layout->setSpacing(1); @@ -50,20 +44,6 @@ WResourceSelector::WResourceSelector(QWidget *parent) mUI.BrowseButton->setText("..."); mUI.BrowseButton->setMaximumSize(25, 23); mUI.BrowseButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - mUI.EditButton->installEventFilter(this); - mUI.EditButton->setMouseTracking(true); - mUI.EditButton->setMaximumSize(50, 23); - mUI.EditButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - mUI.EditButton->hide(); - mUI.ExportButton->installEventFilter(this); - mUI.ExportButton->setMouseTracking(true); - mUI.ExportButton->setMaximumSize(50, 23); - mUI.ExportButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - mUI.ExportButton->hide(); - - QCompleter *pCompleter = new QCompleter(this); - pCompleter->setModel(new QDirModel(pCompleter)); - mUI.LineEdit->setCompleter(pCompleter); connect(mUI.LineEdit, SIGNAL(editingFinished()), this, SLOT(OnLineEditTextEdited())); connect(mUI.BrowseButton, SIGNAL(clicked()), this, SLOT(OnBrowseButtonClicked())); @@ -93,45 +73,34 @@ bool WResourceSelector::eventFilter(QObject* /*pObj*/, QEvent *pEvent) bool WResourceSelector::IsSupportedExtension(const QString& rkExtension) { - foreach(const QString& str, mSupportedExtensions) - if (str == rkExtension) return true; + foreach(const QString& rkStr, mSupportedExtensions) + if (rkStr == rkExtension) return true; return false; } -bool WResourceSelector::HasSupportedExtension(const CResourceInfo& rkRes) +bool WResourceSelector::HasSupportedExtension(CResourceEntry *pEntry) { - return IsSupportedExtension(TO_QSTRING(rkRes.Type().ToString())); + return IsSupportedExtension(TO_QSTRING(pEntry->CookedExtension().ToString())); } void WResourceSelector::UpdateFrameColor() { - bool RedFrame = false; - - // Red frame should only display if an incorrect resource path is entered. It shouldn't display on Invalid Asset ID. - if (!mResourceValid) - { - TString Name = mResource.ToString().GetFileName(false); - - if (!Name.IsEmpty()) - { - if (!Name.IsHexString() || (Name.Size() != 8 && Name.Size() != 16) || mResource.ID().IsValid()) - RedFrame = true; - } - } + // Red frame should only display if the current path is either invalid or points to an entry of an invalid type. + bool RedFrame = (!GetText().isEmpty() && !mpResource) || (mpResource && !mResourceValid); mUI.LineEdit->setStyleSheet(RedFrame ? "border: 1px solid red" : ""); mUI.LineEdit->setFont(font()); } // ************ GETTERS ************ -CResourceInfo WResourceSelector::GetResourceInfo() +CResourceEntry* WResourceSelector::GetResourceEntry() { - return mResource; + return mpResource; } CResource* WResourceSelector::GetResource() { - return mResource.Load(); + return mpResource->Load(); } QString WResourceSelector::GetText() @@ -139,64 +108,50 @@ QString WResourceSelector::GetText() return mUI.LineEdit->text(); } -bool WResourceSelector::IsEditButtonEnabled() -{ - return mShowEditButton; -} - -bool WResourceSelector::IsExportButtonEnabled() -{ - return mShowExportButton; -} - bool WResourceSelector::IsPreviewPanelEnabled() { return mEnablePreviewPanel; } - // ************ SETTERS ************ void WResourceSelector::SetResource(CResource *pRes) { - if (pRes) - SetResource(CResourceInfo(pRes->FullSource())); - else - SetResource(CResourceInfo()); + SetResource(pRes ? pRes->Entry() : nullptr); +} + +void WResourceSelector::SetResource(CResourceEntry *pRes) +{ + if (mpResource != pRes) + { + mpResource = pRes; + + // We might prefer to have the line edit be cleared if pRes is null. However atm this function triggers + // when the user types in a resource path so I'd prefer for the text not to be cleared out in that case + if (mpResource) + { + TWideString Path = mpResource->HasRawVersion() ? mpResource->RawAssetPath(true) : mpResource->CookedAssetPath(true); + mUI.LineEdit->setText(TO_QSTRING(Path)); + mResourceValid = HasSupportedExtension(mpResource); + } + else + mResourceValid = false; + + UpdateFrameColor(); + CreatePreviewPanel(); + emit ResourceChanged(mpResource); + } +} + +void WResourceSelector::SetResource(const CAssetID& rkID) +{ + CResourceEntry *pEntry = gpResourceStore->FindEntry(rkID); + SetResource(pEntry); } void WResourceSelector::SetResource(const QString& rkRes) { - TString Res = TO_TSTRING(rkRes); - TString Name = Res.GetFileName(false); - TString Dir = Res.GetFileDirectory(); - TString Ext = Res.GetFileExtension(); - - if (Dir.IsEmpty() && Name.IsHexString() && (Name.Size() == 8 || Name.Size() == 16) && Ext.Size() == 4) - SetResource(CResourceInfo(Name.Size() == 8 ? Name.ToInt32() : Name.ToInt64(), Ext)); - else - SetResource(CResourceInfo(Res)); -} - -void WResourceSelector::SetResource(const CResourceInfo& rkRes) -{ - if (mResource != rkRes) - { - mResource = rkRes; - - if (mResource.IsValid()) - mResourceValid = HasSupportedExtension(rkRes); - else - mResourceValid = false; - - TString ResStr = mResource.ToString(); - if (ResStr.Contains("FFFFFFFF", false)) mUI.LineEdit->clear(); - else mUI.LineEdit->setText(TO_QSTRING(ResStr)); - - UpdateFrameColor(); - CreatePreviewPanel(); - SetButtonsBasedOnResType(); - emit ResourceChanged(TO_QSTRING(mResource.ToString())); - } + CResourceEntry *pEntry = gpResourceStore->FindEntry(TO_TWIDESTRING(rkRes)); + SetResource(pEntry); } void WResourceSelector::SetAllowedExtensions(const QString& rkExtension) @@ -215,21 +170,8 @@ void WResourceSelector::SetAllowedExtensions(const TStringList& rkExtensions) void WResourceSelector::SetText(const QString& rkResPath) { mUI.LineEdit->setText(rkResPath); - SetResource(rkResPath); -} - -void WResourceSelector::SetEditButtonEnabled(bool Enabled) -{ - mShowEditButton = Enabled; - if (Enabled) mUI.EditButton->show(); - else mUI.EditButton->hide(); -} - -void WResourceSelector::SetExportButtonEnabled(bool Enabled) -{ - mShowExportButton = Enabled; - if (Enabled) mUI.ExportButton->show(); - else mUI.ExportButton->hide(); + CResourceEntry *pEntry = gpResourceStore->FindEntry(TO_TWIDESTRING(rkResPath)); + SetResource(pEntry); } void WResourceSelector::SetPreviewPanelEnabled(bool Enabled) @@ -252,28 +194,28 @@ void WResourceSelector::OnLineEditTextEdited() void WResourceSelector::OnBrowseButtonClicked() { // Construct filter string - QString filter; + QString Filter; if (mSupportedExtensions.size() > 1) { - QString all = "All allowed extensions ("; + QString All = "All allowed extensions ("; for (int iExt = 0; iExt < mSupportedExtensions.size(); iExt++) { - if (iExt > 0) all += " "; - all += "*." + mSupportedExtensions[iExt]; + if (iExt > 0) All += " "; + All += "*." + mSupportedExtensions[iExt]; } - all += ")"; - filter += all + ";;"; + All += ")"; + Filter += All + ";;"; } for (int iExt = 0; iExt < mSupportedExtensions.size(); iExt++) { - if (iExt > 0) filter += ";;"; - filter += UICommon::ExtensionFilterString(mSupportedExtensions[iExt]); + if (iExt > 0) Filter += ";;"; + Filter += UICommon::ExtensionFilterString(mSupportedExtensions[iExt]); } - QString NewRes = QFileDialog::getOpenFileName(this, "Select resource", "", filter); + QString NewRes = QFileDialog::getOpenFileName(this, "Select resource", "", Filter); if (!NewRes.isEmpty()) { @@ -282,36 +224,14 @@ void WResourceSelector::OnBrowseButtonClicked() } } -void WResourceSelector::OnEditButtonClicked() -{ - Edit(); -} - -void WResourceSelector::OnExportButtonClicked() -{ - Export(); -} - // ************ PRIVATE ************ -// Should the resource selector handle edit/export itself -// or delegate it entirely to the signals? -void WResourceSelector::Edit() -{ - emit EditResource(mResource); -} - -void WResourceSelector::Export() -{ - emit ExportResource(mResource); -} - void WResourceSelector::CreatePreviewPanel() { delete mpPreviewPanel; mpPreviewPanel = nullptr; if (mResourceValid) - mpPreviewPanel = IPreviewPanel::CreatePanel(CResource::ResTypeForExtension(mResource.Type()), this); + mpPreviewPanel = IPreviewPanel::CreatePanel(mpResource->ResourceType(), this); if (!mpPreviewPanel) mPreviewPanelValid = false; @@ -319,7 +239,7 @@ void WResourceSelector::CreatePreviewPanel() { mPreviewPanelValid = true; mpPreviewPanel->setWindowFlags(Qt::ToolTip); - if (mResourceValid) mpPreviewPanel->SetResource(mResource.Load()); + if (mResourceValid) mpPreviewPanel->SetResource(mpResource->Load()); } } @@ -364,28 +284,3 @@ void WResourceSelector::HidePreviewPanel() mShowingPreviewPanel = false; } } - -void WResourceSelector::SetButtonsBasedOnResType() -{ - // Basically this function sets whether the "Export" and "Edit" - // buttons are present based on the resource type. - if (!mResource.IsValid()) - { - SetEditButtonEnabled(false); - SetExportButtonEnabled(false); - } - - else switch (CResource::ResTypeForExtension(mResource.Type())) - { - // Export button should be enabled here because CTexture already has a DDS export function - // However, need to figure out what sort of interface to create to do it. Disabling until then. - case eTexture: - SetEditButtonEnabled(false); - SetExportButtonEnabled(false); - break; - default: - SetEditButtonEnabled(false); - SetExportButtonEnabled(false); - break; - } -} diff --git a/src/Editor/Widgets/WResourceSelector.h b/src/Editor/Widgets/WResourceSelector.h index 322dda47..291beb0d 100644 --- a/src/Editor/Widgets/WResourceSelector.h +++ b/src/Editor/Widgets/WResourceSelector.h @@ -3,7 +3,6 @@ #include "IPreviewPanel.h" #include -#include #include #include @@ -18,8 +17,6 @@ class WResourceSelector : public QWidget // Selector QStringList mSupportedExtensions; - bool mShowEditButton; - bool mShowExportButton; // Preview Panel IPreviewPanel *mpPreviewPanel; @@ -29,23 +26,19 @@ class WResourceSelector : public QWidget bool mAdjustPreviewToParent; // Resource - CResourceInfo mResource; + CResourceEntry *mpResource; bool mResourceValid; // UI struct { QLineEdit *LineEdit; QPushButton *BrowseButton; - QPushButton *ExportButton; - QPushButton *EditButton; QHBoxLayout *Layout; } mUI; // Functions signals: - void ResourceChanged(const QString& rkNewResPath); - void EditResource(const CResourceInfo& rkRes); - void ExportResource(const CResourceInfo& rkRes); + void ResourceChanged(CResourceEntry *pNewRes); public: explicit WResourceSelector(QWidget *pParent = 0); @@ -53,27 +46,24 @@ public: bool event(QEvent *); bool eventFilter(QObject *, QEvent *); bool IsSupportedExtension(const QString& rkExtension); - bool HasSupportedExtension(const CResourceInfo& rkRes); + bool HasSupportedExtension(CResourceEntry *pEntry); void UpdateFrameColor(); // Getters - CResourceInfo GetResourceInfo(); + CResourceEntry* GetResourceEntry(); CResource* GetResource(); QString GetText(); - bool IsEditButtonEnabled(); - bool IsExportButtonEnabled(); bool IsPreviewPanelEnabled(); // Setters void SetResource(CResource *pRes); - void SetResource(const QString& rkRes); - void SetResource(const CResourceInfo& rkRes); + void SetResource(CResourceEntry *pEntry); + void SetResource(const CAssetID& rkID); + void SetResource(const QString& rkResPath); void SetAllowedExtensions(const QString& rkExtension); void SetAllowedExtensions(const QStringList& rkExtensions); void SetAllowedExtensions(const TStringList& rkExtensions); void SetText(const QString& rkResPath); - void SetEditButtonEnabled(bool Enabled); - void SetExportButtonEnabled(bool Enabled); void SetPreviewPanelEnabled(bool Enabled); void AdjustPreviewToParent(bool Adjust); @@ -81,16 +71,11 @@ public: public slots: void OnLineEditTextEdited(); void OnBrowseButtonClicked(); - void OnEditButtonClicked(); - void OnExportButtonClicked(); private: - void Edit(); - void Export(); void CreatePreviewPanel(); void ShowPreviewPanel(); void HidePreviewPanel(); - void SetButtonsBasedOnResType(); }; #endif // WRESOURCESELECTOR_H diff --git a/src/Editor/WorldEditor/CWorldEditor.cpp b/src/Editor/WorldEditor/CWorldEditor.cpp index 39b0c6a3..09326404 100644 --- a/src/Editor/WorldEditor/CWorldEditor.cpp +++ b/src/Editor/WorldEditor/CWorldEditor.cpp @@ -434,11 +434,11 @@ void CWorldEditor::OnPropertyModified(IProperty *pProp) } // If this is a model/character, then we'll treat this as a modified selection. This is to make sure the selection bounds updates. - if (pProp->Type() == eFileProperty) + if (pProp->Type() == eAssetProperty) { - CFileTemplate *pFile = static_cast(pProp->Template()); + CAssetTemplate *pAsset = static_cast(pProp->Template()); - if (pFile->AcceptsExtension("CMDL") || pFile->AcceptsExtension("ANCS") || pFile->AcceptsExtension("CHAR")) + if (pAsset->AcceptsExtension("CMDL") || pAsset->AcceptsExtension("ANCS") || pAsset->AcceptsExtension("CHAR")) SelectionModified(); } else if (pProp->Type() == eCharacterProperty) diff --git a/templates/dkcr/Script/AVIS.xml b/templates/dkcr/Script/AVIS.xml index a9aa605f..5a07b53c 100644 --- a/templates/dkcr/Script/AVIS.xml +++ b/templates/dkcr/Script/AVIS.xml @@ -3,8 +3,8 @@ AVIS - - + + diff --git a/templates/dkcr/Script/Actor.xml b/templates/dkcr/Script/Actor.xml index 9fe8e97f..5ed234da 100644 --- a/templates/dkcr/Script/Actor.xml +++ b/templates/dkcr/Script/Actor.xml @@ -17,8 +17,8 @@ - - + + diff --git a/templates/dkcr/Script/AreaAttributes.xml b/templates/dkcr/Script/AreaAttributes.xml index 2218e786..0ee3589d 100644 --- a/templates/dkcr/Script/AreaAttributes.xml +++ b/templates/dkcr/Script/AreaAttributes.xml @@ -13,7 +13,7 @@ 1.0 - + true diff --git a/templates/dkcr/Script/AreaNode.xml b/templates/dkcr/Script/AreaNode.xml index 89fdb0b7..aa593bbb 100644 --- a/templates/dkcr/Script/AreaNode.xml +++ b/templates/dkcr/Script/AreaNode.xml @@ -26,8 +26,8 @@ - - + + 0 @@ -37,17 +37,17 @@ 0.0, 0.0, 0.0 - - + + - + - - + + diff --git a/templates/dkcr/Script/AreaPath.xml b/templates/dkcr/Script/AreaPath.xml index 09d2b06e..5ef827a8 100644 --- a/templates/dkcr/Script/AreaPath.xml +++ b/templates/dkcr/Script/AreaPath.xml @@ -3,9 +3,9 @@ AreaPath - + - + 0x1F46814C @@ -31,8 +31,8 @@ - - + + diff --git a/templates/dkcr/Script/BarrelBalloon.xml b/templates/dkcr/Script/BarrelBalloon.xml index 99d74e0e..d436dd83 100644 --- a/templates/dkcr/Script/BarrelBalloon.xml +++ b/templates/dkcr/Script/BarrelBalloon.xml @@ -67,10 +67,10 @@ 0 - - - - + + + + diff --git a/templates/dkcr/Script/BarrelCannon.xml b/templates/dkcr/Script/BarrelCannon.xml index 5a5e573a..bdff65ef 100644 --- a/templates/dkcr/Script/BarrelCannon.xml +++ b/templates/dkcr/Script/BarrelCannon.xml @@ -9,11 +9,11 @@ 0.0, 0.0, 0.0 - + - + - + 200 diff --git a/templates/dkcr/Script/BeatUpHandler.xml b/templates/dkcr/Script/BeatUpHandler.xml index 42628762..9880afbb 100644 --- a/templates/dkcr/Script/BeatUpHandler.xml +++ b/templates/dkcr/Script/BeatUpHandler.xml @@ -46,7 +46,7 @@ - + diff --git a/templates/dkcr/Script/BirdBoss.xml b/templates/dkcr/Script/BirdBoss.xml index 2a4a68a7..2f5432f0 100644 --- a/templates/dkcr/Script/BirdBoss.xml +++ b/templates/dkcr/Script/BirdBoss.xml @@ -109,16 +109,16 @@ 1.0 - + - + - - + + diff --git a/templates/dkcr/Script/BouncyTire.xml b/templates/dkcr/Script/BouncyTire.xml index 49ec3269..1a69a6ef 100644 --- a/templates/dkcr/Script/BouncyTire.xml +++ b/templates/dkcr/Script/BouncyTire.xml @@ -36,9 +36,9 @@ 45.0 - - - + + + true diff --git a/templates/dkcr/Script/Cable.xml b/templates/dkcr/Script/Cable.xml index d67ad67d..223008ef 100644 --- a/templates/dkcr/Script/Cable.xml +++ b/templates/dkcr/Script/Cable.xml @@ -9,7 +9,7 @@ - + 0x2C8482EE @@ -92,7 +92,7 @@ 5.0 - + false diff --git a/templates/dkcr/Script/CameraFilterKeyframe.xml b/templates/dkcr/Script/CameraFilterKeyframe.xml index 3e5fbef3..29a05aae 100644 --- a/templates/dkcr/Script/CameraFilterKeyframe.xml +++ b/templates/dkcr/Script/CameraFilterKeyframe.xml @@ -24,8 +24,8 @@ 0.0 - - + + false diff --git a/templates/dkcr/Script/CameraShaker.xml b/templates/dkcr/Script/CameraShaker.xml index a3f20107..b8f5b5a4 100644 --- a/templates/dkcr/Script/CameraShaker.xml +++ b/templates/dkcr/Script/CameraShaker.xml @@ -21,7 +21,7 @@ 1.0 - + diff --git a/templates/dkcr/Script/Credits.xml b/templates/dkcr/Script/Credits.xml index 33ee6cd8..8d9f9dbd 100644 --- a/templates/dkcr/Script/Credits.xml +++ b/templates/dkcr/Script/Credits.xml @@ -56,9 +56,9 @@ 0.25 - - - + + + 0.25 diff --git a/templates/dkcr/Script/Debris.xml b/templates/dkcr/Script/Debris.xml index d95ce0c9..7888ef58 100644 --- a/templates/dkcr/Script/Debris.xml +++ b/templates/dkcr/Script/Debris.xml @@ -87,12 +87,12 @@ 1.0 - + 0.0, 0.0, 0.0 - - + + 1 @@ -117,7 +117,7 @@ 0.1 - + 1.0, 1.0, 1.0 @@ -131,7 +131,7 @@ true - + 1.0, 1.0, 1.0 @@ -145,7 +145,7 @@ true - + 1.0, 1.0, 1.0 diff --git a/templates/dkcr/Script/DepthOfFieldTuner.xml b/templates/dkcr/Script/DepthOfFieldTuner.xml index 30014c99..c8ffd5a0 100644 --- a/templates/dkcr/Script/DepthOfFieldTuner.xml +++ b/templates/dkcr/Script/DepthOfFieldTuner.xml @@ -12,7 +12,7 @@ false - + 0.0 diff --git a/templates/dkcr/Script/Effect.xml b/templates/dkcr/Script/Effect.xml index 1af63354..499c86be 100644 --- a/templates/dkcr/Script/Effect.xml +++ b/templates/dkcr/Script/Effect.xml @@ -3,7 +3,7 @@ Effect - + true diff --git a/templates/dkcr/Script/FactorySwitch.xml b/templates/dkcr/Script/FactorySwitch.xml index 06a1db59..2617af6a 100644 --- a/templates/dkcr/Script/FactorySwitch.xml +++ b/templates/dkcr/Script/FactorySwitch.xml @@ -3,8 +3,8 @@ FactorySwitch - - + + false @@ -13,8 +13,8 @@ - - + + false diff --git a/templates/dkcr/Script/GenericCreature.xml b/templates/dkcr/Script/GenericCreature.xml index 393de11e..1bc0077f 100644 --- a/templates/dkcr/Script/GenericCreature.xml +++ b/templates/dkcr/Script/GenericCreature.xml @@ -57,7 +57,7 @@ - + 0.1 @@ -177,7 +177,7 @@ 0.5 - + true @@ -201,11 +201,11 @@ 0 - - - - - + + + + + @@ -378,7 +378,7 @@ - + @@ -492,8 +492,8 @@ -1 - - + + 0.0 @@ -526,9 +526,9 @@ 5.0 - - - + + + 1.0 diff --git a/templates/dkcr/Script/GuiMenu.xml b/templates/dkcr/Script/GuiMenu.xml index eaae0105..ba380c51 100644 --- a/templates/dkcr/Script/GuiMenu.xml +++ b/templates/dkcr/Script/GuiMenu.xml @@ -3,7 +3,7 @@ GuiMenu - + true diff --git a/templates/dkcr/Script/GuiSlider.xml b/templates/dkcr/Script/GuiSlider.xml index e889f084..40db97e2 100644 --- a/templates/dkcr/Script/GuiSlider.xml +++ b/templates/dkcr/Script/GuiSlider.xml @@ -22,7 +22,7 @@ 1.0 - + 127 diff --git a/templates/dkcr/Script/HUD.xml b/templates/dkcr/Script/HUD.xml index 375114b9..4d59b91e 100644 --- a/templates/dkcr/Script/HUD.xml +++ b/templates/dkcr/Script/HUD.xml @@ -5,7 +5,7 @@ - + 0.25 @@ -22,17 +22,17 @@ 0.3 - - + + 0.0625 - - + + 0.3 - + 0.0, 0.0, 0.0, 1.0 @@ -54,24 +54,24 @@ - + - - - - - + + + + + - - + + - - - - - + + + + + @@ -80,20 +80,20 @@ - - - - - - + + + + + + - - - - + + + + @@ -101,43 +101,43 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -200,8 +200,8 @@ - - + + @@ -210,41 +210,41 @@ - + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + @@ -301,17 +301,17 @@ - - - - - - - + + + + + + + - - + + diff --git a/templates/dkcr/Script/IslandArea.xml b/templates/dkcr/Script/IslandArea.xml index 467a911c..1727e3d7 100644 --- a/templates/dkcr/Script/IslandArea.xml +++ b/templates/dkcr/Script/IslandArea.xml @@ -9,11 +9,11 @@ 0.0, 0.0, 0.0 - - + + - + 0x9DCDF5E0 @@ -31,12 +31,12 @@ - - - - - - + + + + + + @@ -90,13 +90,13 @@ - - - - - - - + + + + + + + diff --git a/templates/dkcr/Script/IslandHUD.xml b/templates/dkcr/Script/IslandHUD.xml index 6f63038c..9049c7fb 100644 --- a/templates/dkcr/Script/IslandHUD.xml +++ b/templates/dkcr/Script/IslandHUD.xml @@ -3,248 +3,248 @@ IslandHUD - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - - - - - - - - + + + + + + + + + - - - + + + @@ -253,59 +253,59 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + @@ -321,21 +321,21 @@ 3 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -343,12 +343,12 @@ - - - - - - + + + + + + diff --git a/templates/dkcr/Script/JungleBoss1.xml b/templates/dkcr/Script/JungleBoss1.xml index d9ecb605..dae18ec0 100644 --- a/templates/dkcr/Script/JungleBoss1.xml +++ b/templates/dkcr/Script/JungleBoss1.xml @@ -192,8 +192,8 @@ 6.0 - - + + diff --git a/templates/dkcr/Script/LODController.xml b/templates/dkcr/Script/LODController.xml index d094e47d..94d361c7 100644 --- a/templates/dkcr/Script/LODController.xml +++ b/templates/dkcr/Script/LODController.xml @@ -9,43 +9,43 @@ 1 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 diff --git a/templates/dkcr/Script/MineCart.xml b/templates/dkcr/Script/MineCart.xml index 13b84feb..a5d619f2 100644 --- a/templates/dkcr/Script/MineCart.xml +++ b/templates/dkcr/Script/MineCart.xml @@ -111,16 +111,16 @@ true - + - + - - + + 0 diff --git a/templates/dkcr/Script/MoleCart.xml b/templates/dkcr/Script/MoleCart.xml index dd49af04..3a1830de 100644 --- a/templates/dkcr/Script/MoleCart.xml +++ b/templates/dkcr/Script/MoleCart.xml @@ -23,10 +23,10 @@ 0.0, 0.0, 0.0 - - + + - + 0xAF8B265E diff --git a/templates/dkcr/Script/MoleTrainManager.xml b/templates/dkcr/Script/MoleTrainManager.xml index 8ed8ae11..a5ea44ae 100644 --- a/templates/dkcr/Script/MoleTrainManager.xml +++ b/templates/dkcr/Script/MoleTrainManager.xml @@ -16,7 +16,7 @@ - + diff --git a/templates/dkcr/Script/MultiModelActor.xml b/templates/dkcr/Script/MultiModelActor.xml index a5a225c2..e47e177e 100644 --- a/templates/dkcr/Script/MultiModelActor.xml +++ b/templates/dkcr/Script/MultiModelActor.xml @@ -12,10 +12,10 @@ 0.0, 0.0, 0.0 - + - + diff --git a/templates/dkcr/Script/MusicTrack.xml b/templates/dkcr/Script/MusicTrack.xml index 77ecc93c..6fcb28ab 100644 --- a/templates/dkcr/Script/MusicTrack.xml +++ b/templates/dkcr/Script/MusicTrack.xml @@ -5,7 +5,7 @@ - + false diff --git a/templates/dkcr/Script/OceanBridge.xml b/templates/dkcr/Script/OceanBridge.xml index 570ae8d3..d146a26c 100644 --- a/templates/dkcr/Script/OceanBridge.xml +++ b/templates/dkcr/Script/OceanBridge.xml @@ -6,18 +6,18 @@ - + 0 - - - - - + + + + + @@ -177,22 +177,22 @@ 1.0 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -201,9 +201,9 @@ - - - + + + diff --git a/templates/dkcr/Script/OceanWave.xml b/templates/dkcr/Script/OceanWave.xml index e94b4ffb..40534513 100644 --- a/templates/dkcr/Script/OceanWave.xml +++ b/templates/dkcr/Script/OceanWave.xml @@ -3,7 +3,7 @@ OceanWave - + diff --git a/templates/dkcr/Script/OptionalAreaAsset.xml b/templates/dkcr/Script/OptionalAreaAsset.xml index 4fec0692..c2ea0409 100644 --- a/templates/dkcr/Script/OptionalAreaAsset.xml +++ b/templates/dkcr/Script/OptionalAreaAsset.xml @@ -10,7 +10,7 @@ - + diff --git a/templates/dkcr/Script/Peanut.xml b/templates/dkcr/Script/Peanut.xml index 418db846..ee2fb4ad 100644 --- a/templates/dkcr/Script/Peanut.xml +++ b/templates/dkcr/Script/Peanut.xml @@ -33,10 +33,10 @@ 25.0 - - - - + + + + 1.0, 1.0, 1.0 @@ -50,15 +50,15 @@ true - + 1.0, 1.0, 1.0 - - - - + + + + 1.0 diff --git a/templates/dkcr/Script/Pickup.xml b/templates/dkcr/Script/Pickup.xml index 9ebdda9e..dfa96249 100644 --- a/templates/dkcr/Script/Pickup.xml +++ b/templates/dkcr/Script/Pickup.xml @@ -10,9 +10,9 @@ 0.0, 0.0, 0.0 - + - + @@ -56,19 +56,19 @@ 1.0, 1.0, 1.0 - - - - - - - - - - - - - + + + + + + + + + + + + + 0 diff --git a/templates/dkcr/Script/Platform.xml b/templates/dkcr/Script/Platform.xml index c8e5d275..10f3ba4e 100644 --- a/templates/dkcr/Script/Platform.xml +++ b/templates/dkcr/Script/Platform.xml @@ -9,11 +9,11 @@ 0.0, 0.0, 0.0 - + - + diff --git a/templates/dkcr/Script/PlayerActor.xml b/templates/dkcr/Script/PlayerActor.xml index 9dea04b4..d7c9eb81 100644 --- a/templates/dkcr/Script/PlayerActor.xml +++ b/templates/dkcr/Script/PlayerActor.xml @@ -17,7 +17,7 @@ - + diff --git a/templates/dkcr/Script/PlayerRespawn.xml b/templates/dkcr/Script/PlayerRespawn.xml index a08f3fc8..a2d5fb9f 100644 --- a/templates/dkcr/Script/PlayerRespawn.xml +++ b/templates/dkcr/Script/PlayerRespawn.xml @@ -42,7 +42,7 @@ 0.75 - + diff --git a/templates/dkcr/Script/PlayerToken.xml b/templates/dkcr/Script/PlayerToken.xml index 19883e3b..30ff7876 100644 --- a/templates/dkcr/Script/PlayerToken.xml +++ b/templates/dkcr/Script/PlayerToken.xml @@ -3,7 +3,7 @@ PlayerToken - + diff --git a/templates/dkcr/Script/ReactiveObject.xml b/templates/dkcr/Script/ReactiveObject.xml index 743dac2e..b1e37caf 100644 --- a/templates/dkcr/Script/ReactiveObject.xml +++ b/templates/dkcr/Script/ReactiveObject.xml @@ -9,7 +9,7 @@ 0.0, 0.0, 0.0 - + diff --git a/templates/dkcr/Script/RespawnBalloon.xml b/templates/dkcr/Script/RespawnBalloon.xml index 5677b298..2c4229a2 100644 --- a/templates/dkcr/Script/RespawnBalloon.xml +++ b/templates/dkcr/Script/RespawnBalloon.xml @@ -28,10 +28,10 @@ 1.0 - - - - + + + + 1.0 diff --git a/templates/dkcr/Script/RobotChicken.xml b/templates/dkcr/Script/RobotChicken.xml index b9999e05..4637505f 100644 --- a/templates/dkcr/Script/RobotChicken.xml +++ b/templates/dkcr/Script/RobotChicken.xml @@ -110,7 +110,7 @@ false - + -1 diff --git a/templates/dkcr/Script/RobotChickenFlyer.xml b/templates/dkcr/Script/RobotChickenFlyer.xml index 93a9643e..ca4f2225 100644 --- a/templates/dkcr/Script/RobotChickenFlyer.xml +++ b/templates/dkcr/Script/RobotChickenFlyer.xml @@ -110,17 +110,17 @@ 1.0 - + - + - - - + + + diff --git a/templates/dkcr/Script/RocketBarrel.xml b/templates/dkcr/Script/RocketBarrel.xml index d3adddb1..f32f0034 100644 --- a/templates/dkcr/Script/RocketBarrel.xml +++ b/templates/dkcr/Script/RocketBarrel.xml @@ -85,11 +85,11 @@ -16.0 - + - + @@ -126,7 +126,7 @@ - + diff --git a/templates/dkcr/Script/Sound.xml b/templates/dkcr/Script/Sound.xml index 57df3a14..574435ef 100644 --- a/templates/dkcr/Script/Sound.xml +++ b/templates/dkcr/Script/Sound.xml @@ -3,7 +3,7 @@ Sound - + 0.0 diff --git a/templates/dkcr/Script/Spinner.xml b/templates/dkcr/Script/Spinner.xml index bef98060..8ed27c41 100644 --- a/templates/dkcr/Script/Spinner.xml +++ b/templates/dkcr/Script/Spinner.xml @@ -71,7 +71,7 @@ - + 0x2FD7B2AA diff --git a/templates/dkcr/Script/StreamedAudio.xml b/templates/dkcr/Script/StreamedAudio.xml index 479bac4d..e6ea559b 100644 --- a/templates/dkcr/Script/StreamedAudio.xml +++ b/templates/dkcr/Script/StreamedAudio.xml @@ -3,7 +3,7 @@ StreamedAudio - + false diff --git a/templates/dkcr/Script/Subtitles.xml b/templates/dkcr/Script/Subtitles.xml index c8c24340..e57e1c4e 100644 --- a/templates/dkcr/Script/Subtitles.xml +++ b/templates/dkcr/Script/Subtitles.xml @@ -41,7 +41,7 @@ 100 - + 0 diff --git a/templates/dkcr/Script/SuspensionBridge.xml b/templates/dkcr/Script/SuspensionBridge.xml index 0ee3e586..a445d544 100644 --- a/templates/dkcr/Script/SuspensionBridge.xml +++ b/templates/dkcr/Script/SuspensionBridge.xml @@ -4,9 +4,9 @@ - + - + diff --git a/templates/dkcr/Script/SwingRope.xml b/templates/dkcr/Script/SwingRope.xml index 42f98f25..cf782ccf 100644 --- a/templates/dkcr/Script/SwingRope.xml +++ b/templates/dkcr/Script/SwingRope.xml @@ -17,9 +17,9 @@ - - - + + + 45.0 diff --git a/templates/dkcr/Script/TPND.xml b/templates/dkcr/Script/TPND.xml index 0eee3364..4a658701 100644 --- a/templates/dkcr/Script/TPND.xml +++ b/templates/dkcr/Script/TPND.xml @@ -10,8 +10,8 @@ 0.0, 0.0, 0.0 - - + + diff --git a/templates/dkcr/Script/TextPane.xml b/templates/dkcr/Script/TextPane.xml index 70705ee5..3c39acaf 100644 --- a/templates/dkcr/Script/TextPane.xml +++ b/templates/dkcr/Script/TextPane.xml @@ -37,7 +37,7 @@ 0.0, 0.0, 0.0 - + 1 diff --git a/templates/dkcr/Script/TippyPlatform.xml b/templates/dkcr/Script/TippyPlatform.xml index e719a077..b794f9b4 100644 --- a/templates/dkcr/Script/TippyPlatform.xml +++ b/templates/dkcr/Script/TippyPlatform.xml @@ -10,8 +10,8 @@ 0.0, 0.0, 0.0 - - + + diff --git a/templates/dkcr/Script/Tutorial.xml b/templates/dkcr/Script/Tutorial.xml index c42cbf21..cc49159f 100644 --- a/templates/dkcr/Script/Tutorial.xml +++ b/templates/dkcr/Script/Tutorial.xml @@ -26,8 +26,8 @@ 2.0 - - + + false diff --git a/templates/dkcr/Script/VerticalRocketBarrel.xml b/templates/dkcr/Script/VerticalRocketBarrel.xml index b774b5b4..535f7569 100644 --- a/templates/dkcr/Script/VerticalRocketBarrel.xml +++ b/templates/dkcr/Script/VerticalRocketBarrel.xml @@ -97,11 +97,11 @@ 1.0 - + - + diff --git a/templates/dkcr/Script/VolcanoBossBodyPart.xml b/templates/dkcr/Script/VolcanoBossBodyPart.xml index 1683f94e..edc8defd 100644 --- a/templates/dkcr/Script/VolcanoBossBodyPart.xml +++ b/templates/dkcr/Script/VolcanoBossBodyPart.xml @@ -105,14 +105,14 @@ 0.5 - + - + 1.5 @@ -126,8 +126,8 @@ 0.2 - - + + diff --git a/templates/dkcr/Structs/DamageEffectData.xml b/templates/dkcr/Structs/DamageEffectData.xml index 028ab179..15e6abb1 100644 --- a/templates/dkcr/Structs/DamageEffectData.xml +++ b/templates/dkcr/Structs/DamageEffectData.xml @@ -53,14 +53,14 @@ false - + 1.0 1.0, 1.0, 1.0 - + false diff --git a/templates/dkcr/Structs/ForestBossStructA.xml b/templates/dkcr/Structs/ForestBossStructA.xml index 199a285f..c44364b8 100644 --- a/templates/dkcr/Structs/ForestBossStructA.xml +++ b/templates/dkcr/Structs/ForestBossStructA.xml @@ -1,7 +1,7 @@ - + diff --git a/templates/dkcr/Structs/ForestBossStructC.xml b/templates/dkcr/Structs/ForestBossStructC.xml index f70ea074..c0c27f3b 100644 --- a/templates/dkcr/Structs/ForestBossStructC.xml +++ b/templates/dkcr/Structs/ForestBossStructC.xml @@ -7,8 +7,8 @@ - - + + 1.5 diff --git a/templates/dkcr/Structs/GenericCreatureStructA.xml b/templates/dkcr/Structs/GenericCreatureStructA.xml index 4a0b88fc..b200c8ae 100644 --- a/templates/dkcr/Structs/GenericCreatureStructA.xml +++ b/templates/dkcr/Structs/GenericCreatureStructA.xml @@ -120,7 +120,7 @@ 3.0 - + false @@ -330,13 +330,13 @@ 1.0, 1.0, 1.0 - - - - - - - + + + + + + + @@ -434,7 +434,7 @@ 0.8 - + false @@ -723,7 +723,7 @@ 8.0 - + @@ -822,7 +822,7 @@ 2.0 - + @@ -901,7 +901,7 @@ false - + 2.0 @@ -1290,7 +1290,7 @@ 0.0 - + diff --git a/templates/dkcr/Structs/GenericCreatureStructC.xml b/templates/dkcr/Structs/GenericCreatureStructC.xml index 8ec49e5b..2dcdcfeb 100644 --- a/templates/dkcr/Structs/GenericCreatureStructC.xml +++ b/templates/dkcr/Structs/GenericCreatureStructC.xml @@ -2,7 +2,7 @@ - + false diff --git a/templates/dkcr/Structs/IslandAreaStruct.xml b/templates/dkcr/Structs/IslandAreaStruct.xml index 7c71875f..e28911e9 100644 --- a/templates/dkcr/Structs/IslandAreaStruct.xml +++ b/templates/dkcr/Structs/IslandAreaStruct.xml @@ -4,7 +4,7 @@ 0 - - + + diff --git a/templates/dkcr/Structs/IslandHudStruct.xml b/templates/dkcr/Structs/IslandHudStruct.xml index 76623125..0ecbb209 100644 --- a/templates/dkcr/Structs/IslandHudStruct.xml +++ b/templates/dkcr/Structs/IslandHudStruct.xml @@ -2,15 +2,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/templates/dkcr/Structs/JungleBossStructA.xml b/templates/dkcr/Structs/JungleBossStructA.xml index eabbd554..5b8debcb 100644 --- a/templates/dkcr/Structs/JungleBossStructA.xml +++ b/templates/dkcr/Structs/JungleBossStructA.xml @@ -1,7 +1,7 @@ - + 15.0 diff --git a/templates/dkcr/Structs/LayerToggle.xml b/templates/dkcr/Structs/LayerToggle.xml index 98052c64..286e54d6 100644 --- a/templates/dkcr/Structs/LayerToggle.xml +++ b/templates/dkcr/Structs/LayerToggle.xml @@ -1,7 +1,7 @@ - + diff --git a/templates/dkcr/Structs/MinecartStructC.xml b/templates/dkcr/Structs/MinecartStructC.xml index d8c9b456..275ccb10 100644 --- a/templates/dkcr/Structs/MinecartStructC.xml +++ b/templates/dkcr/Structs/MinecartStructC.xml @@ -2,15 +2,15 @@ - + - + - - + + diff --git a/templates/dkcr/Structs/MinecartStructD.xml b/templates/dkcr/Structs/MinecartStructD.xml index bafee8ec..c650a31d 100644 --- a/templates/dkcr/Structs/MinecartStructD.xml +++ b/templates/dkcr/Structs/MinecartStructD.xml @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/templates/dkcr/Structs/MoleCartStruct.xml b/templates/dkcr/Structs/MoleCartStruct.xml index 5857825b..dcc854d1 100644 --- a/templates/dkcr/Structs/MoleCartStruct.xml +++ b/templates/dkcr/Structs/MoleCartStruct.xml @@ -17,7 +17,7 @@ 0.5 - + diff --git a/templates/dkcr/Structs/MultiModelActorStruct.xml b/templates/dkcr/Structs/MultiModelActorStruct.xml index d0e85289..26ec9a57 100644 --- a/templates/dkcr/Structs/MultiModelActorStruct.xml +++ b/templates/dkcr/Structs/MultiModelActorStruct.xml @@ -1,7 +1,7 @@ - + 0.0 diff --git a/templates/dkcr/Structs/PatternedAI.xml b/templates/dkcr/Structs/PatternedAI.xml index 3fd043ea..d81604a2 100644 --- a/templates/dkcr/Structs/PatternedAI.xml +++ b/templates/dkcr/Structs/PatternedAI.xml @@ -26,8 +26,8 @@ 0.16 - - + + 0 @@ -37,9 +37,9 @@ false - - - + + + true diff --git a/templates/dkcr/Structs/PeanutStruct.xml b/templates/dkcr/Structs/PeanutStruct.xml index e5aa6fef..9b6065e9 100644 --- a/templates/dkcr/Structs/PeanutStruct.xml +++ b/templates/dkcr/Structs/PeanutStruct.xml @@ -2,7 +2,7 @@ - - + + diff --git a/templates/dkcr/Structs/ProjectileBounceData.xml b/templates/dkcr/Structs/ProjectileBounceData.xml index 97317035..4be6b0b8 100644 --- a/templates/dkcr/Structs/ProjectileBounceData.xml +++ b/templates/dkcr/Structs/ProjectileBounceData.xml @@ -4,11 +4,11 @@ 1 - + 1.0 - + false diff --git a/templates/dkcr/Structs/ProjectileData.xml b/templates/dkcr/Structs/ProjectileData.xml index 5993ff71..bef3aee8 100644 --- a/templates/dkcr/Structs/ProjectileData.xml +++ b/templates/dkcr/Structs/ProjectileData.xml @@ -17,15 +17,15 @@ false - - - + + + false - - - + + + 0x482099A8 diff --git a/templates/dkcr/Structs/ProjectileRenderData.xml b/templates/dkcr/Structs/ProjectileRenderData.xml index 2a83cc3d..4fce2a2a 100644 --- a/templates/dkcr/Structs/ProjectileRenderData.xml +++ b/templates/dkcr/Structs/ProjectileRenderData.xml @@ -11,7 +11,7 @@ - + diff --git a/templates/dkcr/Structs/ShadowData.xml b/templates/dkcr/Structs/ShadowData.xml index 5b24617f..ea4fc6f5 100644 --- a/templates/dkcr/Structs/ShadowData.xml +++ b/templates/dkcr/Structs/ShadowData.xml @@ -4,7 +4,7 @@ false - + 0xB5F070C1 diff --git a/templates/dkcr/Structs/TextProperties.xml b/templates/dkcr/Structs/TextProperties.xml index 6479240c..4d9d6a5b 100644 --- a/templates/dkcr/Structs/TextProperties.xml +++ b/templates/dkcr/Structs/TextProperties.xml @@ -34,7 +34,7 @@ 0.0, 0.0, 0.0, 1.0 - + 0 diff --git a/templates/dkcr/Structs/UnknownStruct.xml b/templates/dkcr/Structs/UnknownStruct.xml index 34dab41b..abacd4f8 100644 --- a/templates/dkcr/Structs/UnknownStruct.xml +++ b/templates/dkcr/Structs/UnknownStruct.xml @@ -1,6 +1,6 @@ - + diff --git a/templates/dkcr/Structs/UnknownStruct25.xml b/templates/dkcr/Structs/UnknownStruct25.xml index 69b38825..b8570e3d 100644 --- a/templates/dkcr/Structs/UnknownStruct25.xml +++ b/templates/dkcr/Structs/UnknownStruct25.xml @@ -2,6 +2,6 @@ - + diff --git a/templates/dkcr/Structs/UnknownStruct27.xml b/templates/dkcr/Structs/UnknownStruct27.xml index 2565283e..3cda6a4b 100644 --- a/templates/dkcr/Structs/UnknownStruct27.xml +++ b/templates/dkcr/Structs/UnknownStruct27.xml @@ -1,16 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/templates/dkcr/Structs/UnknownStruct28.xml b/templates/dkcr/Structs/UnknownStruct28.xml index 8428fa14..da4989b8 100644 --- a/templates/dkcr/Structs/UnknownStruct28.xml +++ b/templates/dkcr/Structs/UnknownStruct28.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/templates/dkcr/Structs/UnknownStruct29.xml b/templates/dkcr/Structs/UnknownStruct29.xml index 431b620c..c8ed2d35 100644 --- a/templates/dkcr/Structs/UnknownStruct29.xml +++ b/templates/dkcr/Structs/UnknownStruct29.xml @@ -1,6 +1,6 @@ - + diff --git a/templates/dkcr/Structs/UnknownStruct30.xml b/templates/dkcr/Structs/UnknownStruct30.xml index 20d4428f..fe9932cb 100644 --- a/templates/dkcr/Structs/UnknownStruct30.xml +++ b/templates/dkcr/Structs/UnknownStruct30.xml @@ -2,73 +2,73 @@ - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + - + diff --git a/templates/dkcr/Structs/UnknownStruct31.xml b/templates/dkcr/Structs/UnknownStruct31.xml index 05a2e090..4680315b 100644 --- a/templates/dkcr/Structs/UnknownStruct31.xml +++ b/templates/dkcr/Structs/UnknownStruct31.xml @@ -2,24 +2,24 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/templates/dkcr/Structs/UnknownStruct33.xml b/templates/dkcr/Structs/UnknownStruct33.xml index a290790c..fe83aebe 100644 --- a/templates/dkcr/Structs/UnknownStruct33.xml +++ b/templates/dkcr/Structs/UnknownStruct33.xml @@ -53,9 +53,9 @@ 0.0 - - - + + + 0.5 diff --git a/templates/dkcr/Structs/UnknownStruct34.xml b/templates/dkcr/Structs/UnknownStruct34.xml index 30056898..3747f064 100644 --- a/templates/dkcr/Structs/UnknownStruct34.xml +++ b/templates/dkcr/Structs/UnknownStruct34.xml @@ -1,10 +1,10 @@ - - - - - + + + + + diff --git a/templates/dkcr/Structs/UnknownStruct36.xml b/templates/dkcr/Structs/UnknownStruct36.xml index 201eb789..eb4c7ff4 100644 --- a/templates/dkcr/Structs/UnknownStruct36.xml +++ b/templates/dkcr/Structs/UnknownStruct36.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/templates/dkcr/Structs/UnknownStruct39.xml b/templates/dkcr/Structs/UnknownStruct39.xml index c9e024c9..44166b50 100644 --- a/templates/dkcr/Structs/UnknownStruct39.xml +++ b/templates/dkcr/Structs/UnknownStruct39.xml @@ -7,10 +7,10 @@ 5.25 - - - - - + + + + + diff --git a/templates/dkcr/Structs/UnknownStruct41.xml b/templates/dkcr/Structs/UnknownStruct41.xml index 4f9f1a29..9006b692 100644 --- a/templates/dkcr/Structs/UnknownStruct41.xml +++ b/templates/dkcr/Structs/UnknownStruct41.xml @@ -19,8 +19,8 @@ 1.0, 1.0, 1.0 - - - + + + diff --git a/templates/dkcr/Structs/UnknownStruct44.xml b/templates/dkcr/Structs/UnknownStruct44.xml index 04f2db07..ce85058d 100644 --- a/templates/dkcr/Structs/UnknownStruct44.xml +++ b/templates/dkcr/Structs/UnknownStruct44.xml @@ -46,9 +46,9 @@ 12.0 - - - + + + 15.0 @@ -178,7 +178,7 @@ - + 0.5 @@ -186,11 +186,11 @@ 4.5 - + - - - + + + @@ -237,15 +237,15 @@ 1.0 - + -2.0, 0.4, 1.6 - + 0.0, 0.0, 0.0 - + 1.1 @@ -295,7 +295,7 @@ 0.4 - + @@ -415,7 +415,7 @@ 0.1 - + 0.5 @@ -451,11 +451,11 @@ 2.5 - - - + + + - + @@ -513,9 +513,9 @@ false - - - + + + @@ -553,14 +553,14 @@ 1 - - + + 0x82B6A62A - + 1.0, 1.0, 1.0, 1.0 @@ -580,7 +580,7 @@ - + 0x4F049055 @@ -616,12 +616,12 @@ 1.0 - + - + - - + + @@ -727,8 +727,8 @@ - - + + 1.0 diff --git a/templates/dkcr/Structs/UnknownStruct45.xml b/templates/dkcr/Structs/UnknownStruct45.xml index 67237074..90074b20 100644 --- a/templates/dkcr/Structs/UnknownStruct45.xml +++ b/templates/dkcr/Structs/UnknownStruct45.xml @@ -38,7 +38,7 @@ false - - + + diff --git a/templates/dkcr/Structs/UnknownStruct47.xml b/templates/dkcr/Structs/UnknownStruct47.xml index 07501ef4..b12066c7 100644 --- a/templates/dkcr/Structs/UnknownStruct47.xml +++ b/templates/dkcr/Structs/UnknownStruct47.xml @@ -1,7 +1,7 @@ - - + + diff --git a/templates/dkcr/Structs/UnknownStruct56.xml b/templates/dkcr/Structs/UnknownStruct56.xml index aadfe37e..59bcbc05 100644 --- a/templates/dkcr/Structs/UnknownStruct56.xml +++ b/templates/dkcr/Structs/UnknownStruct56.xml @@ -40,7 +40,7 @@ 1.0 - + diff --git a/templates/dkcr/Structs/UnknownStruct7.xml b/templates/dkcr/Structs/UnknownStruct7.xml index 111c9235..b528a755 100644 --- a/templates/dkcr/Structs/UnknownStruct7.xml +++ b/templates/dkcr/Structs/UnknownStruct7.xml @@ -1,7 +1,7 @@ - + diff --git a/templates/mp1/Script/Actor.xml b/templates/mp1/Script/Actor.xml index e1c888b7..d2603c2a 100644 --- a/templates/mp1/Script/Actor.xml +++ b/templates/mp1/Script/Actor.xml @@ -12,7 +12,7 @@ - + diff --git a/templates/mp1/Script/ActorContraption.xml b/templates/mp1/Script/ActorContraption.xml index 04869695..d1832e14 100644 --- a/templates/mp1/Script/ActorContraption.xml +++ b/templates/mp1/Script/ActorContraption.xml @@ -14,7 +14,7 @@ - + diff --git a/templates/mp1/Script/AreaAttributes.xml b/templates/mp1/Script/AreaAttributes.xml index 18773692..02670412 100644 --- a/templates/mp1/Script/AreaAttributes.xml +++ b/templates/mp1/Script/AreaAttributes.xml @@ -18,7 +18,7 @@ - + diff --git a/templates/mp1/Script/AtomicAlpha.xml b/templates/mp1/Script/AtomicAlpha.xml index 6dd6fd47..d20568de 100644 --- a/templates/mp1/Script/AtomicAlpha.xml +++ b/templates/mp1/Script/AtomicAlpha.xml @@ -8,8 +8,8 @@ - - + + diff --git a/templates/mp1/Script/AtomicBeta.xml b/templates/mp1/Script/AtomicBeta.xml index ed66345f..3da38108 100644 --- a/templates/mp1/Script/AtomicBeta.xml +++ b/templates/mp1/Script/AtomicBeta.xml @@ -8,10 +8,10 @@ - - + + - + diff --git a/templates/mp1/Script/Babygoth.xml b/templates/mp1/Script/Babygoth.xml index 27afee7d..277bf522 100644 --- a/templates/mp1/Script/Babygoth.xml +++ b/templates/mp1/Script/Babygoth.xml @@ -10,31 +10,31 @@ - + - - + + - - + + - - - - + + + + - + - + diff --git a/templates/mp1/Script/Beetle.xml b/templates/mp1/Script/Beetle.xml index 001613bf..5d894486 100644 --- a/templates/mp1/Script/Beetle.xml +++ b/templates/mp1/Script/Beetle.xml @@ -16,7 +16,7 @@ - + diff --git a/templates/mp1/Script/BloodFlower.xml b/templates/mp1/Script/BloodFlower.xml index da70c600..155390be 100644 --- a/templates/mp1/Script/BloodFlower.xml +++ b/templates/mp1/Script/BloodFlower.xml @@ -8,17 +8,17 @@ - - - + + + - - - + + + - + diff --git a/templates/mp1/Script/Burrower.xml b/templates/mp1/Script/Burrower.xml index d9ba611c..ee071ce6 100644 --- a/templates/mp1/Script/Burrower.xml +++ b/templates/mp1/Script/Burrower.xml @@ -8,13 +8,13 @@ - - - + + + - + - + diff --git a/templates/mp1/Script/CameraFilterKeyframe.xml b/templates/mp1/Script/CameraFilterKeyframe.xml index 0fc5008b..dfe4b616 100644 --- a/templates/mp1/Script/CameraFilterKeyframe.xml +++ b/templates/mp1/Script/CameraFilterKeyframe.xml @@ -11,7 +11,7 @@ - + diff --git a/templates/mp1/Script/ChozoGhost.xml b/templates/mp1/Script/ChozoGhost.xml index 4f2049ee..e9e94e7f 100644 --- a/templates/mp1/Script/ChozoGhost.xml +++ b/templates/mp1/Script/ChozoGhost.xml @@ -12,9 +12,9 @@ - + - + @@ -27,7 +27,7 @@ - + diff --git a/templates/mp1/Script/DamageableTrigger.xml b/templates/mp1/Script/DamageableTrigger.xml index bb153a73..f598b8aa 100644 --- a/templates/mp1/Script/DamageableTrigger.xml +++ b/templates/mp1/Script/DamageableTrigger.xml @@ -18,9 +18,9 @@ - - - + + + diff --git a/templates/mp1/Script/Debris.xml b/templates/mp1/Script/Debris.xml index 798e88f5..a730dfe9 100644 --- a/templates/mp1/Script/Debris.xml +++ b/templates/mp1/Script/Debris.xml @@ -14,9 +14,9 @@ - + - + diff --git a/templates/mp1/Script/DebrisExtended.xml b/templates/mp1/Script/DebrisExtended.xml index 4ef4dcd2..f33c4d80 100644 --- a/templates/mp1/Script/DebrisExtended.xml +++ b/templates/mp1/Script/DebrisExtended.xml @@ -22,19 +22,19 @@ - + - + - + - + diff --git a/templates/mp1/Script/Drone.xml b/templates/mp1/Script/Drone.xml index de8f75c7..f7123e2e 100644 --- a/templates/mp1/Script/Drone.xml +++ b/templates/mp1/Script/Drone.xml @@ -13,9 +13,9 @@ - - - + + + @@ -40,7 +40,7 @@ - + diff --git a/templates/mp1/Script/Effect.xml b/templates/mp1/Script/Effect.xml index 6680ff4a..81d09730 100644 --- a/templates/mp1/Script/Effect.xml +++ b/templates/mp1/Script/Effect.xml @@ -6,8 +6,8 @@ - - + + diff --git a/templates/mp1/Script/ElectroMagneticPulse.xml b/templates/mp1/Script/ElectroMagneticPulse.xml index cb2deb48..46bb3be9 100644 --- a/templates/mp1/Script/ElectroMagneticPulse.xml +++ b/templates/mp1/Script/ElectroMagneticPulse.xml @@ -13,7 +13,7 @@ - + diff --git a/templates/mp1/Script/ElitePirate.xml b/templates/mp1/Script/ElitePirate.xml index 7037f1c4..6e707903 100644 --- a/templates/mp1/Script/ElitePirate.xml +++ b/templates/mp1/Script/ElitePirate.xml @@ -16,19 +16,19 @@ - + - + - + - - - - + + + + @@ -38,9 +38,9 @@ - + - + diff --git a/templates/mp1/Script/EnergyBall.xml b/templates/mp1/Script/EnergyBall.xml index 52f00cf3..7e0a492d 100644 --- a/templates/mp1/Script/EnergyBall.xml +++ b/templates/mp1/Script/EnergyBall.xml @@ -12,14 +12,14 @@ - + - - + + - + diff --git a/templates/mp1/Script/Eyeball.xml b/templates/mp1/Script/Eyeball.xml index d8318051..0bf89df1 100644 --- a/templates/mp1/Script/Eyeball.xml +++ b/templates/mp1/Script/Eyeball.xml @@ -11,12 +11,12 @@ - + - - - - + + + + diff --git a/templates/mp1/Script/FishCloud.xml b/templates/mp1/Script/FishCloud.xml index cc28f867..511fb778 100644 --- a/templates/mp1/Script/FishCloud.xml +++ b/templates/mp1/Script/FishCloud.xml @@ -7,7 +7,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/templates/mp1/Script/Flaahgra.xml b/templates/mp1/Script/Flaahgra.xml index d01ef917..f7b9cf1e 100644 --- a/templates/mp1/Script/Flaahgra.xml +++ b/templates/mp1/Script/Flaahgra.xml @@ -13,18 +13,18 @@ - + - + - + - + diff --git a/templates/mp1/Script/FlyingPirate.xml b/templates/mp1/Script/FlyingPirate.xml index 7e88cc92..ff16e009 100644 --- a/templates/mp1/Script/FlyingPirate.xml +++ b/templates/mp1/Script/FlyingPirate.xml @@ -11,15 +11,15 @@ - + - + - + - + @@ -30,9 +30,9 @@ - - - + + + diff --git a/templates/mp1/Script/GunTurret.xml b/templates/mp1/Script/GunTurret.xml index 6720ad19..ef331200 100644 --- a/templates/mp1/Script/GunTurret.xml +++ b/templates/mp1/Script/GunTurret.xml @@ -28,22 +28,22 @@ - + - - - - - - - + + + + + + + - + diff --git a/templates/mp1/Script/HUDMemo.xml b/templates/mp1/Script/HUDMemo.xml index 7d3cfcfb..fba6aa70 100644 --- a/templates/mp1/Script/HUDMemo.xml +++ b/templates/mp1/Script/HUDMemo.xml @@ -11,7 +11,7 @@ - + diff --git a/templates/mp1/Script/IceSheegoth.xml b/templates/mp1/Script/IceSheegoth.xml index a046261b..4bed677d 100644 --- a/templates/mp1/Script/IceSheegoth.xml +++ b/templates/mp1/Script/IceSheegoth.xml @@ -15,18 +15,18 @@ - + - - + + - - - - - + + + + + @@ -34,9 +34,9 @@ - + - + diff --git a/templates/mp1/Script/Magdolite.xml b/templates/mp1/Script/Magdolite.xml index 072a6f07..6c978388 100644 --- a/templates/mp1/Script/Magdolite.xml +++ b/templates/mp1/Script/Magdolite.xml @@ -14,8 +14,8 @@ - - + + @@ -23,7 +23,7 @@ - + diff --git a/templates/mp1/Script/MetroidBeta.xml b/templates/mp1/Script/MetroidBeta.xml index 14b7f073..568a5963 100644 --- a/templates/mp1/Script/MetroidBeta.xml +++ b/templates/mp1/Script/MetroidBeta.xml @@ -19,11 +19,11 @@ - - - - - + + + + + diff --git a/templates/mp1/Script/MetroidPrimeStage1.xml b/templates/mp1/Script/MetroidPrimeStage1.xml index 525a1c6f..a1ff16c9 100644 --- a/templates/mp1/Script/MetroidPrimeStage1.xml +++ b/templates/mp1/Script/MetroidPrimeStage1.xml @@ -33,43 +33,43 @@ - - - + + + - + - + - + - + - + - + - - - - + + + + diff --git a/templates/mp1/Script/MetroidPrimeStage2.xml b/templates/mp1/Script/MetroidPrimeStage2.xml index a5334460..67a1d463 100644 --- a/templates/mp1/Script/MetroidPrimeStage2.xml +++ b/templates/mp1/Script/MetroidPrimeStage2.xml @@ -8,11 +8,11 @@ - + - + - + diff --git a/templates/mp1/Script/Midi.xml b/templates/mp1/Script/Midi.xml index 758259ea..d14407d0 100644 --- a/templates/mp1/Script/Midi.xml +++ b/templates/mp1/Script/Midi.xml @@ -4,7 +4,7 @@ - + diff --git a/templates/mp1/Script/NewIntroBoss.xml b/templates/mp1/Script/NewIntroBoss.xml index 70825a86..b70614e1 100644 --- a/templates/mp1/Script/NewIntroBoss.xml +++ b/templates/mp1/Script/NewIntroBoss.xml @@ -9,12 +9,12 @@ - + - - - - + + + + diff --git a/templates/mp1/Script/OmegaPirate.xml b/templates/mp1/Script/OmegaPirate.xml index 81b71707..e074f2f9 100644 --- a/templates/mp1/Script/OmegaPirate.xml +++ b/templates/mp1/Script/OmegaPirate.xml @@ -16,19 +16,19 @@ - + - + - + - - - - + + + + @@ -38,15 +38,15 @@ - + - + - - - + + + diff --git a/templates/mp1/Script/PhazonHealingNodule.xml b/templates/mp1/Script/PhazonHealingNodule.xml index 388f219a..5b246efc 100644 --- a/templates/mp1/Script/PhazonHealingNodule.xml +++ b/templates/mp1/Script/PhazonHealingNodule.xml @@ -9,7 +9,7 @@ - + diff --git a/templates/mp1/Script/PhazonPool.xml b/templates/mp1/Script/PhazonPool.xml index 5100ad8c..106656d2 100644 --- a/templates/mp1/Script/PhazonPool.xml +++ b/templates/mp1/Script/PhazonPool.xml @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/templates/mp1/Script/Pickup.xml b/templates/mp1/Script/Pickup.xml index aa1deabe..0815e503 100644 --- a/templates/mp1/Script/Pickup.xml +++ b/templates/mp1/Script/Pickup.xml @@ -14,12 +14,12 @@ - + - + diff --git a/templates/mp1/Script/Platform.xml b/templates/mp1/Script/Platform.xml index 732062de..c537a505 100644 --- a/templates/mp1/Script/Platform.xml +++ b/templates/mp1/Script/Platform.xml @@ -8,12 +8,12 @@ - + - + diff --git a/templates/mp1/Script/PlayerActor.xml b/templates/mp1/Script/PlayerActor.xml index ef49f399..d950d4b2 100644 --- a/templates/mp1/Script/PlayerActor.xml +++ b/templates/mp1/Script/PlayerActor.xml @@ -12,7 +12,7 @@ - + diff --git a/templates/mp1/Script/PuddleSpore.xml b/templates/mp1/Script/PuddleSpore.xml index 7736fb02..141c3675 100644 --- a/templates/mp1/Script/PuddleSpore.xml +++ b/templates/mp1/Script/PuddleSpore.xml @@ -10,13 +10,13 @@ - + - + diff --git a/templates/mp1/Script/PuddleToadGamma.xml b/templates/mp1/Script/PuddleToadGamma.xml index 004d7ea0..749c5349 100644 --- a/templates/mp1/Script/PuddleToadGamma.xml +++ b/templates/mp1/Script/PuddleToadGamma.xml @@ -18,7 +18,7 @@ - + diff --git a/templates/mp1/Script/Puffer.xml b/templates/mp1/Script/Puffer.xml index dcb38e6a..27f20327 100644 --- a/templates/mp1/Script/Puffer.xml +++ b/templates/mp1/Script/Puffer.xml @@ -9,9 +9,9 @@ - + - + diff --git a/templates/mp1/Script/Ridley.xml b/templates/mp1/Script/Ridley.xml index 0b7d5ac0..0ea447a0 100644 --- a/templates/mp1/Script/Ridley.xml +++ b/templates/mp1/Script/Ridley.xml @@ -8,33 +8,33 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - + + + + @@ -49,10 +49,10 @@ - + - + @@ -66,7 +66,7 @@ - + diff --git a/templates/mp1/Script/ScriptBeam.xml b/templates/mp1/Script/ScriptBeam.xml index e93eb552..5354c34f 100644 --- a/templates/mp1/Script/ScriptBeam.xml +++ b/templates/mp1/Script/ScriptBeam.xml @@ -6,14 +6,14 @@ - + - - - - + + + + diff --git a/templates/mp1/Script/Seedling.xml b/templates/mp1/Script/Seedling.xml index 8100a94d..7602a3b5 100644 --- a/templates/mp1/Script/Seedling.xml +++ b/templates/mp1/Script/Seedling.xml @@ -8,8 +8,8 @@ - - + + diff --git a/templates/mp1/Script/SpacePirate.xml b/templates/mp1/Script/SpacePirate.xml index d249aafa..1b0f1e2c 100644 --- a/templates/mp1/Script/SpacePirate.xml +++ b/templates/mp1/Script/SpacePirate.xml @@ -16,12 +16,12 @@ - + - + diff --git a/templates/mp1/Script/SpecialFunction.xml b/templates/mp1/Script/SpecialFunction.xml index 9e855060..b7476aa2 100644 --- a/templates/mp1/Script/SpecialFunction.xml +++ b/templates/mp1/Script/SpecialFunction.xml @@ -48,7 +48,7 @@ - + diff --git a/templates/mp1/Script/Steam.xml b/templates/mp1/Script/Steam.xml index b372e3d8..22f9de2c 100644 --- a/templates/mp1/Script/Steam.xml +++ b/templates/mp1/Script/Steam.xml @@ -9,7 +9,7 @@ - + diff --git a/templates/mp1/Script/Thardus.xml b/templates/mp1/Script/Thardus.xml index 2da940b9..bce7e606 100644 --- a/templates/mp1/Script/Thardus.xml +++ b/templates/mp1/Script/Thardus.xml @@ -10,39 +10,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + diff --git a/templates/mp1/Script/ThardusRockProjectile.xml b/templates/mp1/Script/ThardusRockProjectile.xml index b4ea83b4..5e5a15e8 100644 --- a/templates/mp1/Script/ThardusRockProjectile.xml +++ b/templates/mp1/Script/ThardusRockProjectile.xml @@ -11,8 +11,8 @@ - - + + diff --git a/templates/mp1/Script/VisorGoo.xml b/templates/mp1/Script/VisorGoo.xml index 77d1f0fa..eb76e453 100644 --- a/templates/mp1/Script/VisorGoo.xml +++ b/templates/mp1/Script/VisorGoo.xml @@ -4,8 +4,8 @@ - - + + diff --git a/templates/mp1/Script/WallCrawlerSwarm.xml b/templates/mp1/Script/WallCrawlerSwarm.xml index 94bf0744..75cda599 100644 --- a/templates/mp1/Script/WallCrawlerSwarm.xml +++ b/templates/mp1/Script/WallCrawlerSwarm.xml @@ -12,8 +12,8 @@ - - + + diff --git a/templates/mp1/Script/Warwasp.xml b/templates/mp1/Script/Warwasp.xml index 80a9b56f..f009d7e0 100644 --- a/templates/mp1/Script/Warwasp.xml +++ b/templates/mp1/Script/Warwasp.xml @@ -11,9 +11,9 @@ - + - + diff --git a/templates/mp1/Script/Water.xml b/templates/mp1/Script/Water.xml index c512a465..928b221d 100644 --- a/templates/mp1/Script/Water.xml +++ b/templates/mp1/Script/Water.xml @@ -10,12 +10,12 @@ - - - - - - + + + + + + @@ -43,13 +43,13 @@ - + This particle plays when an actor/projectile enters the water. It also plays when the morph ball is rolling in it at surface level. - - - - + + + + @@ -66,7 +66,7 @@ - + diff --git a/templates/mp1/Script/WorldTeleporter.xml b/templates/mp1/Script/WorldTeleporter.xml index 7f02d05b..977bbae6 100644 --- a/templates/mp1/Script/WorldTeleporter.xml +++ b/templates/mp1/Script/WorldTeleporter.xml @@ -4,21 +4,21 @@ - - + + - + - + - - + + diff --git a/templates/mp1/Structs/ActorParameters.xml b/templates/mp1/Structs/ActorParameters.xml index 9b39f2cd..b18ad2c9 100644 --- a/templates/mp1/Structs/ActorParameters.xml +++ b/templates/mp1/Structs/ActorParameters.xml @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/templates/mp1/Structs/FlareDef.xml b/templates/mp1/Structs/FlareDef.xml index 6df61f7f..85efb82a 100644 --- a/templates/mp1/Structs/FlareDef.xml +++ b/templates/mp1/Structs/FlareDef.xml @@ -1,7 +1,7 @@ - + diff --git a/templates/mp1/Structs/LightParameters.xml b/templates/mp1/Structs/LightParameters.xml index b2d62277..0a617550 100644 --- a/templates/mp1/Structs/LightParameters.xml +++ b/templates/mp1/Structs/LightParameters.xml @@ -18,7 +18,15 @@ - + + Interval between light recalculation updates. + + + + + + + diff --git a/templates/mp1/Structs/PatternedInfo.xml b/templates/mp1/Structs/PatternedInfo.xml index aac4f3a2..6230a830 100644 --- a/templates/mp1/Structs/PatternedInfo.xml +++ b/templates/mp1/Structs/PatternedInfo.xml @@ -28,16 +28,16 @@ - + - + - + diff --git a/templates/mp1/Structs/PrimeStruct4.xml b/templates/mp1/Structs/PrimeStruct4.xml index f076df19..b44fc56e 100644 --- a/templates/mp1/Structs/PrimeStruct4.xml +++ b/templates/mp1/Structs/PrimeStruct4.xml @@ -3,10 +3,10 @@ - - - - + + + + @@ -18,14 +18,14 @@ - + - + - - + + diff --git a/templates/mp1/Structs/ScannableParameters.xml b/templates/mp1/Structs/ScannableParameters.xml index 1e93c861..0ff68c78 100644 --- a/templates/mp1/Structs/ScannableParameters.xml +++ b/templates/mp1/Structs/ScannableParameters.xml @@ -1,6 +1,6 @@ - + diff --git a/templates/mp2/Script/AIMannedTurret.xml b/templates/mp2/Script/AIMannedTurret.xml index a67463bd..615fa4e1 100644 --- a/templates/mp2/Script/AIMannedTurret.xml +++ b/templates/mp2/Script/AIMannedTurret.xml @@ -54,11 +54,11 @@ 2.0 - + - - + + diff --git a/templates/mp2/Script/Actor.xml b/templates/mp2/Script/Actor.xml index 728c3f47..b8d8044b 100644 --- a/templates/mp2/Script/Actor.xml +++ b/templates/mp2/Script/Actor.xml @@ -17,8 +17,8 @@ - - + + @@ -53,7 +53,7 @@ 0.0 - + diff --git a/templates/mp2/Script/AreaAttributes.xml b/templates/mp2/Script/AreaAttributes.xml index 948524cf..9bf99fe2 100644 --- a/templates/mp2/Script/AreaAttributes.xml +++ b/templates/mp2/Script/AreaAttributes.xml @@ -38,7 +38,7 @@ 1.0 - + 0 diff --git a/templates/mp2/Script/AtomicAlpha.xml b/templates/mp2/Script/AtomicAlpha.xml index 69a43c4a..e4e522d7 100644 --- a/templates/mp2/Script/AtomicAlpha.xml +++ b/templates/mp2/Script/AtomicAlpha.xml @@ -60,8 +60,8 @@ - - + + 3.0 diff --git a/templates/mp2/Script/AtomicBeta.xml b/templates/mp2/Script/AtomicBeta.xml index bb13f18d..ccecfe42 100644 --- a/templates/mp2/Script/AtomicBeta.xml +++ b/templates/mp2/Script/AtomicBeta.xml @@ -57,10 +57,10 @@ - - + + - + 1.0 diff --git a/templates/mp2/Script/BacteriaSwarm.xml b/templates/mp2/Script/BacteriaSwarm.xml index 3661c417..bc5e35d7 100644 --- a/templates/mp2/Script/BacteriaSwarm.xml +++ b/templates/mp2/Script/BacteriaSwarm.xml @@ -39,7 +39,7 @@ 1440.0 - + 1.0, 1.0, 1.0, 1.0 @@ -85,7 +85,7 @@ 127 - + false diff --git a/templates/mp2/Script/Blogg.xml b/templates/mp2/Script/Blogg.xml index 22762ab2..0f67ed21 100644 --- a/templates/mp2/Script/Blogg.xml +++ b/templates/mp2/Script/Blogg.xml @@ -29,7 +29,7 @@ 1 - + diff --git a/templates/mp2/Script/Brizgee.xml b/templates/mp2/Script/Brizgee.xml index bef94c15..eb472e87 100644 --- a/templates/mp2/Script/Brizgee.xml +++ b/templates/mp2/Script/Brizgee.xml @@ -27,8 +27,8 @@ 0.2 - - + + 2.0 diff --git a/templates/mp2/Script/CameraFilterKeyframe.xml b/templates/mp2/Script/CameraFilterKeyframe.xml index 15624ee4..bb7777c5 100644 --- a/templates/mp2/Script/CameraFilterKeyframe.xml +++ b/templates/mp2/Script/CameraFilterKeyframe.xml @@ -37,7 +37,7 @@ 0.0 - + diff --git a/templates/mp2/Script/CannonBall.xml b/templates/mp2/Script/CannonBall.xml index c0d301e3..7b649023 100644 --- a/templates/mp2/Script/CannonBall.xml +++ b/templates/mp2/Script/CannonBall.xml @@ -6,7 +6,7 @@ - + diff --git a/templates/mp2/Script/Coin.xml b/templates/mp2/Script/Coin.xml index 68f7e7dc..6051f155 100644 --- a/templates/mp2/Script/Coin.xml +++ b/templates/mp2/Script/Coin.xml @@ -63,9 +63,9 @@ 0.0, 0.0, 0.0 - + - + -1 @@ -90,7 +90,7 @@ 0 - + 1.0, 1.0, 1.0 @@ -103,7 +103,7 @@ 0 - + 1.0, 1.0, 1.0 diff --git a/templates/mp2/Script/CommandoPirate.xml b/templates/mp2/Script/CommandoPirate.xml index 379e86ff..5aa42436 100644 --- a/templates/mp2/Script/CommandoPirate.xml +++ b/templates/mp2/Script/CommandoPirate.xml @@ -106,7 +106,7 @@ - + @@ -156,9 +156,9 @@ - - - + + + 25.0 @@ -210,7 +210,7 @@ 40.0 - + -1 @@ -229,9 +229,9 @@ 1.0 - - - + + + -1 diff --git a/templates/mp2/Script/DarkCommando.xml b/templates/mp2/Script/DarkCommando.xml index eb95743d..30c141ec 100644 --- a/templates/mp2/Script/DarkCommando.xml +++ b/templates/mp2/Script/DarkCommando.xml @@ -81,9 +81,9 @@ - - - + + + 25.0 @@ -134,8 +134,8 @@ - - + + @@ -163,7 +163,7 @@ 20.0 - + diff --git a/templates/mp2/Script/DarkSamus.xml b/templates/mp2/Script/DarkSamus.xml index 49e8f98f..71c8e7c0 100644 --- a/templates/mp2/Script/DarkSamus.xml +++ b/templates/mp2/Script/DarkSamus.xml @@ -38,13 +38,13 @@ false - + 100.0 - - + + 40.0 @@ -52,9 +52,9 @@ 500.0 - - - + + + 0.0 @@ -62,7 +62,7 @@ 300.0 - + 1 @@ -70,54 +70,54 @@ 3 - + - + - + 10.0 4.0 - + - + -1 -1 - - + + - - - + + + -1 -1 - + - + -1 - - + + -1 - - - + + + @@ -132,9 +132,9 @@ - + - + diff --git a/templates/mp2/Script/DarkTrooper.xml b/templates/mp2/Script/DarkTrooper.xml index 52fc6df6..e73a9c65 100644 --- a/templates/mp2/Script/DarkTrooper.xml +++ b/templates/mp2/Script/DarkTrooper.xml @@ -51,16 +51,16 @@ 18.0 - + -1 false - + - + diff --git a/templates/mp2/Script/Debris.xml b/templates/mp2/Script/Debris.xml index e985ddb1..cd23689e 100644 --- a/templates/mp2/Script/Debris.xml +++ b/templates/mp2/Script/Debris.xml @@ -33,9 +33,9 @@ true - + - + 1.0, 1.0, 1.0 diff --git a/templates/mp2/Script/DebrisExtended.xml b/templates/mp2/Script/DebrisExtended.xml index 185efe2b..f09ce8c4 100644 --- a/templates/mp2/Script/DebrisExtended.xml +++ b/templates/mp2/Script/DebrisExtended.xml @@ -63,9 +63,9 @@ 0.0, 0.0, 0.0 - + - + -1 @@ -90,7 +90,7 @@ 0 - + 1.0, 1.0, 1.0 @@ -103,7 +103,7 @@ 0 - + 1.0, 1.0, 1.0 diff --git a/templates/mp2/Script/DestructibleBarrier.xml b/templates/mp2/Script/DestructibleBarrier.xml index 5844cf32..513acece 100644 --- a/templates/mp2/Script/DestructibleBarrier.xml +++ b/templates/mp2/Script/DestructibleBarrier.xml @@ -18,25 +18,25 @@ 1.5, 0.2, 1.0 - - - - - - - + + + + + + + 4 - + 4 - + 1 - + 1 diff --git a/templates/mp2/Script/DigitalGuardian.xml b/templates/mp2/Script/DigitalGuardian.xml index 690591d0..c02a52f7 100644 --- a/templates/mp2/Script/DigitalGuardian.xml +++ b/templates/mp2/Script/DigitalGuardian.xml @@ -29,7 +29,7 @@ - + 10.0 @@ -55,8 +55,8 @@ 75.0 - - + + @@ -101,14 +101,14 @@ 100.0 - - + + 100.0 - + 2.0 @@ -131,8 +131,8 @@ 1.0 - - + + @@ -140,8 +140,8 @@ 500.0 - - + + diff --git a/templates/mp2/Script/DigitalGuardianHead.xml b/templates/mp2/Script/DigitalGuardianHead.xml index 3cd53cf0..687c36e2 100644 --- a/templates/mp2/Script/DigitalGuardianHead.xml +++ b/templates/mp2/Script/DigitalGuardianHead.xml @@ -29,10 +29,10 @@ - - - - + + + + 60.0 @@ -58,17 +58,17 @@ 5.0 - + - + 100.0 - - - + + + @@ -78,11 +78,11 @@ 30.0 - + - + @@ -96,7 +96,7 @@ - + @@ -116,7 +116,7 @@ 1500 - + @@ -145,7 +145,7 @@ - + @@ -159,7 +159,7 @@ - + diff --git a/templates/mp2/Script/Door.xml b/templates/mp2/Script/Door.xml index cde21b62..2be3b43c 100644 --- a/templates/mp2/Script/Door.xml +++ b/templates/mp2/Script/Door.xml @@ -12,12 +12,12 @@ - - + + 0.0, 1.0, 1.0, 1.0 - + 0.0, 0.0, 0.0 diff --git a/templates/mp2/Script/EMPulse.xml b/templates/mp2/Script/EMPulse.xml index c02bc998..9c0be873 100644 --- a/templates/mp2/Script/EMPulse.xml +++ b/templates/mp2/Script/EMPulse.xml @@ -30,7 +30,7 @@ 0.8 - + diff --git a/templates/mp2/Script/Effect.xml b/templates/mp2/Script/Effect.xml index 6f551972..03f4e74e 100644 --- a/templates/mp2/Script/Effect.xml +++ b/templates/mp2/Script/Effect.xml @@ -3,7 +3,7 @@ Effect - + false diff --git a/templates/mp2/Script/ElitePirate.xml b/templates/mp2/Script/ElitePirate.xml index 32e1a535..087b49b4 100644 --- a/templates/mp2/Script/ElitePirate.xml +++ b/templates/mp2/Script/ElitePirate.xml @@ -48,18 +48,18 @@ 50.0 - - - + + + -1 - - + + -1 - + 8.0 @@ -80,7 +80,7 @@ 2.0 - + @@ -121,7 +121,7 @@ - + -1 diff --git a/templates/mp2/Script/EmperorIngStage1.xml b/templates/mp2/Script/EmperorIngStage1.xml index c417036d..da51b45f 100644 --- a/templates/mp2/Script/EmperorIngStage1.xml +++ b/templates/mp2/Script/EmperorIngStage1.xml @@ -38,14 +38,14 @@ - + - + - + diff --git a/templates/mp2/Script/EmperorIngStage3.xml b/templates/mp2/Script/EmperorIngStage3.xml index ed3e111c..c6013abc 100644 --- a/templates/mp2/Script/EmperorIngStage3.xml +++ b/templates/mp2/Script/EmperorIngStage3.xml @@ -36,13 +36,13 @@ - + - + -1 diff --git a/templates/mp2/Script/EyeBall.xml b/templates/mp2/Script/EyeBall.xml index bb100e4d..d667e1c0 100644 --- a/templates/mp2/Script/EyeBall.xml +++ b/templates/mp2/Script/EyeBall.xml @@ -14,12 +14,12 @@ 3.0 - + - - - - + + + + 1.0, 1.0, 1.0, 1.0 diff --git a/templates/mp2/Script/FishCloud.xml b/templates/mp2/Script/FishCloud.xml index d0ea181d..1081dda9 100644 --- a/templates/mp2/Script/FishCloud.xml +++ b/templates/mp2/Script/FishCloud.xml @@ -9,7 +9,7 @@ true - + 20.0 @@ -71,19 +71,19 @@ 0.0 - + 0 - + 0 - + 0 - + 0 diff --git a/templates/mp2/Script/FlyingPirate.xml b/templates/mp2/Script/FlyingPirate.xml index 9c6b2a53..f8cf640c 100644 --- a/templates/mp2/Script/FlyingPirate.xml +++ b/templates/mp2/Script/FlyingPirate.xml @@ -70,7 +70,7 @@ 0 - + @@ -84,7 +84,7 @@ -1 - + @@ -98,14 +98,14 @@ - + 0.8 4.0 - + @@ -149,9 +149,9 @@ 0.05 - - - + + + -1 diff --git a/templates/mp2/Script/FrontEndDataNetwork.xml b/templates/mp2/Script/FrontEndDataNetwork.xml index ab6388fa..56d6f029 100644 --- a/templates/mp2/Script/FrontEndDataNetwork.xml +++ b/templates/mp2/Script/FrontEndDataNetwork.xml @@ -33,9 +33,9 @@ 8.0 - - - + + + 1.0, 1.0, 1.0, 1.0 diff --git a/templates/mp2/Script/Glowbug.xml b/templates/mp2/Script/Glowbug.xml index da575d65..f595c670 100644 --- a/templates/mp2/Script/Glowbug.xml +++ b/templates/mp2/Script/Glowbug.xml @@ -8,11 +8,11 @@ - - - - - + + + + + 1.0 @@ -28,7 +28,7 @@ -1 - + false diff --git a/templates/mp2/Script/Grenchler.xml b/templates/mp2/Script/Grenchler.xml index 551ed66e..c7a4ac63 100644 --- a/templates/mp2/Script/Grenchler.xml +++ b/templates/mp2/Script/Grenchler.xml @@ -63,12 +63,12 @@ - - + + - - + + -1 @@ -124,7 +124,7 @@ 1.5 - + @@ -154,7 +154,7 @@ 20.0 - + @@ -165,16 +165,16 @@ - - - - - - - + + + + + + + - + 4 @@ -187,7 +187,7 @@ 10.0 - + @@ -198,10 +198,10 @@ - + - - + + diff --git a/templates/mp2/Script/GuiScreen.xml b/templates/mp2/Script/GuiScreen.xml index b8f9ed5a..1b165883 100644 --- a/templates/mp2/Script/GuiScreen.xml +++ b/templates/mp2/Script/GuiScreen.xml @@ -9,7 +9,7 @@ 0 - + diff --git a/templates/mp2/Script/GunTurretBase.xml b/templates/mp2/Script/GunTurretBase.xml index 258d1a37..7b47c989 100644 --- a/templates/mp2/Script/GunTurretBase.xml +++ b/templates/mp2/Script/GunTurretBase.xml @@ -94,8 +94,8 @@ false - - + + -1 diff --git a/templates/mp2/Script/GunTurretTop.xml b/templates/mp2/Script/GunTurretTop.xml index 5afd0de4..b4120168 100644 --- a/templates/mp2/Script/GunTurretTop.xml +++ b/templates/mp2/Script/GunTurretTop.xml @@ -12,8 +12,8 @@ 0.5 - - + + -1 diff --git a/templates/mp2/Script/HUDHint.xml b/templates/mp2/Script/HUDHint.xml index 89e17aa5..a9fb4140 100644 --- a/templates/mp2/Script/HUDHint.xml +++ b/templates/mp2/Script/HUDHint.xml @@ -3,7 +3,7 @@ HUDHint - + 15.0 diff --git a/templates/mp2/Script/HUDMemo.xml b/templates/mp2/Script/HUDMemo.xml index 764cc556..e10b6e78 100644 --- a/templates/mp2/Script/HUDMemo.xml +++ b/templates/mp2/Script/HUDMemo.xml @@ -30,7 +30,7 @@ 0 - + diff --git a/templates/mp2/Script/Ing.xml b/templates/mp2/Script/Ing.xml index c8c7ebca..eda426c3 100644 --- a/templates/mp2/Script/Ing.xml +++ b/templates/mp2/Script/Ing.xml @@ -31,7 +31,7 @@ 0 - + 50.0 @@ -50,10 +50,10 @@ 360.0 - - - - + + + + -1 @@ -69,13 +69,13 @@ -1 - - - + + + 0.35 - + 15.0 @@ -147,7 +147,7 @@ 5.0 - + 25.0 @@ -175,7 +175,7 @@ 100.0 - + -1 diff --git a/templates/mp2/Script/IngBoostBallGuardian.xml b/templates/mp2/Script/IngBoostBallGuardian.xml index 184f6820..ed746988 100644 --- a/templates/mp2/Script/IngBoostBallGuardian.xml +++ b/templates/mp2/Script/IngBoostBallGuardian.xml @@ -52,10 +52,10 @@ 360.0 - - - - + + + + -1 @@ -71,13 +71,13 @@ -1 - - - + + + 0.35 - + 15.0 @@ -149,7 +149,7 @@ 5.0 - + 25.0 @@ -177,7 +177,7 @@ 100.0 - + -1 @@ -281,10 +281,10 @@ 3.0 - - - - + + + + -1 @@ -342,9 +342,9 @@ - - - + + + diff --git a/templates/mp2/Script/IngPuddle.xml b/templates/mp2/Script/IngPuddle.xml index 93fdb7ad..e8f67d81 100644 --- a/templates/mp2/Script/IngPuddle.xml +++ b/templates/mp2/Script/IngPuddle.xml @@ -11,7 +11,7 @@ - + @@ -22,10 +22,10 @@ 20.0 - - - - + + + + -1 diff --git a/templates/mp2/Script/IngSnatchingSwarm.xml b/templates/mp2/Script/IngSnatchingSwarm.xml index 1875f65f..700a99ed 100644 --- a/templates/mp2/Script/IngSnatchingSwarm.xml +++ b/templates/mp2/Script/IngSnatchingSwarm.xml @@ -6,12 +6,12 @@ - - + + 0.5 - + 0.35 @@ -51,7 +51,7 @@ 5.0 - + diff --git a/templates/mp2/Script/IngSpaceJumpGuardian.xml b/templates/mp2/Script/IngSpaceJumpGuardian.xml index e111dbc4..1da4da49 100644 --- a/templates/mp2/Script/IngSpaceJumpGuardian.xml +++ b/templates/mp2/Script/IngSpaceJumpGuardian.xml @@ -31,7 +31,7 @@ - + -1 @@ -45,7 +45,7 @@ 5.0 - + -1 diff --git a/templates/mp2/Script/Kralee.xml b/templates/mp2/Script/Kralee.xml index 32a5322f..054dcbd0 100644 --- a/templates/mp2/Script/Kralee.xml +++ b/templates/mp2/Script/Kralee.xml @@ -121,8 +121,8 @@ 50.0 - - + + -1 diff --git a/templates/mp2/Script/Krocuss.xml b/templates/mp2/Script/Krocuss.xml index ac84fe95..12fd1743 100644 --- a/templates/mp2/Script/Krocuss.xml +++ b/templates/mp2/Script/Krocuss.xml @@ -113,7 +113,7 @@ 1.0, 0.0, 0.0, 1.0 - + -1 diff --git a/templates/mp2/Script/Lumite.xml b/templates/mp2/Script/Lumite.xml index f7b2280a..d18d1670 100644 --- a/templates/mp2/Script/Lumite.xml +++ b/templates/mp2/Script/Lumite.xml @@ -32,7 +32,7 @@ 30.0 - + @@ -49,7 +49,7 @@ 30.0 - + @@ -60,8 +60,8 @@ - - + + 5.0 diff --git a/templates/mp2/Script/MediumIng.xml b/templates/mp2/Script/MediumIng.xml index ade4997e..b9820faa 100644 --- a/templates/mp2/Script/MediumIng.xml +++ b/templates/mp2/Script/MediumIng.xml @@ -89,7 +89,7 @@ - + -1 diff --git a/templates/mp2/Script/MetroidAlpha.xml b/templates/mp2/Script/MetroidAlpha.xml index dd2e8338..8054ffb9 100644 --- a/templates/mp2/Script/MetroidAlpha.xml +++ b/templates/mp2/Script/MetroidAlpha.xml @@ -70,7 +70,7 @@ 0.5 - + 1.75 diff --git a/templates/mp2/Script/Midi.xml b/templates/mp2/Script/Midi.xml index 4f9f79c8..eba1611c 100644 --- a/templates/mp2/Script/Midi.xml +++ b/templates/mp2/Script/Midi.xml @@ -3,7 +3,7 @@ Midi - + 0.0 diff --git a/templates/mp2/Script/MinorIng.xml b/templates/mp2/Script/MinorIng.xml index 03ba7212..433f14d4 100644 --- a/templates/mp2/Script/MinorIng.xml +++ b/templates/mp2/Script/MinorIng.xml @@ -37,7 +37,7 @@ - + 20.0 @@ -116,10 +116,10 @@ 360.0 - - - - + + + + -1 @@ -160,9 +160,9 @@ - - - + + + 4.0 diff --git a/templates/mp2/Script/MysteryFlyer.xml b/templates/mp2/Script/MysteryFlyer.xml index fd4dedbd..d031574d 100644 --- a/templates/mp2/Script/MysteryFlyer.xml +++ b/templates/mp2/Script/MysteryFlyer.xml @@ -10,7 +10,7 @@ - + diff --git a/templates/mp2/Script/OctapedeSegment.xml b/templates/mp2/Script/OctapedeSegment.xml index a152cb6e..63c34dbd 100644 --- a/templates/mp2/Script/OctapedeSegment.xml +++ b/templates/mp2/Script/OctapedeSegment.xml @@ -100,7 +100,7 @@ 0.0 - + 0.0 diff --git a/templates/mp2/Script/Pickup.xml b/templates/mp2/Script/Pickup.xml index 634ec8a5..f8d63408 100644 --- a/templates/mp2/Script/Pickup.xml +++ b/templates/mp2/Script/Pickup.xml @@ -33,14 +33,14 @@ 0.0 - + 0.0 - + false diff --git a/templates/mp2/Script/PickupGenerator.xml b/templates/mp2/Script/PickupGenerator.xml index c6d81c7a..b2f4e2a5 100644 --- a/templates/mp2/Script/PickupGenerator.xml +++ b/templates/mp2/Script/PickupGenerator.xml @@ -9,7 +9,7 @@ false - + diff --git a/templates/mp2/Script/PlantScarabSwarm.xml b/templates/mp2/Script/PlantScarabSwarm.xml index 309ecdc2..14efd024 100644 --- a/templates/mp2/Script/PlantScarabSwarm.xml +++ b/templates/mp2/Script/PlantScarabSwarm.xml @@ -44,10 +44,10 @@ 0.5 - - - - + + + + -1 diff --git a/templates/mp2/Script/Platform.xml b/templates/mp2/Script/Platform.xml index b561d2e7..52f4fbc1 100644 --- a/templates/mp2/Script/Platform.xml +++ b/templates/mp2/Script/Platform.xml @@ -9,10 +9,10 @@ 0.0, 0.0, 0.0 - + - + diff --git a/templates/mp2/Script/PlayerActor.xml b/templates/mp2/Script/PlayerActor.xml index e3c85cb2..3a534ca6 100644 --- a/templates/mp2/Script/PlayerActor.xml +++ b/templates/mp2/Script/PlayerActor.xml @@ -20,7 +20,7 @@ - + diff --git a/templates/mp2/Script/PlayerController.xml b/templates/mp2/Script/PlayerController.xml index 686ae9b9..d16edd2b 100644 --- a/templates/mp2/Script/PlayerController.xml +++ b/templates/mp2/Script/PlayerController.xml @@ -19,7 +19,7 @@ 0 - + diff --git a/templates/mp2/Script/PlayerTurret.xml b/templates/mp2/Script/PlayerTurret.xml index 64d2ca01..f67b5147 100644 --- a/templates/mp2/Script/PlayerTurret.xml +++ b/templates/mp2/Script/PlayerTurret.xml @@ -34,8 +34,8 @@ 1.0 - - + + -1 diff --git a/templates/mp2/Script/PortalTransition.xml b/templates/mp2/Script/PortalTransition.xml index ac5e6758..debe7f0f 100644 --- a/templates/mp2/Script/PortalTransition.xml +++ b/templates/mp2/Script/PortalTransition.xml @@ -13,8 +13,8 @@ 64 - - + + -1 diff --git a/templates/mp2/Script/Puffer.xml b/templates/mp2/Script/Puffer.xml index 05b51bfd..eb6d13e0 100644 --- a/templates/mp2/Script/Puffer.xml +++ b/templates/mp2/Script/Puffer.xml @@ -60,9 +60,9 @@ 3.0 - + - + 0.5 diff --git a/templates/mp2/Script/Rezbit.xml b/templates/mp2/Script/Rezbit.xml index 481ee999..35dce30b 100644 --- a/templates/mp2/Script/Rezbit.xml +++ b/templates/mp2/Script/Rezbit.xml @@ -38,8 +38,8 @@ 10.0 - - + + 3.0 @@ -52,7 +52,7 @@ 1.0 - + @@ -104,7 +104,7 @@ - + 4.0 diff --git a/templates/mp2/Script/RiftPortal.xml b/templates/mp2/Script/RiftPortal.xml index b36bc1c7..7173e810 100644 --- a/templates/mp2/Script/RiftPortal.xml +++ b/templates/mp2/Script/RiftPortal.xml @@ -6,13 +6,13 @@ - + - + - + - + false diff --git a/templates/mp2/Script/RubiksPuzzle.xml b/templates/mp2/Script/RubiksPuzzle.xml index 3a00b65b..98b6b625 100644 --- a/templates/mp2/Script/RubiksPuzzle.xml +++ b/templates/mp2/Script/RubiksPuzzle.xml @@ -11,7 +11,7 @@ 90.0 - + diff --git a/templates/mp2/Script/SafeZone.xml b/templates/mp2/Script/SafeZone.xml index 113419b4..526ecdfb 100644 --- a/templates/mp2/Script/SafeZone.xml +++ b/templates/mp2/Script/SafeZone.xml @@ -25,7 +25,7 @@ 0.0 - + true diff --git a/templates/mp2/Script/SafeZoneCrystal.xml b/templates/mp2/Script/SafeZoneCrystal.xml index 2b2fa719..9c6d7857 100644 --- a/templates/mp2/Script/SafeZoneCrystal.xml +++ b/templates/mp2/Script/SafeZoneCrystal.xml @@ -7,25 +7,25 @@ - - - - + + + + 0 false - - - - - - - - - + + + + + + + + + 5.0 @@ -47,7 +47,7 @@ 5.0 - + 1.0, 1.0, 1.0 diff --git a/templates/mp2/Script/SandBoss.xml b/templates/mp2/Script/SandBoss.xml index 53820888..901d8c83 100644 --- a/templates/mp2/Script/SandBoss.xml +++ b/templates/mp2/Script/SandBoss.xml @@ -32,13 +32,13 @@ - + 0 - - - + + + @@ -71,7 +71,7 @@ 1.0 - + @@ -103,7 +103,7 @@ 5.0 - + @@ -118,7 +118,7 @@ 150.0 - + -1 @@ -141,7 +141,7 @@ - + @@ -183,8 +183,8 @@ - - + + diff --git a/templates/mp2/Script/Sandworm.xml b/templates/mp2/Script/Sandworm.xml index c441d963..1eecfeff 100644 --- a/templates/mp2/Script/Sandworm.xml +++ b/templates/mp2/Script/Sandworm.xml @@ -53,15 +53,15 @@ -1 - - + + 9.0 25.0 - + 60.0 @@ -71,7 +71,7 @@ 30.0 - + @@ -138,11 +138,11 @@ false - - - - - + + + + + diff --git a/templates/mp2/Script/Shrieker.xml b/templates/mp2/Script/Shrieker.xml index 239d48ce..e2615756 100644 --- a/templates/mp2/Script/Shrieker.xml +++ b/templates/mp2/Script/Shrieker.xml @@ -46,7 +46,7 @@ - + @@ -60,7 +60,7 @@ - + 50 @@ -83,7 +83,7 @@ - + 1.0 diff --git a/templates/mp2/Script/SpacePirate.xml b/templates/mp2/Script/SpacePirate.xml index 19aaa2f9..84f4ecb8 100644 --- a/templates/mp2/Script/SpacePirate.xml +++ b/templates/mp2/Script/SpacePirate.xml @@ -90,7 +90,7 @@ false - + @@ -120,7 +120,7 @@ 10.0 - + @@ -187,7 +187,7 @@ 0 - + 3 @@ -213,9 +213,9 @@ - - - + + + 25.0 diff --git a/templates/mp2/Script/Splinter.xml b/templates/mp2/Script/Splinter.xml index 3b12fc24..12e22676 100644 --- a/templates/mp2/Script/Splinter.xml +++ b/templates/mp2/Script/Splinter.xml @@ -62,13 +62,13 @@ - + false - + @@ -79,7 +79,7 @@ - + 2.5 diff --git a/templates/mp2/Script/SplitterCommandModule.xml b/templates/mp2/Script/SplitterCommandModule.xml index 5858c4f1..fef11a3e 100644 --- a/templates/mp2/Script/SplitterCommandModule.xml +++ b/templates/mp2/Script/SplitterCommandModule.xml @@ -56,7 +56,7 @@ 3 - + diff --git a/templates/mp2/Script/SporbBase.xml b/templates/mp2/Script/SporbBase.xml index 5236af9f..ad958820 100644 --- a/templates/mp2/Script/SporbBase.xml +++ b/templates/mp2/Script/SporbBase.xml @@ -32,7 +32,7 @@ 0.0, 0.0, 0.0 - + 0.1 @@ -78,7 +78,7 @@ false - + diff --git a/templates/mp2/Script/SporbNeedle.xml b/templates/mp2/Script/SporbNeedle.xml index f719098a..801b60aa 100644 --- a/templates/mp2/Script/SporbNeedle.xml +++ b/templates/mp2/Script/SporbNeedle.xml @@ -7,7 +7,7 @@ - + 60.0 @@ -30,8 +30,8 @@ 1.5 - - + + -1 diff --git a/templates/mp2/Script/SporbProjectile.xml b/templates/mp2/Script/SporbProjectile.xml index cd29cde6..87334dd6 100644 --- a/templates/mp2/Script/SporbProjectile.xml +++ b/templates/mp2/Script/SporbProjectile.xml @@ -8,8 +8,8 @@ - - + + diff --git a/templates/mp2/Script/Steam.xml b/templates/mp2/Script/Steam.xml index f14e7ed9..2cbb25c8 100644 --- a/templates/mp2/Script/Steam.xml +++ b/templates/mp2/Script/Steam.xml @@ -4,7 +4,7 @@ - + 0.35 diff --git a/templates/mp2/Script/Subtitle.xml b/templates/mp2/Script/Subtitle.xml index 69051154..ea9c7b38 100644 --- a/templates/mp2/Script/Subtitle.xml +++ b/templates/mp2/Script/Subtitle.xml @@ -38,7 +38,7 @@ 100 - + 0 diff --git a/templates/mp2/Script/SwampBossStage1.xml b/templates/mp2/Script/SwampBossStage1.xml index 61f2705c..e4236d9a 100644 --- a/templates/mp2/Script/SwampBossStage1.xml +++ b/templates/mp2/Script/SwampBossStage1.xml @@ -34,20 +34,20 @@ - + 3.0 6.0 - + - - - + + + - + 50.0 @@ -67,7 +67,7 @@ 2.0 - + @@ -78,7 +78,7 @@ - + -1 diff --git a/templates/mp2/Script/SwampBossStage2.xml b/templates/mp2/Script/SwampBossStage2.xml index cba7fb4e..7115df46 100644 --- a/templates/mp2/Script/SwampBossStage2.xml +++ b/templates/mp2/Script/SwampBossStage2.xml @@ -66,10 +66,10 @@ 10.0 - - - - + + + + 1.0 @@ -83,7 +83,7 @@ 2 - + @@ -94,7 +94,7 @@ - + -1 @@ -117,7 +117,7 @@ 0.2 - + 100.0 @@ -152,10 +152,10 @@ 0.4 - - - - + + + + @@ -175,7 +175,7 @@ - + diff --git a/templates/mp2/Script/TextPane.xml b/templates/mp2/Script/TextPane.xml index 1a862965..81ebb06b 100644 --- a/templates/mp2/Script/TextPane.xml +++ b/templates/mp2/Script/TextPane.xml @@ -30,7 +30,7 @@ 0.0, 0.0, 0.0 - + 1 diff --git a/templates/mp2/Script/VisorGoo.xml b/templates/mp2/Script/VisorGoo.xml index bcf47b8d..e4e3c895 100644 --- a/templates/mp2/Script/VisorGoo.xml +++ b/templates/mp2/Script/VisorGoo.xml @@ -3,8 +3,8 @@ VisorGoo - - + + 1.0 diff --git a/templates/mp2/Script/WallWalker.xml b/templates/mp2/Script/WallWalker.xml index 8e592897..8452199b 100644 --- a/templates/mp2/Script/WallWalker.xml +++ b/templates/mp2/Script/WallWalker.xml @@ -29,9 +29,9 @@ 40.0 - - - + + + 4.0 @@ -53,9 +53,9 @@ 5.0 - + - + diff --git a/templates/mp2/Script/Water.xml b/templates/mp2/Script/Water.xml index 119af877..381f213a 100644 --- a/templates/mp2/Script/Water.xml +++ b/templates/mp2/Script/Water.xml @@ -19,15 +19,15 @@ 0 - - - - - + + + + + 1.0 - + -1 @@ -144,11 +144,11 @@ 1.0, 1.0, 1.0, 1.0 - - - - - + + + + + -1 diff --git a/templates/mp2/Script/WorldTeleporter.xml b/templates/mp2/Script/WorldTeleporter.xml index 26aaf16f..49fca6dd 100644 --- a/templates/mp2/Script/WorldTeleporter.xml +++ b/templates/mp2/Script/WorldTeleporter.xml @@ -3,24 +3,24 @@ WorldTeleporter - - + + 1.0, 1.0, 1.0 - + 1.0, 1.0, 1.0 - + 1.0, 1.0, 1.0 true - + -1 @@ -33,8 +33,8 @@ false - - + + false diff --git a/templates/mp2/Structs/ActorParameters.xml b/templates/mp2/Structs/ActorParameters.xml index 56c0ceec..1ddba8c8 100644 --- a/templates/mp2/Structs/ActorParameters.xml +++ b/templates/mp2/Structs/ActorParameters.xml @@ -3,10 +3,10 @@ - - - - + + + + true diff --git a/templates/mp2/Structs/BasicSwarmProperties.xml b/templates/mp2/Structs/BasicSwarmProperties.xml index 17533f34..a72a7d12 100644 --- a/templates/mp2/Structs/BasicSwarmProperties.xml +++ b/templates/mp2/Structs/BasicSwarmProperties.xml @@ -79,7 +79,7 @@ - + 5 diff --git a/templates/mp2/Structs/FlareDef.xml b/templates/mp2/Structs/FlareDef.xml index 8d957169..af23cf79 100644 --- a/templates/mp2/Structs/FlareDef.xml +++ b/templates/mp2/Structs/FlareDef.xml @@ -1,7 +1,7 @@ - + 0.0 diff --git a/templates/mp2/Structs/IngPossessionData.xml b/templates/mp2/Structs/IngPossessionData.xml index 950f64c3..1b592731 100644 --- a/templates/mp2/Structs/IngPossessionData.xml +++ b/templates/mp2/Structs/IngPossessionData.xml @@ -7,9 +7,9 @@ true - - - + + + diff --git a/templates/mp2/Structs/LayerSwitch.xml b/templates/mp2/Structs/LayerSwitch.xml index eb9604f2..56237535 100644 --- a/templates/mp2/Structs/LayerSwitch.xml +++ b/templates/mp2/Structs/LayerSwitch.xml @@ -1,7 +1,7 @@ - + 0 diff --git a/templates/mp2/Structs/PatternedInfo.xml b/templates/mp2/Structs/PatternedInfo.xml index 7b53f36d..fb771d65 100644 --- a/templates/mp2/Structs/PatternedInfo.xml +++ b/templates/mp2/Structs/PatternedInfo.xml @@ -77,8 +77,8 @@ -1 - - + + 0.1 @@ -94,12 +94,12 @@ 0.0, 0.0, 0.0 - - + + 0.0, 0.0, 0.0 - + -1 @@ -109,7 +109,7 @@ -1 - + 0 diff --git a/templates/mp2/Structs/PlasmaBeamInfo.xml b/templates/mp2/Structs/PlasmaBeamInfo.xml index 451b9b60..081aa8a5 100644 --- a/templates/mp2/Structs/PlasmaBeamInfo.xml +++ b/templates/mp2/Structs/PlasmaBeamInfo.xml @@ -4,11 +4,11 @@ 0 - - - - - + + + + + 10.0 @@ -42,6 +42,6 @@ 0.0, 0.0, 0.0, 0.0 - + diff --git a/templates/mp2/Structs/SafeZoneStructB.xml b/templates/mp2/Structs/SafeZoneStructB.xml index 98aa0524..9b122b30 100644 --- a/templates/mp2/Structs/SafeZoneStructB.xml +++ b/templates/mp2/Structs/SafeZoneStructB.xml @@ -19,11 +19,11 @@ -1 - + 50.0 - + -0.04 @@ -36,7 +36,7 @@ 1.0 - + 0.0 @@ -49,7 +49,7 @@ 1.0 - + 0.094118, 0.498039, 0.498039, 1.0 diff --git a/templates/mp2/Structs/SandBossStructA.xml b/templates/mp2/Structs/SandBossStructA.xml index d43b696e..0e1af6b4 100644 --- a/templates/mp2/Structs/SandBossStructA.xml +++ b/templates/mp2/Structs/SandBossStructA.xml @@ -1,14 +1,14 @@ - - - - - - - - - + + + + + + + + + diff --git a/templates/mp2/Structs/ScannableParameters.xml b/templates/mp2/Structs/ScannableParameters.xml index e2208d24..d6cdf47b 100644 --- a/templates/mp2/Structs/ScannableParameters.xml +++ b/templates/mp2/Structs/ScannableParameters.xml @@ -1,6 +1,6 @@ - + diff --git a/templates/mp2/Structs/ShockWaveInfo.xml b/templates/mp2/Structs/ShockWaveInfo.xml index d40d499f..d6d0d157 100644 --- a/templates/mp2/Structs/ShockWaveInfo.xml +++ b/templates/mp2/Structs/ShockWaveInfo.xml @@ -1,7 +1,7 @@ - + 0.0 @@ -18,7 +18,7 @@ 0.0 - + -1 diff --git a/templates/mp2/Structs/TextProperties.xml b/templates/mp2/Structs/TextProperties.xml index a531fa89..b83e0379 100644 --- a/templates/mp2/Structs/TextProperties.xml +++ b/templates/mp2/Structs/TextProperties.xml @@ -34,7 +34,7 @@ 1.0, 1.0, 1.0, 1.0 - + 0 diff --git a/templates/mp2demo/Script/AIMannedTurret.xml b/templates/mp2demo/Script/AIMannedTurret.xml index 34fe4271..0a6877d6 100644 --- a/templates/mp2demo/Script/AIMannedTurret.xml +++ b/templates/mp2demo/Script/AIMannedTurret.xml @@ -69,11 +69,11 @@ - + - - + + diff --git a/templates/mp2demo/Script/Actor.xml b/templates/mp2demo/Script/Actor.xml index 0dda3ba6..d4942b67 100644 --- a/templates/mp2demo/Script/Actor.xml +++ b/templates/mp2demo/Script/Actor.xml @@ -17,7 +17,7 @@ - + @@ -50,7 +50,7 @@ 0.0 - + diff --git a/templates/mp2demo/Script/AreaAttributes.xml b/templates/mp2demo/Script/AreaAttributes.xml index 385f3340..81895cb8 100644 --- a/templates/mp2demo/Script/AreaAttributes.xml +++ b/templates/mp2demo/Script/AreaAttributes.xml @@ -22,7 +22,7 @@ 1.0 - + 0 diff --git a/templates/mp2demo/Script/AtomicAlpha.xml b/templates/mp2demo/Script/AtomicAlpha.xml index 97be53b1..8e726a23 100644 --- a/templates/mp2demo/Script/AtomicAlpha.xml +++ b/templates/mp2demo/Script/AtomicAlpha.xml @@ -60,8 +60,8 @@ - - + + 3.0 diff --git a/templates/mp2demo/Script/Blogg.xml b/templates/mp2demo/Script/Blogg.xml index de916079..aebd8bd3 100644 --- a/templates/mp2demo/Script/Blogg.xml +++ b/templates/mp2demo/Script/Blogg.xml @@ -29,7 +29,7 @@ 1 - + diff --git a/templates/mp2demo/Script/Brizgee.xml b/templates/mp2demo/Script/Brizgee.xml index bef94c15..eb472e87 100644 --- a/templates/mp2demo/Script/Brizgee.xml +++ b/templates/mp2demo/Script/Brizgee.xml @@ -27,8 +27,8 @@ 0.2 - - + + 2.0 diff --git a/templates/mp2demo/Script/CameraFilterKeyframe.xml b/templates/mp2demo/Script/CameraFilterKeyframe.xml index df3e7de7..e7e02e4b 100644 --- a/templates/mp2demo/Script/CameraFilterKeyframe.xml +++ b/templates/mp2demo/Script/CameraFilterKeyframe.xml @@ -24,7 +24,7 @@ 0.0 - + diff --git a/templates/mp2demo/Script/CannonBall.xml b/templates/mp2demo/Script/CannonBall.xml index c0d301e3..7b649023 100644 --- a/templates/mp2demo/Script/CannonBall.xml +++ b/templates/mp2demo/Script/CannonBall.xml @@ -6,7 +6,7 @@ - + diff --git a/templates/mp2demo/Script/Coin.xml b/templates/mp2demo/Script/Coin.xml index 68f7e7dc..6051f155 100644 --- a/templates/mp2demo/Script/Coin.xml +++ b/templates/mp2demo/Script/Coin.xml @@ -63,9 +63,9 @@ 0.0, 0.0, 0.0 - + - + -1 @@ -90,7 +90,7 @@ 0 - + 1.0, 1.0, 1.0 @@ -103,7 +103,7 @@ 0 - + 1.0, 1.0, 1.0 diff --git a/templates/mp2demo/Script/CommandoPirate.xml b/templates/mp2demo/Script/CommandoPirate.xml index 87b818d2..c889b3f0 100644 --- a/templates/mp2demo/Script/CommandoPirate.xml +++ b/templates/mp2demo/Script/CommandoPirate.xml @@ -118,7 +118,7 @@ - + @@ -168,9 +168,9 @@ - - - + + + 25.0 @@ -200,7 +200,7 @@ 20.0 - + -1 @@ -226,7 +226,7 @@ 40.0 - + -1 @@ -245,9 +245,9 @@ 1.0 - - - + + + -1 diff --git a/templates/mp2demo/Script/DarkSamus.xml b/templates/mp2demo/Script/DarkSamus.xml index 38a067bf..1f6c0135 100644 --- a/templates/mp2demo/Script/DarkSamus.xml +++ b/templates/mp2demo/Script/DarkSamus.xml @@ -29,7 +29,7 @@ false - + 100.0 @@ -39,8 +39,8 @@ - - + + 40.0 @@ -48,9 +48,9 @@ 500.0 - - - + + + 0.0 @@ -58,11 +58,11 @@ 300.0 - + - + - + 10.0 @@ -70,10 +70,10 @@ 4.0 - + - - + + diff --git a/templates/mp2demo/Script/Debris.xml b/templates/mp2demo/Script/Debris.xml index 9ee6255b..52ff8bb3 100644 --- a/templates/mp2demo/Script/Debris.xml +++ b/templates/mp2demo/Script/Debris.xml @@ -33,9 +33,9 @@ true - + - + 1.0, 1.0, 1.0 diff --git a/templates/mp2demo/Script/DebrisExtended.xml b/templates/mp2demo/Script/DebrisExtended.xml index 51e42e5a..a6903520 100644 --- a/templates/mp2demo/Script/DebrisExtended.xml +++ b/templates/mp2demo/Script/DebrisExtended.xml @@ -60,9 +60,9 @@ 0.0, 0.0, 0.0 - + - + -1 @@ -87,7 +87,7 @@ 0 - + 1.0, 1.0, 1.0 @@ -100,7 +100,7 @@ 0 - + 1.0, 1.0, 1.0 diff --git a/templates/mp2demo/Script/DigitalGuardianHead.xml b/templates/mp2demo/Script/DigitalGuardianHead.xml index bab3876e..4d47d947 100644 --- a/templates/mp2demo/Script/DigitalGuardianHead.xml +++ b/templates/mp2demo/Script/DigitalGuardianHead.xml @@ -29,7 +29,7 @@ - + 60.0 @@ -60,7 +60,7 @@ 30.0 - + @@ -77,7 +77,7 @@ -1 - + @@ -94,7 +94,7 @@ -1 - + diff --git a/templates/mp2demo/Script/Door.xml b/templates/mp2demo/Script/Door.xml index 5e402a17..0ff34b1d 100644 --- a/templates/mp2demo/Script/Door.xml +++ b/templates/mp2demo/Script/Door.xml @@ -12,8 +12,8 @@ - - + + 0.0, 0.0, 0.0 diff --git a/templates/mp2demo/Script/EMPulse.xml b/templates/mp2demo/Script/EMPulse.xml index c02bc998..9c0be873 100644 --- a/templates/mp2demo/Script/EMPulse.xml +++ b/templates/mp2demo/Script/EMPulse.xml @@ -30,7 +30,7 @@ 0.8 - + diff --git a/templates/mp2demo/Script/Effect.xml b/templates/mp2demo/Script/Effect.xml index 005f48d8..e0a46572 100644 --- a/templates/mp2demo/Script/Effect.xml +++ b/templates/mp2demo/Script/Effect.xml @@ -3,7 +3,7 @@ Effect - + false diff --git a/templates/mp2demo/Script/ElitePirate.xml b/templates/mp2demo/Script/ElitePirate.xml index c02582ce..518100d6 100644 --- a/templates/mp2demo/Script/ElitePirate.xml +++ b/templates/mp2demo/Script/ElitePirate.xml @@ -81,7 +81,7 @@ 2.0 - + @@ -121,7 +121,7 @@ - + -1 diff --git a/templates/mp2demo/Script/EmperorIngStage1.xml b/templates/mp2demo/Script/EmperorIngStage1.xml index c2aca1e6..37d316cf 100644 --- a/templates/mp2demo/Script/EmperorIngStage1.xml +++ b/templates/mp2demo/Script/EmperorIngStage1.xml @@ -35,7 +35,7 @@ - + diff --git a/templates/mp2demo/Script/FishCloud.xml b/templates/mp2demo/Script/FishCloud.xml index 8960d61a..05195df5 100644 --- a/templates/mp2demo/Script/FishCloud.xml +++ b/templates/mp2demo/Script/FishCloud.xml @@ -9,7 +9,7 @@ true - + 20.0 @@ -71,11 +71,11 @@ 0.0 - + 0 - + 0 diff --git a/templates/mp2demo/Script/FlyingPirate.xml b/templates/mp2demo/Script/FlyingPirate.xml index 7dfeccc2..09c1d402 100644 --- a/templates/mp2demo/Script/FlyingPirate.xml +++ b/templates/mp2demo/Script/FlyingPirate.xml @@ -70,7 +70,7 @@ 0 - + @@ -84,7 +84,7 @@ -1 - + @@ -98,14 +98,14 @@ - + 0.8 4.0 - + @@ -149,9 +149,9 @@ 0.05 - - - + + + -1 diff --git a/templates/mp2demo/Script/FrontEndDataNetwork.xml b/templates/mp2demo/Script/FrontEndDataNetwork.xml index 0cb599d3..16dca5b8 100644 --- a/templates/mp2demo/Script/FrontEndDataNetwork.xml +++ b/templates/mp2demo/Script/FrontEndDataNetwork.xml @@ -24,9 +24,9 @@ false - - - + + + 1.0, 1.0, 1.0, 1.0 diff --git a/templates/mp2demo/Script/Glowbug.xml b/templates/mp2demo/Script/Glowbug.xml index cb1601fd..7c900aa8 100644 --- a/templates/mp2demo/Script/Glowbug.xml +++ b/templates/mp2demo/Script/Glowbug.xml @@ -8,10 +8,10 @@ - - - - + + + + 1.0 diff --git a/templates/mp2demo/Script/Grenchler.xml b/templates/mp2demo/Script/Grenchler.xml index 37a74068..feb64497 100644 --- a/templates/mp2demo/Script/Grenchler.xml +++ b/templates/mp2demo/Script/Grenchler.xml @@ -81,7 +81,7 @@ 3.0 - + diff --git a/templates/mp2demo/Script/GunTurretBase.xml b/templates/mp2demo/Script/GunTurretBase.xml index 7a313fd9..e8be0389 100644 --- a/templates/mp2demo/Script/GunTurretBase.xml +++ b/templates/mp2demo/Script/GunTurretBase.xml @@ -94,8 +94,8 @@ false - - + + -1 diff --git a/templates/mp2demo/Script/GunTurretTop.xml b/templates/mp2demo/Script/GunTurretTop.xml index 5afd0de4..b4120168 100644 --- a/templates/mp2demo/Script/GunTurretTop.xml +++ b/templates/mp2demo/Script/GunTurretTop.xml @@ -12,8 +12,8 @@ 0.5 - - + + -1 diff --git a/templates/mp2demo/Script/HUDMemo.xml b/templates/mp2demo/Script/HUDMemo.xml index b92dcb3a..1909d857 100644 --- a/templates/mp2demo/Script/HUDMemo.xml +++ b/templates/mp2demo/Script/HUDMemo.xml @@ -27,7 +27,7 @@ 0 - + diff --git a/templates/mp2demo/Script/Ing.xml b/templates/mp2demo/Script/Ing.xml index caa63824..e4d3588f 100644 --- a/templates/mp2demo/Script/Ing.xml +++ b/templates/mp2demo/Script/Ing.xml @@ -31,7 +31,7 @@ 0 - + 50.0 @@ -50,10 +50,10 @@ 360.0 - - - - + + + + -1 @@ -69,12 +69,12 @@ -1 - - + + 0.35 - + 15.0 @@ -137,7 +137,7 @@ 5.0 - + 25.0 @@ -162,7 +162,7 @@ 100.0 - + -1 diff --git a/templates/mp2demo/Script/IngSnatchingSwarm.xml b/templates/mp2demo/Script/IngSnatchingSwarm.xml index 9bb88824..e7978644 100644 --- a/templates/mp2demo/Script/IngSnatchingSwarm.xml +++ b/templates/mp2demo/Script/IngSnatchingSwarm.xml @@ -6,12 +6,12 @@ - - + + 0.5 - + 0.35 @@ -45,7 +45,7 @@ 5.0 - + diff --git a/templates/mp2demo/Script/Kralee.xml b/templates/mp2demo/Script/Kralee.xml index dcfbcab7..48f6b0bf 100644 --- a/templates/mp2demo/Script/Kralee.xml +++ b/templates/mp2demo/Script/Kralee.xml @@ -121,8 +121,8 @@ 50.0 - - + + -1 diff --git a/templates/mp2demo/Script/Krocuss.xml b/templates/mp2demo/Script/Krocuss.xml index 8a9c08ff..2f5fc372 100644 --- a/templates/mp2demo/Script/Krocuss.xml +++ b/templates/mp2demo/Script/Krocuss.xml @@ -116,7 +116,7 @@ 1.0, 0.0, 0.0, 1.0 - + diff --git a/templates/mp2demo/Script/Lumite.xml b/templates/mp2demo/Script/Lumite.xml index 891291bc..03bf93b6 100644 --- a/templates/mp2demo/Script/Lumite.xml +++ b/templates/mp2demo/Script/Lumite.xml @@ -32,7 +32,7 @@ 30.0 - + @@ -49,7 +49,7 @@ 30.0 - + @@ -60,8 +60,8 @@ - - + + diff --git a/templates/mp2demo/Script/MediumIng.xml b/templates/mp2demo/Script/MediumIng.xml index 9239257a..d79b9a88 100644 --- a/templates/mp2demo/Script/MediumIng.xml +++ b/templates/mp2demo/Script/MediumIng.xml @@ -89,7 +89,7 @@ - + -1 diff --git a/templates/mp2demo/Script/Midi.xml b/templates/mp2demo/Script/Midi.xml index 4f9f79c8..eba1611c 100644 --- a/templates/mp2demo/Script/Midi.xml +++ b/templates/mp2demo/Script/Midi.xml @@ -3,7 +3,7 @@ Midi - + 0.0 diff --git a/templates/mp2demo/Script/MinorIng.xml b/templates/mp2demo/Script/MinorIng.xml index 6b3a015e..67231993 100644 --- a/templates/mp2demo/Script/MinorIng.xml +++ b/templates/mp2demo/Script/MinorIng.xml @@ -37,7 +37,7 @@ - + 20.0 @@ -92,10 +92,10 @@ 360.0 - - - - + + + + -1 @@ -130,8 +130,8 @@ - - + + -1 diff --git a/templates/mp2demo/Script/OctapedeSegment.xml b/templates/mp2demo/Script/OctapedeSegment.xml index 8f1477f3..09f4a5e9 100644 --- a/templates/mp2demo/Script/OctapedeSegment.xml +++ b/templates/mp2demo/Script/OctapedeSegment.xml @@ -100,7 +100,7 @@ 0.0 - + 0.0 diff --git a/templates/mp2demo/Script/Pickup.xml b/templates/mp2demo/Script/Pickup.xml index f28c8f3f..cdb21406 100644 --- a/templates/mp2demo/Script/Pickup.xml +++ b/templates/mp2demo/Script/Pickup.xml @@ -30,13 +30,13 @@ 0.0 - + 0.0 - + false diff --git a/templates/mp2demo/Script/Platform.xml b/templates/mp2demo/Script/Platform.xml index e7d6bc0f..295f26ac 100644 --- a/templates/mp2demo/Script/Platform.xml +++ b/templates/mp2demo/Script/Platform.xml @@ -9,10 +9,10 @@ 0.0, 0.0, 0.0 - + - + diff --git a/templates/mp2demo/Script/PlayerActor.xml b/templates/mp2demo/Script/PlayerActor.xml index e3c85cb2..3a534ca6 100644 --- a/templates/mp2demo/Script/PlayerActor.xml +++ b/templates/mp2demo/Script/PlayerActor.xml @@ -20,7 +20,7 @@ - + diff --git a/templates/mp2demo/Script/PlayerController.xml b/templates/mp2demo/Script/PlayerController.xml index 98121fdb..5b5dbf1e 100644 --- a/templates/mp2demo/Script/PlayerController.xml +++ b/templates/mp2demo/Script/PlayerController.xml @@ -19,7 +19,7 @@ 0 - + diff --git a/templates/mp2demo/Script/PlayerTurret.xml b/templates/mp2demo/Script/PlayerTurret.xml index b9bc298a..7e95a81a 100644 --- a/templates/mp2demo/Script/PlayerTurret.xml +++ b/templates/mp2demo/Script/PlayerTurret.xml @@ -49,8 +49,8 @@ - - + + diff --git a/templates/mp2demo/Script/Puffer.xml b/templates/mp2demo/Script/Puffer.xml index d77f1c87..5909c887 100644 --- a/templates/mp2demo/Script/Puffer.xml +++ b/templates/mp2demo/Script/Puffer.xml @@ -60,9 +60,9 @@ 3.0 - + - + 0.5 diff --git a/templates/mp2demo/Script/Rezbit.xml b/templates/mp2demo/Script/Rezbit.xml index 4c67edd4..41a3b0cf 100644 --- a/templates/mp2demo/Script/Rezbit.xml +++ b/templates/mp2demo/Script/Rezbit.xml @@ -35,8 +35,8 @@ 10.0 - - + + 20.0 @@ -84,7 +84,7 @@ - + 4.0 diff --git a/templates/mp2demo/Script/RiftPortal.xml b/templates/mp2demo/Script/RiftPortal.xml index 7556a6c0..acdd6aad 100644 --- a/templates/mp2demo/Script/RiftPortal.xml +++ b/templates/mp2demo/Script/RiftPortal.xml @@ -6,13 +6,13 @@ - + - + - + - + false diff --git a/templates/mp2demo/Script/SafeZone.xml b/templates/mp2demo/Script/SafeZone.xml index 4013eacc..356f4ecd 100644 --- a/templates/mp2demo/Script/SafeZone.xml +++ b/templates/mp2demo/Script/SafeZone.xml @@ -25,7 +25,7 @@ 0.0 - + true diff --git a/templates/mp2demo/Script/Sandworm.xml b/templates/mp2demo/Script/Sandworm.xml index 473929bc..cc73e696 100644 --- a/templates/mp2demo/Script/Sandworm.xml +++ b/templates/mp2demo/Script/Sandworm.xml @@ -56,7 +56,7 @@ 30.0 - + @@ -123,10 +123,10 @@ false - - - - + + + + diff --git a/templates/mp2demo/Script/Shrieker.xml b/templates/mp2demo/Script/Shrieker.xml index a436b053..42f6afb0 100644 --- a/templates/mp2demo/Script/Shrieker.xml +++ b/templates/mp2demo/Script/Shrieker.xml @@ -46,7 +46,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -77,7 +77,7 @@ - + 1.0 diff --git a/templates/mp2demo/Script/SpacePirate.xml b/templates/mp2demo/Script/SpacePirate.xml index 0684b7cd..1a45ce7a 100644 --- a/templates/mp2demo/Script/SpacePirate.xml +++ b/templates/mp2demo/Script/SpacePirate.xml @@ -90,7 +90,7 @@ false - + @@ -120,7 +120,7 @@ 10.0 - + @@ -181,7 +181,7 @@ 0 - + 3 @@ -207,9 +207,9 @@ - - - + + + 25.0 diff --git a/templates/mp2demo/Script/Splinter.xml b/templates/mp2demo/Script/Splinter.xml index f6b0d6d5..d3194070 100644 --- a/templates/mp2demo/Script/Splinter.xml +++ b/templates/mp2demo/Script/Splinter.xml @@ -6,7 +6,7 @@ - + 5.0 @@ -40,7 +40,7 @@ - + diff --git a/templates/mp2demo/Script/SplitterCommandModule.xml b/templates/mp2demo/Script/SplitterCommandModule.xml index 65e909c9..d89cf9c3 100644 --- a/templates/mp2demo/Script/SplitterCommandModule.xml +++ b/templates/mp2demo/Script/SplitterCommandModule.xml @@ -56,7 +56,7 @@ 3 - + diff --git a/templates/mp2demo/Script/SporbBase.xml b/templates/mp2demo/Script/SporbBase.xml index 02f475d2..e2d875a9 100644 --- a/templates/mp2demo/Script/SporbBase.xml +++ b/templates/mp2demo/Script/SporbBase.xml @@ -32,7 +32,7 @@ 0.0, 0.0, 0.0 - + 0.1 @@ -72,7 +72,7 @@ false - + diff --git a/templates/mp2demo/Script/SporbNeedle.xml b/templates/mp2demo/Script/SporbNeedle.xml index 38375426..1825ff69 100644 --- a/templates/mp2demo/Script/SporbNeedle.xml +++ b/templates/mp2demo/Script/SporbNeedle.xml @@ -7,7 +7,7 @@ - + 60.0 @@ -30,8 +30,8 @@ 1.5 - - + + -1 diff --git a/templates/mp2demo/Script/SporbProjectile.xml b/templates/mp2demo/Script/SporbProjectile.xml index cd29cde6..87334dd6 100644 --- a/templates/mp2demo/Script/SporbProjectile.xml +++ b/templates/mp2demo/Script/SporbProjectile.xml @@ -8,8 +8,8 @@ - - + + diff --git a/templates/mp2demo/Script/Steam.xml b/templates/mp2demo/Script/Steam.xml index f14e7ed9..2cbb25c8 100644 --- a/templates/mp2demo/Script/Steam.xml +++ b/templates/mp2demo/Script/Steam.xml @@ -4,7 +4,7 @@ - + 0.35 diff --git a/templates/mp2demo/Script/Subtitle.xml b/templates/mp2demo/Script/Subtitle.xml index f927de44..36a67ba0 100644 --- a/templates/mp2demo/Script/Subtitle.xml +++ b/templates/mp2demo/Script/Subtitle.xml @@ -10,7 +10,7 @@ 0 - + 0 diff --git a/templates/mp2demo/Script/TextPane.xml b/templates/mp2demo/Script/TextPane.xml index 20c5ad7a..85a4e10f 100644 --- a/templates/mp2demo/Script/TextPane.xml +++ b/templates/mp2demo/Script/TextPane.xml @@ -16,7 +16,7 @@ 0.0, 0.0, 0.0 - + 1 diff --git a/templates/mp2demo/Script/TriggerEllipsoid.xml b/templates/mp2demo/Script/TriggerEllipsoid.xml index cfa29ded..bd1a7023 100644 --- a/templates/mp2demo/Script/TriggerEllipsoid.xml +++ b/templates/mp2demo/Script/TriggerEllipsoid.xml @@ -10,7 +10,7 @@ false - + diff --git a/templates/mp2demo/Script/VisorGoo.xml b/templates/mp2demo/Script/VisorGoo.xml index cbd256eb..e76ccb81 100644 --- a/templates/mp2demo/Script/VisorGoo.xml +++ b/templates/mp2demo/Script/VisorGoo.xml @@ -3,8 +3,8 @@ VisorGoo - - + + 1.0 diff --git a/templates/mp2demo/Script/WallCrawlerSwarm.xml b/templates/mp2demo/Script/WallCrawlerSwarm.xml index fdabfedc..e7e78e6e 100644 --- a/templates/mp2demo/Script/WallCrawlerSwarm.xml +++ b/templates/mp2demo/Script/WallCrawlerSwarm.xml @@ -20,8 +20,8 @@ -1 - - + + -1 diff --git a/templates/mp2demo/Script/WallWalker.xml b/templates/mp2demo/Script/WallWalker.xml index 8e592897..8452199b 100644 --- a/templates/mp2demo/Script/WallWalker.xml +++ b/templates/mp2demo/Script/WallWalker.xml @@ -29,9 +29,9 @@ 40.0 - - - + + + 4.0 @@ -53,9 +53,9 @@ 5.0 - + - + diff --git a/templates/mp2demo/Script/Water.xml b/templates/mp2demo/Script/Water.xml index 53b87a2d..5810cfcb 100644 --- a/templates/mp2demo/Script/Water.xml +++ b/templates/mp2demo/Script/Water.xml @@ -19,15 +19,15 @@ 0 - - - - - + + + + + 1.0 - + -1 @@ -69,11 +69,11 @@ 1.0, 1.0, 1.0, 1.0 - - - - - + + + + + -1 diff --git a/templates/mp2demo/Script/WorldTeleporter.xml b/templates/mp2demo/Script/WorldTeleporter.xml index 6c8a0bd9..1e0ee33b 100644 --- a/templates/mp2demo/Script/WorldTeleporter.xml +++ b/templates/mp2demo/Script/WorldTeleporter.xml @@ -3,17 +3,17 @@ WorldTeleporter - - + + 1.0, 1.0, 1.0 - + 1.0, 1.0, 1.0 - + 1.0, 1.0, 1.0 @@ -32,8 +32,8 @@ false - - + + false diff --git a/templates/mp2demo/Structs/ActorParameters.xml b/templates/mp2demo/Structs/ActorParameters.xml index 386cce7b..0ee95a68 100644 --- a/templates/mp2demo/Structs/ActorParameters.xml +++ b/templates/mp2demo/Structs/ActorParameters.xml @@ -3,10 +3,10 @@ - - - - + + + + true diff --git a/templates/mp2demo/Structs/FlareDef.xml b/templates/mp2demo/Structs/FlareDef.xml index fc307a08..b5ca88af 100644 --- a/templates/mp2demo/Structs/FlareDef.xml +++ b/templates/mp2demo/Structs/FlareDef.xml @@ -1,7 +1,7 @@ - + 0.0 diff --git a/templates/mp2demo/Structs/LayerSwitch.xml b/templates/mp2demo/Structs/LayerSwitch.xml index eb9604f2..56237535 100644 --- a/templates/mp2demo/Structs/LayerSwitch.xml +++ b/templates/mp2demo/Structs/LayerSwitch.xml @@ -1,7 +1,7 @@ - + 0 diff --git a/templates/mp2demo/Structs/PatternedInfo.xml b/templates/mp2demo/Structs/PatternedInfo.xml index 7f5718fb..f54da614 100644 --- a/templates/mp2demo/Structs/PatternedInfo.xml +++ b/templates/mp2demo/Structs/PatternedInfo.xml @@ -77,8 +77,8 @@ -1 - - + + 0.1 @@ -94,16 +94,16 @@ 0.0, 0.0, 0.0 - - + + 0.0, 0.0, 0.0 - + -1 - + 0 diff --git a/templates/mp2demo/Structs/PlasmaBeamInfo.xml b/templates/mp2demo/Structs/PlasmaBeamInfo.xml index be76b339..ab2e0b56 100644 --- a/templates/mp2demo/Structs/PlasmaBeamInfo.xml +++ b/templates/mp2demo/Structs/PlasmaBeamInfo.xml @@ -4,11 +4,11 @@ 0 - - - - - + + + + + 10.0 @@ -42,6 +42,6 @@ 0.0, 0.0, 0.0, 0.0 - + diff --git a/templates/mp2demo/Structs/SafeZoneStruct.xml b/templates/mp2demo/Structs/SafeZoneStruct.xml index a63d7c2e..f4793f44 100644 --- a/templates/mp2demo/Structs/SafeZoneStruct.xml +++ b/templates/mp2demo/Structs/SafeZoneStruct.xml @@ -13,11 +13,11 @@ -1 - + 50.0 - + -0.04 @@ -30,7 +30,7 @@ 2.0 - + 0.0 @@ -43,7 +43,7 @@ 2.0 - + 0.094118, 0.498039, 0.498039, 1.0 diff --git a/templates/mp2demo/Structs/ScannableParameters.xml b/templates/mp2demo/Structs/ScannableParameters.xml index e2208d24..d6cdf47b 100644 --- a/templates/mp2demo/Structs/ScannableParameters.xml +++ b/templates/mp2demo/Structs/ScannableParameters.xml @@ -1,6 +1,6 @@ - + diff --git a/templates/mp2demo/Structs/ShockWaveInfo.xml b/templates/mp2demo/Structs/ShockWaveInfo.xml index d40d499f..d6d0d157 100644 --- a/templates/mp2demo/Structs/ShockWaveInfo.xml +++ b/templates/mp2demo/Structs/ShockWaveInfo.xml @@ -1,7 +1,7 @@ - + 0.0 @@ -18,7 +18,7 @@ 0.0 - + -1 diff --git a/templates/mp2demo/Structs/TextProperties.xml b/templates/mp2demo/Structs/TextProperties.xml index d4f03d40..40788459 100644 --- a/templates/mp2demo/Structs/TextProperties.xml +++ b/templates/mp2demo/Structs/TextProperties.xml @@ -16,7 +16,7 @@ 1.0, 1.0, 1.0, 1.0 - + 0 diff --git a/templates/mp3/Script/AIFuse.xml b/templates/mp3/Script/AIFuse.xml index cbaddf45..885b7cd4 100644 --- a/templates/mp3/Script/AIFuse.xml +++ b/templates/mp3/Script/AIFuse.xml @@ -34,8 +34,8 @@ 30.0 - - + + diff --git a/templates/mp3/Script/AVIS.xml b/templates/mp3/Script/AVIS.xml index 9b5c054f..89b01c87 100644 --- a/templates/mp3/Script/AVIS.xml +++ b/templates/mp3/Script/AVIS.xml @@ -3,8 +3,8 @@ AVIS - - + + diff --git a/templates/mp3/Script/AVMC.xml b/templates/mp3/Script/AVMC.xml index 88fe0d98..0fb8bd2d 100644 --- a/templates/mp3/Script/AVMC.xml +++ b/templates/mp3/Script/AVMC.xml @@ -3,7 +3,7 @@ AVMC - + 2 diff --git a/templates/mp3/Script/Achievement.xml b/templates/mp3/Script/Achievement.xml index 9f50bfd3..42b14096 100644 --- a/templates/mp3/Script/Achievement.xml +++ b/templates/mp3/Script/Achievement.xml @@ -118,7 +118,7 @@ true - + diff --git a/templates/mp3/Script/Actor.xml b/templates/mp3/Script/Actor.xml index dccc27fb..65d0e470 100644 --- a/templates/mp3/Script/Actor.xml +++ b/templates/mp3/Script/Actor.xml @@ -17,8 +17,8 @@ - - + + @@ -64,7 +64,7 @@ 0.0 - + diff --git a/templates/mp3/Script/AreaAttributes.xml b/templates/mp3/Script/AreaAttributes.xml index 760f9b54..f46f211c 100644 --- a/templates/mp3/Script/AreaAttributes.xml +++ b/templates/mp3/Script/AreaAttributes.xml @@ -47,12 +47,12 @@ 50.0 - + true - + @@ -68,7 +68,7 @@ 42.0 - + true diff --git a/templates/mp3/Script/AtomicAlpha.xml b/templates/mp3/Script/AtomicAlpha.xml index 5e939d4d..cd9da7eb 100644 --- a/templates/mp3/Script/AtomicAlpha.xml +++ b/templates/mp3/Script/AtomicAlpha.xml @@ -8,8 +8,8 @@ - - + + 3.0 diff --git a/templates/mp3/Script/BeastRider.xml b/templates/mp3/Script/BeastRider.xml index 52a107ec..3abd7c34 100644 --- a/templates/mp3/Script/BeastRider.xml +++ b/templates/mp3/Script/BeastRider.xml @@ -8,11 +8,11 @@ - + - + - + diff --git a/templates/mp3/Script/BlinkWolf.xml b/templates/mp3/Script/BlinkWolf.xml index f844dc90..5a2b83e8 100644 --- a/templates/mp3/Script/BlinkWolf.xml +++ b/templates/mp3/Script/BlinkWolf.xml @@ -141,8 +141,8 @@ - - + + 70.0 @@ -183,8 +183,8 @@ 4.0 - - + + 0.0 diff --git a/templates/mp3/Script/Cable.xml b/templates/mp3/Script/Cable.xml index fc0e2af3..5d72bc5d 100644 --- a/templates/mp3/Script/Cable.xml +++ b/templates/mp3/Script/Cable.xml @@ -9,7 +9,7 @@ - + 0x436F402A diff --git a/templates/mp3/Script/CameraFilterKeyframe.xml b/templates/mp3/Script/CameraFilterKeyframe.xml index a708bb27..355a8ec0 100644 --- a/templates/mp3/Script/CameraFilterKeyframe.xml +++ b/templates/mp3/Script/CameraFilterKeyframe.xml @@ -24,8 +24,8 @@ 0.0 - - + + diff --git a/templates/mp3/Script/CameraShaker.xml b/templates/mp3/Script/CameraShaker.xml index a0e2f912..272ccb49 100644 --- a/templates/mp3/Script/CameraShaker.xml +++ b/templates/mp3/Script/CameraShaker.xml @@ -14,7 +14,7 @@ 1.0 - + diff --git a/templates/mp3/Script/CannonBall.xml b/templates/mp3/Script/CannonBall.xml index 03c6b26b..91f0ee04 100644 --- a/templates/mp3/Script/CannonBall.xml +++ b/templates/mp3/Script/CannonBall.xml @@ -3,7 +3,7 @@ CannonBall - + diff --git a/templates/mp3/Script/CombatTrooper.xml b/templates/mp3/Script/CombatTrooper.xml index c4f12253..5d7e7974 100644 --- a/templates/mp3/Script/CombatTrooper.xml +++ b/templates/mp3/Script/CombatTrooper.xml @@ -80,8 +80,8 @@ false - - + + @@ -91,8 +91,8 @@ - - + + true diff --git a/templates/mp3/Script/ContextActionCombinationLock.xml b/templates/mp3/Script/ContextActionCombinationLock.xml index 5c61a1e7..4fa04f77 100644 --- a/templates/mp3/Script/ContextActionCombinationLock.xml +++ b/templates/mp3/Script/ContextActionCombinationLock.xml @@ -18,10 +18,10 @@ true - - - - + + + + diff --git a/templates/mp3/Script/ContextActionImageFocus.xml b/templates/mp3/Script/ContextActionImageFocus.xml index a2a4621c..50d0d423 100644 --- a/templates/mp3/Script/ContextActionImageFocus.xml +++ b/templates/mp3/Script/ContextActionImageFocus.xml @@ -33,7 +33,7 @@ 0.075 - + -1 diff --git a/templates/mp3/Script/ContextActionWelding.xml b/templates/mp3/Script/ContextActionWelding.xml index c71d89b2..98e8778f 100644 --- a/templates/mp3/Script/ContextActionWelding.xml +++ b/templates/mp3/Script/ContextActionWelding.xml @@ -10,30 +10,30 @@ - - - - - - - - - - + + + + + + + + + + 1.0, 0.0, 0.0, 1.0 1.0, 1.0, 1.0, 1.0 - - - - - - - - + + + + + + + + 0.25 diff --git a/templates/mp3/Script/DarkSamus.xml b/templates/mp3/Script/DarkSamus.xml index d2e11579..00db5ccd 100644 --- a/templates/mp3/Script/DarkSamus.xml +++ b/templates/mp3/Script/DarkSamus.xml @@ -23,7 +23,7 @@ -1.0 - + 0 @@ -63,33 +63,33 @@ 0 - - - - - - + + + + + + - + - - - + + + - - - + + + 100.0 - - - - - - - + + + + + + + diff --git a/templates/mp3/Script/Debris.xml b/templates/mp3/Script/Debris.xml index f28263e6..1aa32c61 100644 --- a/templates/mp3/Script/Debris.xml +++ b/templates/mp3/Script/Debris.xml @@ -87,11 +87,11 @@ 1.0 - + 0.0, 0.0, 0.0 - + 1 @@ -116,7 +116,7 @@ 0.1 - + 1.0, 1.0, 1.0 @@ -130,7 +130,7 @@ true - + 1.0, 1.0, 1.0 diff --git a/templates/mp3/Script/DefenseMechanoid.xml b/templates/mp3/Script/DefenseMechanoid.xml index 41861554..28b38082 100644 --- a/templates/mp3/Script/DefenseMechanoid.xml +++ b/templates/mp3/Script/DefenseMechanoid.xml @@ -8,22 +8,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 40.0 @@ -58,14 +58,14 @@ - - - - - - - - + + + + + + + + diff --git a/templates/mp3/Script/DialogueMenu.xml b/templates/mp3/Script/DialogueMenu.xml index 229ccda3..5e5ceb71 100644 --- a/templates/mp3/Script/DialogueMenu.xml +++ b/templates/mp3/Script/DialogueMenu.xml @@ -17,7 +17,7 @@ 0.0, 0.0, 0.0, 0.0 - + 110 @@ -29,8 +29,8 @@ - - + + diff --git a/templates/mp3/Script/Door.xml b/templates/mp3/Script/Door.xml index e4abab8e..d2f603f2 100644 --- a/templates/mp3/Script/Door.xml +++ b/templates/mp3/Script/Door.xml @@ -22,12 +22,12 @@ true - - + + 0.0, 1.0, 1.0, 1.0 - + 0.0, 0.0, 0.0 diff --git a/templates/mp3/Script/Effect.xml b/templates/mp3/Script/Effect.xml index 15b667e7..f35b551c 100644 --- a/templates/mp3/Script/Effect.xml +++ b/templates/mp3/Script/Effect.xml @@ -3,7 +3,7 @@ Effect - + true diff --git a/templates/mp3/Script/EffectRepulsor.xml b/templates/mp3/Script/EffectRepulsor.xml index 358f14bf..289a5801 100644 --- a/templates/mp3/Script/EffectRepulsor.xml +++ b/templates/mp3/Script/EffectRepulsor.xml @@ -6,7 +6,7 @@ 0xFB73F2B8 - + 0.1 diff --git a/templates/mp3/Script/ElectroMagneticPulse.xml b/templates/mp3/Script/ElectroMagneticPulse.xml index 2464140d..e4c48013 100644 --- a/templates/mp3/Script/ElectroMagneticPulse.xml +++ b/templates/mp3/Script/ElectroMagneticPulse.xml @@ -30,7 +30,7 @@ 0.8 - + diff --git a/templates/mp3/Script/EyePod.xml b/templates/mp3/Script/EyePod.xml index 7095327e..1f3200b9 100644 --- a/templates/mp3/Script/EyePod.xml +++ b/templates/mp3/Script/EyePod.xml @@ -48,8 +48,8 @@ 7.0 - - + + diff --git a/templates/mp3/Script/FishCloud.xml b/templates/mp3/Script/FishCloud.xml index 05a26e4b..a38458b2 100644 --- a/templates/mp3/Script/FishCloud.xml +++ b/templates/mp3/Script/FishCloud.xml @@ -3,7 +3,7 @@ FishCloud - + 20 @@ -85,36 +85,36 @@ 0.0 - + 0 1.0 - + 0 1.0 - + 0 1.0 - + 0 1.0 - - + + 20.0 @@ -141,7 +141,7 @@ 2.0 - + 0 diff --git a/templates/mp3/Script/FlyingPirate.xml b/templates/mp3/Script/FlyingPirate.xml index 599724e0..88096895 100644 --- a/templates/mp3/Script/FlyingPirate.xml +++ b/templates/mp3/Script/FlyingPirate.xml @@ -58,8 +58,8 @@ 100.0 - - + + 15.0 @@ -114,11 +114,11 @@ - + - - - + + + 50.0 @@ -136,11 +136,11 @@ - - + + - - + + 10.0 @@ -178,15 +178,15 @@ - - - - - - - - - + + + + + + + + + @@ -203,9 +203,9 @@ 2.0 - - - + + + diff --git a/templates/mp3/Script/Friendly.xml b/templates/mp3/Script/Friendly.xml index 04755269..bf322e2d 100644 --- a/templates/mp3/Script/Friendly.xml +++ b/templates/mp3/Script/Friendly.xml @@ -80,8 +80,8 @@ false - - + + @@ -91,8 +91,8 @@ - - + + true diff --git a/templates/mp3/Script/GellSac.xml b/templates/mp3/Script/GellSac.xml index f3952b7d..cc26607d 100644 --- a/templates/mp3/Script/GellSac.xml +++ b/templates/mp3/Script/GellSac.xml @@ -56,10 +56,10 @@ 20.0 - - + + - + diff --git a/templates/mp3/Script/GhorUpperBody.xml b/templates/mp3/Script/GhorUpperBody.xml index b77b38ce..2e75e0db 100644 --- a/templates/mp3/Script/GhorUpperBody.xml +++ b/templates/mp3/Script/GhorUpperBody.xml @@ -37,8 +37,8 @@ - - + + @@ -59,9 +59,9 @@ - - - + + + @@ -86,8 +86,8 @@ 4.0 - - + + @@ -108,8 +108,8 @@ 8.0 - - + + @@ -156,7 +156,7 @@ 12.0 - + @@ -172,7 +172,7 @@ - + diff --git a/templates/mp3/Script/GragnolFlyer.xml b/templates/mp3/Script/GragnolFlyer.xml index ff691e85..b5fbc01c 100644 --- a/templates/mp3/Script/GragnolFlyer.xml +++ b/templates/mp3/Script/GragnolFlyer.xml @@ -70,8 +70,8 @@ - - + + -1.0 diff --git a/templates/mp3/Script/GuiMenu.xml b/templates/mp3/Script/GuiMenu.xml index ab2a8c2d..0e3eb55f 100644 --- a/templates/mp3/Script/GuiMenu.xml +++ b/templates/mp3/Script/GuiMenu.xml @@ -3,7 +3,7 @@ GuiMenu - + true diff --git a/templates/mp3/Script/GuiScreen.xml b/templates/mp3/Script/GuiScreen.xml index 2fa260a1..2bb1dca7 100644 --- a/templates/mp3/Script/GuiScreen.xml +++ b/templates/mp3/Script/GuiScreen.xml @@ -9,7 +9,7 @@ 0 - + diff --git a/templates/mp3/Script/GuiSlider.xml b/templates/mp3/Script/GuiSlider.xml index f829a5ce..f200aef6 100644 --- a/templates/mp3/Script/GuiSlider.xml +++ b/templates/mp3/Script/GuiSlider.xml @@ -22,7 +22,7 @@ 1.0 - + 127 diff --git a/templates/mp3/Script/GunTurretBase.xml b/templates/mp3/Script/GunTurretBase.xml index ce96d62b..408ba9c0 100644 --- a/templates/mp3/Script/GunTurretBase.xml +++ b/templates/mp3/Script/GunTurretBase.xml @@ -38,7 +38,7 @@ 0.7 - + diff --git a/templates/mp3/Script/GunTurretTop.xml b/templates/mp3/Script/GunTurretTop.xml index d949ceae..1acc520e 100644 --- a/templates/mp3/Script/GunTurretTop.xml +++ b/templates/mp3/Script/GunTurretTop.xml @@ -54,8 +54,8 @@ 5 - - + + 10.0 diff --git a/templates/mp3/Script/HUDHint.xml b/templates/mp3/Script/HUDHint.xml index 89e17aa5..a9fb4140 100644 --- a/templates/mp3/Script/HUDHint.xml +++ b/templates/mp3/Script/HUDHint.xml @@ -3,7 +3,7 @@ HUDHint - + 15.0 diff --git a/templates/mp3/Script/HUDMemo.xml b/templates/mp3/Script/HUDMemo.xml index 63c049d9..ea160b74 100644 --- a/templates/mp3/Script/HUDMemo.xml +++ b/templates/mp3/Script/HUDMemo.xml @@ -30,7 +30,7 @@ 1 - + 0 @@ -50,13 +50,13 @@ false - - - + + + 0.0 - + diff --git a/templates/mp3/Script/Korakk.xml b/templates/mp3/Script/Korakk.xml index d12acf1a..ced75323 100644 --- a/templates/mp3/Script/Korakk.xml +++ b/templates/mp3/Script/Korakk.xml @@ -8,13 +8,13 @@ - - - - - - - + + + + + + + 25.0 @@ -119,11 +119,11 @@ - - - - - + + + + + diff --git a/templates/mp3/Script/KorbaSnatcherSwarm.xml b/templates/mp3/Script/KorbaSnatcherSwarm.xml index 877fcb6a..aebaf40e 100644 --- a/templates/mp3/Script/KorbaSnatcherSwarm.xml +++ b/templates/mp3/Script/KorbaSnatcherSwarm.xml @@ -38,7 +38,7 @@ 30.0 - + diff --git a/templates/mp3/Script/LODController.xml b/templates/mp3/Script/LODController.xml index d094e47d..94d361c7 100644 --- a/templates/mp3/Script/LODController.xml +++ b/templates/mp3/Script/LODController.xml @@ -9,43 +9,43 @@ 1 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 - + 0.0 diff --git a/templates/mp3/Script/LUAScript.xml b/templates/mp3/Script/LUAScript.xml index 752ac208..d57627b7 100644 --- a/templates/mp3/Script/LUAScript.xml +++ b/templates/mp3/Script/LUAScript.xml @@ -3,8 +3,8 @@ LUAScript - - + + diff --git a/templates/mp3/Script/Metaree.xml b/templates/mp3/Script/Metaree.xml index f6a0110e..3eb18295 100644 --- a/templates/mp3/Script/Metaree.xml +++ b/templates/mp3/Script/Metaree.xml @@ -35,7 +35,7 @@ 0.0, 0.0, 0.0 - + 1.0 diff --git a/templates/mp3/Script/MetroidHopper.xml b/templates/mp3/Script/MetroidHopper.xml index 7bb13595..585a68a1 100644 --- a/templates/mp3/Script/MetroidHopper.xml +++ b/templates/mp3/Script/MetroidHopper.xml @@ -79,12 +79,12 @@ - - + + 5.0 - + diff --git a/templates/mp3/Script/MetroidPhazeoid.xml b/templates/mp3/Script/MetroidPhazeoid.xml index 563c0f23..b21c8d59 100644 --- a/templates/mp3/Script/MetroidPhazeoid.xml +++ b/templates/mp3/Script/MetroidPhazeoid.xml @@ -192,9 +192,9 @@ 1.0 - - - + + + 5 diff --git a/templates/mp3/Script/MinorIng.xml b/templates/mp3/Script/MinorIng.xml index 7b12b2d7..6bdbd8f5 100644 --- a/templates/mp3/Script/MinorIng.xml +++ b/templates/mp3/Script/MinorIng.xml @@ -100,23 +100,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/templates/mp3/Script/MultiModelActor.xml b/templates/mp3/Script/MultiModelActor.xml index 18b15563..4bea603f 100644 --- a/templates/mp3/Script/MultiModelActor.xml +++ b/templates/mp3/Script/MultiModelActor.xml @@ -12,8 +12,8 @@ 0.0, 0.0, 0.0 - - + + diff --git a/templates/mp3/Script/MysteryFlyer.xml b/templates/mp3/Script/MysteryFlyer.xml index cc76fab8..dd8297ba 100644 --- a/templates/mp3/Script/MysteryFlyer.xml +++ b/templates/mp3/Script/MysteryFlyer.xml @@ -20,7 +20,7 @@ - + diff --git a/templates/mp3/Script/Nightbarb.xml b/templates/mp3/Script/Nightbarb.xml index 08026744..b8dd6885 100644 --- a/templates/mp3/Script/Nightbarb.xml +++ b/templates/mp3/Script/Nightbarb.xml @@ -15,7 +15,7 @@ 45.0 - + 2.0 diff --git a/templates/mp3/Script/NoseTurret.xml b/templates/mp3/Script/NoseTurret.xml index 7aaac207..8faafab2 100644 --- a/templates/mp3/Script/NoseTurret.xml +++ b/templates/mp3/Script/NoseTurret.xml @@ -47,7 +47,7 @@ -45.0 - + 1.0 @@ -61,7 +61,7 @@ 2 - + false diff --git a/templates/mp3/Script/OptionalAreaAsset.xml b/templates/mp3/Script/OptionalAreaAsset.xml index 0a9944b6..0423f572 100644 --- a/templates/mp3/Script/OptionalAreaAsset.xml +++ b/templates/mp3/Script/OptionalAreaAsset.xml @@ -10,7 +10,7 @@ - + diff --git a/templates/mp3/Script/Phaazoid.xml b/templates/mp3/Script/Phaazoid.xml index 590f92fd..101424e7 100644 --- a/templates/mp3/Script/Phaazoid.xml +++ b/templates/mp3/Script/Phaazoid.xml @@ -44,7 +44,7 @@ 7.0 - + diff --git a/templates/mp3/Script/PhazonHarvester.xml b/templates/mp3/Script/PhazonHarvester.xml index e7d3c958..5c958763 100644 --- a/templates/mp3/Script/PhazonHarvester.xml +++ b/templates/mp3/Script/PhazonHarvester.xml @@ -89,11 +89,11 @@ - - - - - + + + + + diff --git a/templates/mp3/Script/PhazonPuddle.xml b/templates/mp3/Script/PhazonPuddle.xml index 82a2dec6..5f2a8fa5 100644 --- a/templates/mp3/Script/PhazonPuddle.xml +++ b/templates/mp3/Script/PhazonPuddle.xml @@ -9,7 +9,7 @@ - + @@ -82,26 +82,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/templates/mp3/Script/PhazonPuffer.xml b/templates/mp3/Script/PhazonPuffer.xml index 0cacff3e..3e73e8fa 100644 --- a/templates/mp3/Script/PhazonPuffer.xml +++ b/templates/mp3/Script/PhazonPuffer.xml @@ -71,18 +71,18 @@ - + - + - - - - + + + + diff --git a/templates/mp3/Script/PhysicsDebris.xml b/templates/mp3/Script/PhysicsDebris.xml index 77dc459e..a972ad25 100644 --- a/templates/mp3/Script/PhysicsDebris.xml +++ b/templates/mp3/Script/PhysicsDebris.xml @@ -78,8 +78,8 @@ 1.0 - - + + 1 @@ -104,7 +104,7 @@ 0.1 - + 1.0, 1.0, 1.0 @@ -118,7 +118,7 @@ true - + 1.0, 1.0, 1.0 diff --git a/templates/mp3/Script/Pickup.xml b/templates/mp3/Script/Pickup.xml index 82053163..97d130ef 100644 --- a/templates/mp3/Script/Pickup.xml +++ b/templates/mp3/Script/Pickup.xml @@ -34,13 +34,13 @@ 0.0 - + 0.0 - + false diff --git a/templates/mp3/Script/Platform.xml b/templates/mp3/Script/Platform.xml index d116004e..833d8b40 100644 --- a/templates/mp3/Script/Platform.xml +++ b/templates/mp3/Script/Platform.xml @@ -9,10 +9,10 @@ 0.0, 0.0, 0.0 - + - + diff --git a/templates/mp3/Script/PlayerActor.xml b/templates/mp3/Script/PlayerActor.xml index 5d67b5bf..85b75976 100644 --- a/templates/mp3/Script/PlayerActor.xml +++ b/templates/mp3/Script/PlayerActor.xml @@ -17,7 +17,7 @@ - + @@ -29,22 +29,22 @@ true - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/templates/mp3/Script/Puffer.xml b/templates/mp3/Script/Puffer.xml index d180daea..90c7a74a 100644 --- a/templates/mp3/Script/Puffer.xml +++ b/templates/mp3/Script/Puffer.xml @@ -20,9 +20,9 @@ 3.0 - + - + 0.5 @@ -36,8 +36,8 @@ false - - + + diff --git a/templates/mp3/Script/ReptilicusHunter.xml b/templates/mp3/Script/ReptilicusHunter.xml index 9a55b79b..18ad7eb2 100644 --- a/templates/mp3/Script/ReptilicusHunter.xml +++ b/templates/mp3/Script/ReptilicusHunter.xml @@ -49,8 +49,8 @@ 0.25 - - + + 2.0 @@ -97,14 +97,14 @@ 5.0 - + 1.0 25.0 - + @@ -118,8 +118,8 @@ 15.0 - - + + false @@ -127,13 +127,13 @@ - - - - - - - + + + + + + + @@ -148,7 +148,7 @@ 0.5 - + 1.0 diff --git a/templates/mp3/Script/Ridley1.xml b/templates/mp3/Script/Ridley1.xml index 9adf8a4a..c15a256e 100644 --- a/templates/mp3/Script/Ridley1.xml +++ b/templates/mp3/Script/Ridley1.xml @@ -8,54 +8,54 @@ - - - - + + + + - + 100.0 - - - - - - - - - - - - - + + + + + + + + + + + + + 15.0 - + 25.0 - - - - + + + + 500.0 - + 250.0 - + 100.0 - - - - + + + + diff --git a/templates/mp3/Script/Rundas.xml b/templates/mp3/Script/Rundas.xml index 6df2e4dc..833e9cd5 100644 --- a/templates/mp3/Script/Rundas.xml +++ b/templates/mp3/Script/Rundas.xml @@ -8,40 +8,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 25.0 @@ -111,10 +111,10 @@ - - - - + + + + diff --git a/templates/mp3/Script/SamusForm.xml b/templates/mp3/Script/SamusForm.xml index 130d114b..fcac78bd 100644 --- a/templates/mp3/Script/SamusForm.xml +++ b/templates/mp3/Script/SamusForm.xml @@ -16,7 +16,7 @@ - + 4.0 @@ -60,11 +60,11 @@ 10.0 - - - - - + + + + + @@ -88,7 +88,7 @@ 30.0 - + 14.0 diff --git a/templates/mp3/Script/ScanIncoming.xml b/templates/mp3/Script/ScanIncoming.xml index dd616a15..414d36a5 100644 --- a/templates/mp3/Script/ScanIncoming.xml +++ b/templates/mp3/Script/ScanIncoming.xml @@ -3,7 +3,7 @@ ScanIncoming - + diff --git a/templates/mp3/Script/ScriptLayerController.xml b/templates/mp3/Script/ScriptLayerController.xml index dab8c452..b35eb871 100644 --- a/templates/mp3/Script/ScriptLayerController.xml +++ b/templates/mp3/Script/ScriptLayerController.xml @@ -5,7 +5,7 @@ - + diff --git a/templates/mp3/Script/SeedBoss1.xml b/templates/mp3/Script/SeedBoss1.xml index e12f0f0f..2f0a9f7d 100644 --- a/templates/mp3/Script/SeedBoss1.xml +++ b/templates/mp3/Script/SeedBoss1.xml @@ -15,29 +15,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 0.0 @@ -48,20 +48,20 @@ 1.0 - + 0.0, 0.0, 0.0 - + - - - + + + @@ -134,8 +134,8 @@ 0.0 - - + + @@ -167,10 +167,10 @@ - + - - + + 20.0 @@ -207,21 +207,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/templates/mp3/Script/SeedBoss1Orb.xml b/templates/mp3/Script/SeedBoss1Orb.xml index 7279e9b0..4bd9a982 100644 --- a/templates/mp3/Script/SeedBoss1Orb.xml +++ b/templates/mp3/Script/SeedBoss1Orb.xml @@ -19,8 +19,8 @@ true - - + + 0.0 diff --git a/templates/mp3/Script/SeedBoss2BotSwarm.xml b/templates/mp3/Script/SeedBoss2BotSwarm.xml index 569d5648..b85cd7e4 100644 --- a/templates/mp3/Script/SeedBoss2BotSwarm.xml +++ b/templates/mp3/Script/SeedBoss2BotSwarm.xml @@ -21,17 +21,17 @@ - + 0.1 - - - + + + - - + + diff --git a/templates/mp3/Script/SeedBoss2PrimeBot.xml b/templates/mp3/Script/SeedBoss2PrimeBot.xml index 4ff8962c..f60dc38c 100644 --- a/templates/mp3/Script/SeedBoss2PrimeBot.xml +++ b/templates/mp3/Script/SeedBoss2PrimeBot.xml @@ -13,46 +13,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + 100.0 - - - - - - - - - + + + + + + + + + diff --git a/templates/mp3/Script/Ship.xml b/templates/mp3/Script/Ship.xml index 83f134b7..655315fe 100644 --- a/templates/mp3/Script/Ship.xml +++ b/templates/mp3/Script/Ship.xml @@ -23,7 +23,7 @@ false - + @@ -40,7 +40,7 @@ - + 0.5 @@ -60,13 +60,13 @@ - - - - - - - + + + + + + + true diff --git a/templates/mp3/Script/ShipBombingRun.xml b/templates/mp3/Script/ShipBombingRun.xml index 1dc126d4..478342d5 100644 --- a/templates/mp3/Script/ShipBombingRun.xml +++ b/templates/mp3/Script/ShipBombingRun.xml @@ -6,9 +6,9 @@ 2.5 - - - + + + diff --git a/templates/mp3/Script/ShipCommandIcon.xml b/templates/mp3/Script/ShipCommandIcon.xml index 5ac6584e..e7cbc061 100644 --- a/templates/mp3/Script/ShipCommandIcon.xml +++ b/templates/mp3/Script/ShipCommandIcon.xml @@ -15,9 +15,9 @@ 0 - - - + + + @@ -36,9 +36,9 @@ 1.5 - - - + + + diff --git a/templates/mp3/Script/ShipHudControl.xml b/templates/mp3/Script/ShipHudControl.xml index c5707b88..94bf6566 100644 --- a/templates/mp3/Script/ShipHudControl.xml +++ b/templates/mp3/Script/ShipHudControl.xml @@ -3,7 +3,7 @@ ShipHudControl - + diff --git a/templates/mp3/Script/Sound.xml b/templates/mp3/Script/Sound.xml index 57df3a14..574435ef 100644 --- a/templates/mp3/Script/Sound.xml +++ b/templates/mp3/Script/Sound.xml @@ -3,7 +3,7 @@ Sound - + 0.0 diff --git a/templates/mp3/Script/SpacePirate.xml b/templates/mp3/Script/SpacePirate.xml index f23e33a0..ed65a317 100644 --- a/templates/mp3/Script/SpacePirate.xml +++ b/templates/mp3/Script/SpacePirate.xml @@ -112,8 +112,8 @@ false - - + + @@ -123,8 +123,8 @@ - - + + true @@ -337,9 +337,9 @@ 3.0 - - - + + + 10000 @@ -466,7 +466,7 @@ - + false @@ -482,17 +482,17 @@ - - - - - - - - - - - + + + + + + + + + + + false diff --git a/templates/mp3/Script/SpecialFunction.xml b/templates/mp3/Script/SpecialFunction.xml index 0dcf0b19..478e07a1 100644 --- a/templates/mp3/Script/SpecialFunction.xml +++ b/templates/mp3/Script/SpecialFunction.xml @@ -91,9 +91,9 @@ 0xFB73F2B8 - - - + + + 0xCC1DFCF5 diff --git a/templates/mp3/Script/Spinner.xml b/templates/mp3/Script/Spinner.xml index 076f7c3a..4e050569 100644 --- a/templates/mp3/Script/Spinner.xml +++ b/templates/mp3/Script/Spinner.xml @@ -30,9 +30,9 @@ false - - - + + + diff --git a/templates/mp3/Script/Steam.xml b/templates/mp3/Script/Steam.xml index fd75bb39..c43ebd12 100644 --- a/templates/mp3/Script/Steam.xml +++ b/templates/mp3/Script/Steam.xml @@ -4,7 +4,7 @@ - + 0.35 diff --git a/templates/mp3/Script/SteamBot.xml b/templates/mp3/Script/SteamBot.xml index 5b5324c7..1274eb38 100644 --- a/templates/mp3/Script/SteamBot.xml +++ b/templates/mp3/Script/SteamBot.xml @@ -143,7 +143,7 @@ - + 0.5 diff --git a/templates/mp3/Script/SteamDrone.xml b/templates/mp3/Script/SteamDrone.xml index f41c7a40..e644352a 100644 --- a/templates/mp3/Script/SteamDrone.xml +++ b/templates/mp3/Script/SteamDrone.xml @@ -12,7 +12,7 @@ - + 20.0 diff --git a/templates/mp3/Script/SteamLord.xml b/templates/mp3/Script/SteamLord.xml index 8abf50db..d7c35a57 100644 --- a/templates/mp3/Script/SteamLord.xml +++ b/templates/mp3/Script/SteamLord.xml @@ -49,10 +49,10 @@ 50.0 - - - - + + + + 15.0 diff --git a/templates/mp3/Script/StreamedAudio.xml b/templates/mp3/Script/StreamedAudio.xml index 8ea76407..d9664e1a 100644 --- a/templates/mp3/Script/StreamedAudio.xml +++ b/templates/mp3/Script/StreamedAudio.xml @@ -3,7 +3,7 @@ StreamedAudio - + false diff --git a/templates/mp3/Script/Subtitles.xml b/templates/mp3/Script/Subtitles.xml index c8c24340..e57e1c4e 100644 --- a/templates/mp3/Script/Subtitles.xml +++ b/templates/mp3/Script/Subtitles.xml @@ -41,7 +41,7 @@ 100 - + 0 diff --git a/templates/mp3/Script/SwarmBot.xml b/templates/mp3/Script/SwarmBot.xml index c3b90f8b..39817cd0 100644 --- a/templates/mp3/Script/SwarmBot.xml +++ b/templates/mp3/Script/SwarmBot.xml @@ -25,10 +25,10 @@ 10.0 - - - - + + + + true @@ -52,40 +52,40 @@ - + - - - - - - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + 0.5 - - - + + + diff --git a/templates/mp3/Script/TextPane.xml b/templates/mp3/Script/TextPane.xml index 5ec0ab31..13395428 100644 --- a/templates/mp3/Script/TextPane.xml +++ b/templates/mp3/Script/TextPane.xml @@ -27,7 +27,7 @@ 0.0, 0.0, 0.0 - + 1 diff --git a/templates/mp3/Script/VenomWeed.xml b/templates/mp3/Script/VenomWeed.xml index 067b8a75..e02ea236 100644 --- a/templates/mp3/Script/VenomWeed.xml +++ b/templates/mp3/Script/VenomWeed.xml @@ -58,15 +58,15 @@ 0.0 - - - - - + + + + + 0 - + 0.0 diff --git a/templates/mp3/Script/VisorGoo.xml b/templates/mp3/Script/VisorGoo.xml index 8067dfd8..d80cc7dc 100644 --- a/templates/mp3/Script/VisorGoo.xml +++ b/templates/mp3/Script/VisorGoo.xml @@ -3,8 +3,8 @@ VisorGoo - - + + 1.0 @@ -20,7 +20,7 @@ 1.0, 1.0, 1.0, 1.0 - + false diff --git a/templates/mp3/Script/WallCrawlerSwarm.xml b/templates/mp3/Script/WallCrawlerSwarm.xml index c6929bff..bb28a2f9 100644 --- a/templates/mp3/Script/WallCrawlerSwarm.xml +++ b/templates/mp3/Script/WallCrawlerSwarm.xml @@ -10,7 +10,7 @@ never - + diff --git a/templates/mp3/Script/Water.xml b/templates/mp3/Script/Water.xml index 67051ea0..0e96c530 100644 --- a/templates/mp3/Script/Water.xml +++ b/templates/mp3/Script/Water.xml @@ -62,12 +62,12 @@ 0.0, 0.498039, 1.0, 1.0 - - - - - - + + + + + + 0.25 @@ -91,27 +91,27 @@ 1.0, 1.0, 1.0, 1.0 - - - - - - - - - - + + + + + + + + + + 50.0 45000.0 - - - - - + + + + + 7.0 @@ -145,12 +145,12 @@ 8.0 - - - - - - + + + + + + false diff --git a/templates/mp3/Script/WeaponGenerator.xml b/templates/mp3/Script/WeaponGenerator.xml index 9b39e6b5..29552ff6 100644 --- a/templates/mp3/Script/WeaponGenerator.xml +++ b/templates/mp3/Script/WeaponGenerator.xml @@ -6,8 +6,8 @@ - - + + 0x9EFB69B1 diff --git a/templates/mp3/Script/WorldAttributes.xml b/templates/mp3/Script/WorldAttributes.xml index 66d9589a..44992d14 100644 --- a/templates/mp3/Script/WorldAttributes.xml +++ b/templates/mp3/Script/WorldAttributes.xml @@ -3,8 +3,8 @@ WorldAttributes - - + + diff --git a/templates/mp3/Script/WorldTeleporter.xml b/templates/mp3/Script/WorldTeleporter.xml index ddc2b6c0..20dc1959 100644 --- a/templates/mp3/Script/WorldTeleporter.xml +++ b/templates/mp3/Script/WorldTeleporter.xml @@ -6,8 +6,8 @@ - - + + 0xF9C885FF @@ -20,13 +20,13 @@ - + - - + + false @@ -58,15 +58,15 @@ - - + + 1.0 0.0 - + 1.0 diff --git a/templates/mp3/Script/WorldTeleporterAttributes.xml b/templates/mp3/Script/WorldTeleporterAttributes.xml index d47b4d08..d151eb31 100644 --- a/templates/mp3/Script/WorldTeleporterAttributes.xml +++ b/templates/mp3/Script/WorldTeleporterAttributes.xml @@ -8,98 +8,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + never - + never @@ -110,7 +110,7 @@ never - + never @@ -121,7 +121,7 @@ never - + never @@ -132,7 +132,7 @@ never - + never @@ -143,7 +143,7 @@ never - + never diff --git a/templates/mp3/Script/WorldTransitionChoiceRelay.xml b/templates/mp3/Script/WorldTransitionChoiceRelay.xml index 45097035..f4b049e0 100644 --- a/templates/mp3/Script/WorldTransitionChoiceRelay.xml +++ b/templates/mp3/Script/WorldTransitionChoiceRelay.xml @@ -11,17 +11,17 @@ - - + + never - + never - + never @@ -29,10 +29,10 @@ never - + never - + never @@ -40,10 +40,10 @@ never - + never - + never @@ -51,10 +51,10 @@ never - + never - + never @@ -62,10 +62,10 @@ never - + never - + never @@ -73,10 +73,10 @@ never - + never - + never @@ -84,10 +84,10 @@ never - + never - + never @@ -95,10 +95,10 @@ never - + never - + never @@ -106,10 +106,10 @@ never - + never - + never diff --git a/templates/mp3/Structs/ActorParameters.xml b/templates/mp3/Structs/ActorParameters.xml index de3bee53..0390e753 100644 --- a/templates/mp3/Structs/ActorParameters.xml +++ b/templates/mp3/Structs/ActorParameters.xml @@ -3,8 +3,8 @@ - - + + true diff --git a/templates/mp3/Structs/AuroraUnit1Data.xml b/templates/mp3/Structs/AuroraUnit1Data.xml index d7d4f42f..2998f2fa 100644 --- a/templates/mp3/Structs/AuroraUnit1Data.xml +++ b/templates/mp3/Structs/AuroraUnit1Data.xml @@ -7,8 +7,8 @@ 120.0 - - + + 700.0 @@ -51,13 +51,13 @@ 2 - + 100.0 - - + + 6.75 @@ -217,7 +217,7 @@ - + 13.0 diff --git a/templates/mp3/Structs/AuroraUnit2Data.xml b/templates/mp3/Structs/AuroraUnit2Data.xml index 44ff110a..abb1e265 100644 --- a/templates/mp3/Structs/AuroraUnit2Data.xml +++ b/templates/mp3/Structs/AuroraUnit2Data.xml @@ -56,7 +56,7 @@ - + 45.0 @@ -66,7 +66,7 @@ - + @@ -97,11 +97,11 @@ 1.5 - - - - - + + + + + 50.0 diff --git a/templates/mp3/Structs/BerserkerData.xml b/templates/mp3/Structs/BerserkerData.xml index 88057ece..24f77493 100644 --- a/templates/mp3/Structs/BerserkerData.xml +++ b/templates/mp3/Structs/BerserkerData.xml @@ -122,15 +122,15 @@ 500.0 - - - - - + + + + + 1.4 - + 10.0 @@ -282,8 +282,8 @@ 0.1 - - + + diff --git a/templates/mp3/Structs/DarkSamusEchoData.xml b/templates/mp3/Structs/DarkSamusEchoData.xml index d0be4f9d..3cbcaf8a 100644 --- a/templates/mp3/Structs/DarkSamusEchoData.xml +++ b/templates/mp3/Structs/DarkSamusEchoData.xml @@ -1,10 +1,10 @@ - - - - + + + + 3.0 diff --git a/templates/mp3/Structs/ElectricBeamInfo.xml b/templates/mp3/Structs/ElectricBeamInfo.xml index 3d5db9d7..ebbbf2bd 100644 --- a/templates/mp3/Structs/ElectricBeamInfo.xml +++ b/templates/mp3/Structs/ElectricBeamInfo.xml @@ -1,12 +1,12 @@ - - + + never - - + + 1.0 @@ -22,7 +22,7 @@ 150.0 never - + never diff --git a/templates/mp3/Structs/FlareDef.xml b/templates/mp3/Structs/FlareDef.xml index fc307a08..b5ca88af 100644 --- a/templates/mp3/Structs/FlareDef.xml +++ b/templates/mp3/Structs/FlareDef.xml @@ -1,7 +1,7 @@ - + 0.0 diff --git a/templates/mp3/Structs/GandraydaData.xml b/templates/mp3/Structs/GandraydaData.xml index 8bb8c6c0..4d7579d3 100644 --- a/templates/mp3/Structs/GandraydaData.xml +++ b/templates/mp3/Structs/GandraydaData.xml @@ -28,7 +28,7 @@ 13.0 - + @@ -37,10 +37,10 @@ 10.0 - + - - + + 100.0 @@ -65,7 +65,7 @@ 15.0 - + 100.0 @@ -97,13 +97,13 @@ 4.0 - - - - + + + + - + 0.75 @@ -118,10 +118,10 @@ - + - - + + 20.0 diff --git a/templates/mp3/Structs/GhorStructA.xml b/templates/mp3/Structs/GhorStructA.xml index bd938b6d..4d15c1fb 100644 --- a/templates/mp3/Structs/GhorStructA.xml +++ b/templates/mp3/Structs/GhorStructA.xml @@ -1,8 +1,8 @@ - - + + diff --git a/templates/mp3/Structs/GhorStructB.xml b/templates/mp3/Structs/GhorStructB.xml index 3bba29d1..00da1bab 100644 --- a/templates/mp3/Structs/GhorStructB.xml +++ b/templates/mp3/Structs/GhorStructB.xml @@ -87,11 +87,11 @@ 20.0 - - - - - + + + + + diff --git a/templates/mp3/Structs/GhorStructC.xml b/templates/mp3/Structs/GhorStructC.xml index a8c4e1da..5c2cbbd9 100644 --- a/templates/mp3/Structs/GhorStructC.xml +++ b/templates/mp3/Structs/GhorStructC.xml @@ -1,7 +1,7 @@ - + diff --git a/templates/mp3/Structs/GrappleData.xml b/templates/mp3/Structs/GrappleData.xml index 0d80bd3a..c0251cc8 100644 --- a/templates/mp3/Structs/GrappleData.xml +++ b/templates/mp3/Structs/GrappleData.xml @@ -64,7 +64,7 @@ 6.0 - + 0.0 diff --git a/templates/mp3/Structs/HoverThenHomeProjectile.xml b/templates/mp3/Structs/HoverThenHomeProjectile.xml index 50433e59..3dfb37d8 100644 --- a/templates/mp3/Structs/HoverThenHomeProjectile.xml +++ b/templates/mp3/Structs/HoverThenHomeProjectile.xml @@ -22,6 +22,6 @@ -1.0 - + diff --git a/templates/mp3/Structs/LaunchProjectileData.xml b/templates/mp3/Structs/LaunchProjectileData.xml index ed4a7538..2d12b4c0 100644 --- a/templates/mp3/Structs/LaunchProjectileData.xml +++ b/templates/mp3/Structs/LaunchProjectileData.xml @@ -1,7 +1,7 @@ - + 1.0, 1.0, 1.0 @@ -12,8 +12,8 @@ 0.0 - - + + 20.0 diff --git a/templates/mp3/Structs/MetroidHatcherData.xml b/templates/mp3/Structs/MetroidHatcherData.xml index 71bead07..5cb07243 100644 --- a/templates/mp3/Structs/MetroidHatcherData.xml +++ b/templates/mp3/Structs/MetroidHatcherData.xml @@ -570,10 +570,10 @@ 30.0 - - - - - + + + + + diff --git a/templates/mp3/Structs/MultiModelActorStruct.xml b/templates/mp3/Structs/MultiModelActorStruct.xml index d0e85289..26ec9a57 100644 --- a/templates/mp3/Structs/MultiModelActorStruct.xml +++ b/templates/mp3/Structs/MultiModelActorStruct.xml @@ -1,7 +1,7 @@ - + 0.0 diff --git a/templates/mp3/Structs/PatternedAI.xml b/templates/mp3/Structs/PatternedAI.xml index ad97e3ae..ed9b9b22 100644 --- a/templates/mp3/Structs/PatternedAI.xml +++ b/templates/mp3/Structs/PatternedAI.xml @@ -23,7 +23,7 @@ 0.1 - + 0 @@ -33,12 +33,12 @@ false - + 0 - - + + 1.0 @@ -87,7 +87,7 @@ 2.0 - + 60.0 @@ -97,26 +97,26 @@ 0.0 - + 0.0, 0.0, 0.0 - - + + 1000.0 - - + + 0.0, 0.0, 0.0 - + 0.078431, 0.235294, 0.313726, 1.0 - + 0.0, 1.0, 0.0 diff --git a/templates/mp3/Structs/PlasmaBeamInfo.xml b/templates/mp3/Structs/PlasmaBeamInfo.xml index d1fcbe75..b940e9cc 100644 --- a/templates/mp3/Structs/PlasmaBeamInfo.xml +++ b/templates/mp3/Structs/PlasmaBeamInfo.xml @@ -4,11 +4,11 @@ 0 - - - - - + + + + + 10.0 @@ -45,10 +45,10 @@ 0.0, 0.0, 0.0, 0.0 - - - - + + + + 0.9 diff --git a/templates/mp3/Structs/PlayerActorStruct.xml b/templates/mp3/Structs/PlayerActorStruct.xml index 64d142f8..ca68e768 100644 --- a/templates/mp3/Structs/PlayerActorStruct.xml +++ b/templates/mp3/Structs/PlayerActorStruct.xml @@ -1,9 +1,9 @@ - - - + + + 1.0 diff --git a/templates/mp3/Structs/PuddleControlData.xml b/templates/mp3/Structs/PuddleControlData.xml index b3b37f89..574e8eb7 100644 --- a/templates/mp3/Structs/PuddleControlData.xml +++ b/templates/mp3/Structs/PuddleControlData.xml @@ -12,6 +12,6 @@ - + diff --git a/templates/mp3/Structs/RagDollData.xml b/templates/mp3/Structs/RagDollData.xml index d4e8921d..73e67e24 100644 --- a/templates/mp3/Structs/RagDollData.xml +++ b/templates/mp3/Structs/RagDollData.xml @@ -34,7 +34,7 @@ 5.0 - + false diff --git a/templates/mp3/Structs/ScanBeamInfo.xml b/templates/mp3/Structs/ScanBeamInfo.xml index f23f0f02..2e580a64 100644 --- a/templates/mp3/Structs/ScanBeamInfo.xml +++ b/templates/mp3/Structs/ScanBeamInfo.xml @@ -28,6 +28,6 @@ 50.0 - + diff --git a/templates/mp3/Structs/ScannableParameters.xml b/templates/mp3/Structs/ScannableParameters.xml index c61afd53..6c40e283 100644 --- a/templates/mp3/Structs/ScannableParameters.xml +++ b/templates/mp3/Structs/ScannableParameters.xml @@ -1,7 +1,7 @@ - + 0.0 diff --git a/templates/mp3/Structs/SeedBoss3Data.xml b/templates/mp3/Structs/SeedBoss3Data.xml index 3f09672e..6148d8f0 100644 --- a/templates/mp3/Structs/SeedBoss3Data.xml +++ b/templates/mp3/Structs/SeedBoss3Data.xml @@ -185,7 +185,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -239,7 +239,7 @@ 1.5, 1.5, 1.5 - + 500.0 @@ -531,7 +531,7 @@ - + 0.0 @@ -606,10 +606,10 @@ - - - - + + + + 6 @@ -681,16 +681,16 @@ 0.3 - + - + - + - + - + @@ -877,9 +877,9 @@ - - - - + + + + diff --git a/templates/mp3/Structs/ShipDecalControllerStruct.xml b/templates/mp3/Structs/ShipDecalControllerStruct.xml index 1fe9306d..2a24f2ef 100644 --- a/templates/mp3/Structs/ShipDecalControllerStruct.xml +++ b/templates/mp3/Structs/ShipDecalControllerStruct.xml @@ -15,6 +15,6 @@ - + diff --git a/templates/mp3/Structs/ShockWaveInfo.xml b/templates/mp3/Structs/ShockWaveInfo.xml index 4852bfad..99ebf7a0 100644 --- a/templates/mp3/Structs/ShockWaveInfo.xml +++ b/templates/mp3/Structs/ShockWaveInfo.xml @@ -1,7 +1,7 @@ - + 2.0 @@ -27,8 +27,8 @@ 0.0 - - - + + + diff --git a/templates/mp3/Structs/SpacePirateStruct.xml b/templates/mp3/Structs/SpacePirateStruct.xml index 187f3fa4..5f92b482 100644 --- a/templates/mp3/Structs/SpacePirateStruct.xml +++ b/templates/mp3/Structs/SpacePirateStruct.xml @@ -22,8 +22,8 @@ false - - + + 0.2 diff --git a/templates/mp3/Structs/SpacePirateWeaponData.xml b/templates/mp3/Structs/SpacePirateWeaponData.xml index 65f8be83..2d36d33d 100644 --- a/templates/mp3/Structs/SpacePirateWeaponData.xml +++ b/templates/mp3/Structs/SpacePirateWeaponData.xml @@ -34,7 +34,7 @@ false - + 15.0 @@ -44,9 +44,9 @@ - - - + + + 25.0 @@ -71,9 +71,9 @@ 2 - - - + + + 8.0 @@ -86,17 +86,17 @@ 0.0 - - - + + + 0.0, 0.0, 1.0, 1.0 1.0, 0.0, 0.0, 1.0 - - + + 0.0 diff --git a/templates/mp3/Structs/SwarmBasicsData.xml b/templates/mp3/Structs/SwarmBasicsData.xml index 21bd6cfc..ad40acd8 100644 --- a/templates/mp3/Structs/SwarmBasicsData.xml +++ b/templates/mp3/Structs/SwarmBasicsData.xml @@ -82,11 +82,11 @@ - + 5 - + 5 @@ -111,7 +111,7 @@ - + 0 diff --git a/templates/mp3/Structs/SwarmSoundData.xml b/templates/mp3/Structs/SwarmSoundData.xml index 56c15e85..12838106 100644 --- a/templates/mp3/Structs/SwarmSoundData.xml +++ b/templates/mp3/Structs/SwarmSoundData.xml @@ -1,7 +1,7 @@ - + 5 diff --git a/templates/mp3/Structs/TextProperties.xml b/templates/mp3/Structs/TextProperties.xml index 313f4992..5871ee7b 100644 --- a/templates/mp3/Structs/TextProperties.xml +++ b/templates/mp3/Structs/TextProperties.xml @@ -25,7 +25,7 @@ 1.0, 1.0, 1.0, 1.0 - + 0 diff --git a/templates/mp3/Structs/UnknownStruct10.xml b/templates/mp3/Structs/UnknownStruct10.xml index a38b4a2a..800781b8 100644 --- a/templates/mp3/Structs/UnknownStruct10.xml +++ b/templates/mp3/Structs/UnknownStruct10.xml @@ -51,7 +51,7 @@ - + false diff --git a/templates/mp3proto/Script/Actor.xml b/templates/mp3proto/Script/Actor.xml index e07a15f0..a1db50f5 100644 --- a/templates/mp3proto/Script/Actor.xml +++ b/templates/mp3proto/Script/Actor.xml @@ -17,8 +17,8 @@ - - + + @@ -48,7 +48,7 @@ 0.0 - + diff --git a/templates/mp3proto/Script/AreaAttributes.xml b/templates/mp3proto/Script/AreaAttributes.xml index 039129d8..6dad5f99 100644 --- a/templates/mp3proto/Script/AreaAttributes.xml +++ b/templates/mp3proto/Script/AreaAttributes.xml @@ -29,7 +29,7 @@ 1.0 - + 0 diff --git a/templates/mp3proto/Script/AtomicAlpha.xml b/templates/mp3proto/Script/AtomicAlpha.xml index 3bd54c88..0b3b7c97 100644 --- a/templates/mp3proto/Script/AtomicAlpha.xml +++ b/templates/mp3proto/Script/AtomicAlpha.xml @@ -5,8 +5,8 @@ - - + + 3.0 diff --git a/templates/mp3proto/Script/BeastRider.xml b/templates/mp3proto/Script/BeastRider.xml index 71973661..18e7bc25 100644 --- a/templates/mp3proto/Script/BeastRider.xml +++ b/templates/mp3proto/Script/BeastRider.xml @@ -5,9 +5,9 @@ - + - + diff --git a/templates/mp3proto/Script/Berserker.xml b/templates/mp3proto/Script/Berserker.xml index 99e80a3a..faeefcd9 100644 --- a/templates/mp3proto/Script/Berserker.xml +++ b/templates/mp3proto/Script/Berserker.xml @@ -115,9 +115,9 @@ 0.5 - - - + + + @@ -176,11 +176,11 @@ 500.0 - - - - - + + + + + diff --git a/templates/mp3proto/Script/BlinkWolf.xml b/templates/mp3proto/Script/BlinkWolf.xml index 387a3e74..71f27248 100644 --- a/templates/mp3proto/Script/BlinkWolf.xml +++ b/templates/mp3proto/Script/BlinkWolf.xml @@ -70,8 +70,8 @@ 4.0 - - + + 0.0 diff --git a/templates/mp3proto/Script/Cable.xml b/templates/mp3proto/Script/Cable.xml index 0e499728..24dcd67e 100644 --- a/templates/mp3proto/Script/Cable.xml +++ b/templates/mp3proto/Script/Cable.xml @@ -6,7 +6,7 @@ - + 0xD6629DCA diff --git a/templates/mp3proto/Script/CameraFilterKeyframe.xml b/templates/mp3proto/Script/CameraFilterKeyframe.xml index df3e7de7..e7e02e4b 100644 --- a/templates/mp3proto/Script/CameraFilterKeyframe.xml +++ b/templates/mp3proto/Script/CameraFilterKeyframe.xml @@ -24,7 +24,7 @@ 0.0 - + diff --git a/templates/mp3proto/Script/CameraShaker.xml b/templates/mp3proto/Script/CameraShaker.xml index a0e2f912..272ccb49 100644 --- a/templates/mp3proto/Script/CameraShaker.xml +++ b/templates/mp3proto/Script/CameraShaker.xml @@ -14,7 +14,7 @@ 1.0 - + diff --git a/templates/mp3proto/Script/CannonBall.xml b/templates/mp3proto/Script/CannonBall.xml index 444bae98..0ed4946e 100644 --- a/templates/mp3proto/Script/CannonBall.xml +++ b/templates/mp3proto/Script/CannonBall.xml @@ -3,7 +3,7 @@ CannonBall - + diff --git a/templates/mp3proto/Script/DarkSamus.xml b/templates/mp3proto/Script/DarkSamus.xml index 6f933769..b896c5fa 100644 --- a/templates/mp3proto/Script/DarkSamus.xml +++ b/templates/mp3proto/Script/DarkSamus.xml @@ -22,11 +22,11 @@ -1.0 - - + + - - + + diff --git a/templates/mp3proto/Script/Debris.xml b/templates/mp3proto/Script/Debris.xml index 141568ff..d630c357 100644 --- a/templates/mp3proto/Script/Debris.xml +++ b/templates/mp3proto/Script/Debris.xml @@ -81,11 +81,11 @@ 1.0 - + 0.0, 0.0, 0.0 - + 1 @@ -110,7 +110,7 @@ 0.1 - + 1.0, 1.0, 1.0 @@ -124,7 +124,7 @@ true - + 1.0, 1.0, 1.0 diff --git a/templates/mp3proto/Script/DefenseMechanoid.xml b/templates/mp3proto/Script/DefenseMechanoid.xml index 05013467..1e79dc61 100644 --- a/templates/mp3proto/Script/DefenseMechanoid.xml +++ b/templates/mp3proto/Script/DefenseMechanoid.xml @@ -23,8 +23,8 @@ true - - + + 100.0 @@ -35,14 +35,14 @@ 5.0 - + 100.0 - - - + + + 30.0 @@ -92,10 +92,10 @@ 10.0 - + - + 25.0 diff --git a/templates/mp3proto/Script/DestructibleBarrier.xml b/templates/mp3proto/Script/DestructibleBarrier.xml index dc731202..46dbc73f 100644 --- a/templates/mp3proto/Script/DestructibleBarrier.xml +++ b/templates/mp3proto/Script/DestructibleBarrier.xml @@ -15,33 +15,33 @@ 1.5, 0.2, 1.0 - - - - - - - + + + + + + + 4 - + 4 - + 1 - + 1 - - - - - + + + + + 50.0 diff --git a/templates/mp3proto/Script/Door.xml b/templates/mp3proto/Script/Door.xml index 1ee02c64..a651074f 100644 --- a/templates/mp3proto/Script/Door.xml +++ b/templates/mp3proto/Script/Door.xml @@ -21,12 +21,12 @@ true - - + + 0.0, 1.0, 1.0, 1.0 - + 0.0, 0.0, 0.0 diff --git a/templates/mp3proto/Script/Effect.xml b/templates/mp3proto/Script/Effect.xml index 27c2ce17..1e39e1ca 100644 --- a/templates/mp3proto/Script/Effect.xml +++ b/templates/mp3proto/Script/Effect.xml @@ -3,7 +3,7 @@ Effect - + true diff --git a/templates/mp3proto/Script/EffectRepulsor.xml b/templates/mp3proto/Script/EffectRepulsor.xml index 358f14bf..289a5801 100644 --- a/templates/mp3proto/Script/EffectRepulsor.xml +++ b/templates/mp3proto/Script/EffectRepulsor.xml @@ -6,7 +6,7 @@ 0xFB73F2B8 - + 0.1 diff --git a/templates/mp3proto/Script/ElectroMagneticPulse.xml b/templates/mp3proto/Script/ElectroMagneticPulse.xml index 2464140d..e4c48013 100644 --- a/templates/mp3proto/Script/ElectroMagneticPulse.xml +++ b/templates/mp3proto/Script/ElectroMagneticPulse.xml @@ -30,7 +30,7 @@ 0.8 - + diff --git a/templates/mp3proto/Script/EyePod.xml b/templates/mp3proto/Script/EyePod.xml index ac0fbdc3..bf330334 100644 --- a/templates/mp3proto/Script/EyePod.xml +++ b/templates/mp3proto/Script/EyePod.xml @@ -81,8 +81,8 @@ 7.0 - - + + diff --git a/templates/mp3proto/Script/FishCloud.xml b/templates/mp3proto/Script/FishCloud.xml index da28840e..3ba109fa 100644 --- a/templates/mp3proto/Script/FishCloud.xml +++ b/templates/mp3proto/Script/FishCloud.xml @@ -3,7 +3,7 @@ FishCloud - + 20 @@ -74,23 +74,23 @@ 0.0 - + 0 - + 0 - + 0 - + 0 - + true @@ -111,7 +111,7 @@ 2.0 - + 0 diff --git a/templates/mp3proto/Script/FlyingPirate.xml b/templates/mp3proto/Script/FlyingPirate.xml index 089710eb..67891e6a 100644 --- a/templates/mp3proto/Script/FlyingPirate.xml +++ b/templates/mp3proto/Script/FlyingPirate.xml @@ -40,8 +40,8 @@ 0 - - + + 15.0 @@ -80,9 +80,9 @@ - + - + 50.0 @@ -99,8 +99,8 @@ - - + + 10.0 @@ -136,15 +136,15 @@ - - - - - - - - - + + + + + + + + + @@ -155,9 +155,9 @@ 5.0 - - - + + + diff --git a/templates/mp3proto/Script/FrontEndDataNetwork.xml b/templates/mp3proto/Script/FrontEndDataNetwork.xml index a298f6e4..8bc4048c 100644 --- a/templates/mp3proto/Script/FrontEndDataNetwork.xml +++ b/templates/mp3proto/Script/FrontEndDataNetwork.xml @@ -30,9 +30,9 @@ 8.0 - - - + + + 1.0, 1.0, 1.0, 1.0 diff --git a/templates/mp3proto/Script/GragnolFlyer.xml b/templates/mp3proto/Script/GragnolFlyer.xml index 76500a81..4c5d685b 100644 --- a/templates/mp3proto/Script/GragnolFlyer.xml +++ b/templates/mp3proto/Script/GragnolFlyer.xml @@ -41,8 +41,8 @@ 120.0 - - + + -1.0 diff --git a/templates/mp3proto/Script/GuiMenu.xml b/templates/mp3proto/Script/GuiMenu.xml index 00e09db6..bb77093f 100644 --- a/templates/mp3proto/Script/GuiMenu.xml +++ b/templates/mp3proto/Script/GuiMenu.xml @@ -16,7 +16,7 @@ true - + diff --git a/templates/mp3proto/Script/GuiScreen.xml b/templates/mp3proto/Script/GuiScreen.xml index 0e93630a..b21f6628 100644 --- a/templates/mp3proto/Script/GuiScreen.xml +++ b/templates/mp3proto/Script/GuiScreen.xml @@ -6,7 +6,7 @@ 0 - + diff --git a/templates/mp3proto/Script/GuiSlider.xml b/templates/mp3proto/Script/GuiSlider.xml index f829a5ce..f200aef6 100644 --- a/templates/mp3proto/Script/GuiSlider.xml +++ b/templates/mp3proto/Script/GuiSlider.xml @@ -22,7 +22,7 @@ 1.0 - + 127 diff --git a/templates/mp3proto/Script/GunTurretBase.xml b/templates/mp3proto/Script/GunTurretBase.xml index e8d3ffb6..e66cbd9c 100644 --- a/templates/mp3proto/Script/GunTurretBase.xml +++ b/templates/mp3proto/Script/GunTurretBase.xml @@ -26,7 +26,7 @@ 10.0 - + diff --git a/templates/mp3proto/Script/GunTurretTop.xml b/templates/mp3proto/Script/GunTurretTop.xml index baaad9a3..7dd0c391 100644 --- a/templates/mp3proto/Script/GunTurretTop.xml +++ b/templates/mp3proto/Script/GunTurretTop.xml @@ -32,8 +32,8 @@ 5 - - + + 10.0 @@ -45,7 +45,7 @@ 1.0 - + diff --git a/templates/mp3proto/Script/HUDHint.xml b/templates/mp3proto/Script/HUDHint.xml index 89e17aa5..a9fb4140 100644 --- a/templates/mp3proto/Script/HUDHint.xml +++ b/templates/mp3proto/Script/HUDHint.xml @@ -3,7 +3,7 @@ HUDHint - + 15.0 diff --git a/templates/mp3proto/Script/HUDMemo.xml b/templates/mp3proto/Script/HUDMemo.xml index 016da4c9..bce2a57e 100644 --- a/templates/mp3proto/Script/HUDMemo.xml +++ b/templates/mp3proto/Script/HUDMemo.xml @@ -30,7 +30,7 @@ 0 - + diff --git a/templates/mp3proto/Script/Korakk.xml b/templates/mp3proto/Script/Korakk.xml index 5ec4f673..4ca64ad8 100644 --- a/templates/mp3proto/Script/Korakk.xml +++ b/templates/mp3proto/Script/Korakk.xml @@ -10,26 +10,26 @@ - + - - - - - + + + + + 25.0 - - - - - + + + + + diff --git a/templates/mp3proto/Script/MysteryFlyer.xml b/templates/mp3proto/Script/MysteryFlyer.xml index 76b55f40..77780012 100644 --- a/templates/mp3proto/Script/MysteryFlyer.xml +++ b/templates/mp3proto/Script/MysteryFlyer.xml @@ -17,7 +17,7 @@ - + diff --git a/templates/mp3proto/Script/OptionalAreaAsset.xml b/templates/mp3proto/Script/OptionalAreaAsset.xml index 0a9944b6..0423f572 100644 --- a/templates/mp3proto/Script/OptionalAreaAsset.xml +++ b/templates/mp3proto/Script/OptionalAreaAsset.xml @@ -10,7 +10,7 @@ - + diff --git a/templates/mp3proto/Script/PTCNoseTurret.xml b/templates/mp3proto/Script/PTCNoseTurret.xml index 1165c575..1389efc3 100644 --- a/templates/mp3proto/Script/PTCNoseTurret.xml +++ b/templates/mp3proto/Script/PTCNoseTurret.xml @@ -44,7 +44,7 @@ -45.0 - + 1.0 @@ -58,7 +58,7 @@ 2 - + false diff --git a/templates/mp3proto/Script/PhazonPuddle.xml b/templates/mp3proto/Script/PhazonPuddle.xml index 20de35fb..f4423109 100644 --- a/templates/mp3proto/Script/PhazonPuddle.xml +++ b/templates/mp3proto/Script/PhazonPuddle.xml @@ -6,7 +6,7 @@ - + @@ -79,26 +79,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/templates/mp3proto/Script/PhysicsDebris.xml b/templates/mp3proto/Script/PhysicsDebris.xml index eaee7509..8bd5f964 100644 --- a/templates/mp3proto/Script/PhysicsDebris.xml +++ b/templates/mp3proto/Script/PhysicsDebris.xml @@ -75,8 +75,8 @@ 1.0 - - + + 1 @@ -101,7 +101,7 @@ 0.1 - + 1.0, 1.0, 1.0 @@ -115,7 +115,7 @@ true - + 1.0, 1.0, 1.0 diff --git a/templates/mp3proto/Script/Pickup.xml b/templates/mp3proto/Script/Pickup.xml index aa58b129..a905e4b6 100644 --- a/templates/mp3proto/Script/Pickup.xml +++ b/templates/mp3proto/Script/Pickup.xml @@ -33,13 +33,13 @@ 0.0 - + 0.0 - + false diff --git a/templates/mp3proto/Script/PirateDrone.xml b/templates/mp3proto/Script/PirateDrone.xml index 4fa5b820..37435e44 100644 --- a/templates/mp3proto/Script/PirateDrone.xml +++ b/templates/mp3proto/Script/PirateDrone.xml @@ -134,7 +134,7 @@ 50.0 - + diff --git a/templates/mp3proto/Script/Platform.xml b/templates/mp3proto/Script/Platform.xml index 042a7b61..67c4f2ce 100644 --- a/templates/mp3proto/Script/Platform.xml +++ b/templates/mp3proto/Script/Platform.xml @@ -9,10 +9,10 @@ 0.0, 0.0, 0.0 - + - + diff --git a/templates/mp3proto/Script/PlayerActor.xml b/templates/mp3proto/Script/PlayerActor.xml index 31205cde..db42b6c1 100644 --- a/templates/mp3proto/Script/PlayerActor.xml +++ b/templates/mp3proto/Script/PlayerActor.xml @@ -17,7 +17,7 @@ - + diff --git a/templates/mp3proto/Script/PlayerController.xml b/templates/mp3proto/Script/PlayerController.xml index 4d84b58b..cb4d181f 100644 --- a/templates/mp3proto/Script/PlayerController.xml +++ b/templates/mp3proto/Script/PlayerController.xml @@ -16,7 +16,7 @@ 0 - + diff --git a/templates/mp3proto/Script/PlayerTurret.xml b/templates/mp3proto/Script/PlayerTurret.xml index 8c877d04..10131f4f 100644 --- a/templates/mp3proto/Script/PlayerTurret.xml +++ b/templates/mp3proto/Script/PlayerTurret.xml @@ -31,13 +31,13 @@ 1.0 - - - - - - - + + + + + + + diff --git a/templates/mp3proto/Script/ReptilicusHunter.xml b/templates/mp3proto/Script/ReptilicusHunter.xml index acd98337..f0071ca2 100644 --- a/templates/mp3proto/Script/ReptilicusHunter.xml +++ b/templates/mp3proto/Script/ReptilicusHunter.xml @@ -25,8 +25,8 @@ 0.25 - - + + 0.0 @@ -51,7 +51,7 @@ 5.0 - + 1.0 @@ -70,18 +70,18 @@ 15.0 - + - - - - - - - + + + + + + + 50.0 @@ -95,7 +95,7 @@ 0.5 - + 1.0 diff --git a/templates/mp3proto/Script/Ridley1.xml b/templates/mp3proto/Script/Ridley1.xml index 4489d92c..0e901dca 100644 --- a/templates/mp3proto/Script/Ridley1.xml +++ b/templates/mp3proto/Script/Ridley1.xml @@ -5,14 +5,14 @@ - - - - + + + + - + 100.0 @@ -40,17 +40,17 @@ 15.0 - - + + - + - + 8.0 - - + + diff --git a/templates/mp3proto/Script/Rundas.xml b/templates/mp3proto/Script/Rundas.xml index a62bf5fa..3581beca 100644 --- a/templates/mp3proto/Script/Rundas.xml +++ b/templates/mp3proto/Script/Rundas.xml @@ -14,27 +14,27 @@ 4.0 - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + 6.0 @@ -52,12 +52,12 @@ 13.0 - + - - + + - + 35.0 @@ -70,13 +70,13 @@ 25.0 - - - - - - - + + + + + + + 25.0 diff --git a/templates/mp3proto/Script/SeedBoss1.xml b/templates/mp3proto/Script/SeedBoss1.xml index d6aef1db..098dc4ee 100644 --- a/templates/mp3proto/Script/SeedBoss1.xml +++ b/templates/mp3proto/Script/SeedBoss1.xml @@ -12,30 +12,30 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - + + @@ -52,9 +52,9 @@ - + - + 20.0 @@ -91,21 +91,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/templates/mp3proto/Script/SeedBoss1Orb.xml b/templates/mp3proto/Script/SeedBoss1Orb.xml index 5206fff4..5e2d3eda 100644 --- a/templates/mp3proto/Script/SeedBoss1Orb.xml +++ b/templates/mp3proto/Script/SeedBoss1Orb.xml @@ -16,7 +16,7 @@ true - + 0.0 diff --git a/templates/mp3proto/Script/Ship.xml b/templates/mp3proto/Script/Ship.xml index fdd215b0..3f36419f 100644 --- a/templates/mp3proto/Script/Ship.xml +++ b/templates/mp3proto/Script/Ship.xml @@ -20,7 +20,7 @@ false - + @@ -37,7 +37,7 @@ - + 0.5 @@ -47,9 +47,9 @@ true - - - + + + true diff --git a/templates/mp3proto/Script/ShipCommandIcon.xml b/templates/mp3proto/Script/ShipCommandIcon.xml index 302800ed..61bba7d2 100644 --- a/templates/mp3proto/Script/ShipCommandIcon.xml +++ b/templates/mp3proto/Script/ShipCommandIcon.xml @@ -9,9 +9,9 @@ 0 - - - + + + 0xFB73F2B8 diff --git a/templates/mp3proto/Script/Sound.xml b/templates/mp3proto/Script/Sound.xml index ece8d703..d9a5ae7d 100644 --- a/templates/mp3proto/Script/Sound.xml +++ b/templates/mp3proto/Script/Sound.xml @@ -3,7 +3,7 @@ Sound - + 2.0 diff --git a/templates/mp3proto/Script/SpacePirate.xml b/templates/mp3proto/Script/SpacePirate.xml index 0729debf..5c97485d 100644 --- a/templates/mp3proto/Script/SpacePirate.xml +++ b/templates/mp3proto/Script/SpacePirate.xml @@ -168,9 +168,9 @@ 2.0 - - - + + + 10000 @@ -208,15 +208,15 @@ false - - - - - - - - - + + + + + + + + + diff --git a/templates/mp3proto/Script/SpecialFunction.xml b/templates/mp3proto/Script/SpecialFunction.xml index 932df8ed..8502a523 100644 --- a/templates/mp3proto/Script/SpecialFunction.xml +++ b/templates/mp3proto/Script/SpecialFunction.xml @@ -101,9 +101,9 @@ 0xFB73F2B8 - - - + + + diff --git a/templates/mp3proto/Script/Spinner.xml b/templates/mp3proto/Script/Spinner.xml index b838c83b..f5c0090e 100644 --- a/templates/mp3proto/Script/Spinner.xml +++ b/templates/mp3proto/Script/Spinner.xml @@ -27,9 +27,9 @@ true - - - + + + diff --git a/templates/mp3proto/Script/Steam.xml b/templates/mp3proto/Script/Steam.xml index f14e7ed9..2cbb25c8 100644 --- a/templates/mp3proto/Script/Steam.xml +++ b/templates/mp3proto/Script/Steam.xml @@ -4,7 +4,7 @@ - + 0.35 diff --git a/templates/mp3proto/Script/Subtitles.xml b/templates/mp3proto/Script/Subtitles.xml index c8c24340..e57e1c4e 100644 --- a/templates/mp3proto/Script/Subtitles.xml +++ b/templates/mp3proto/Script/Subtitles.xml @@ -41,7 +41,7 @@ 100 - + 0 diff --git a/templates/mp3proto/Script/SwarmBot.xml b/templates/mp3proto/Script/SwarmBot.xml index a1e3b08c..9da98414 100644 --- a/templates/mp3proto/Script/SwarmBot.xml +++ b/templates/mp3proto/Script/SwarmBot.xml @@ -22,10 +22,10 @@ 10.0 - - - - + + + + true @@ -37,29 +37,29 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/templates/mp3proto/Script/TextPane.xml b/templates/mp3proto/Script/TextPane.xml index 628fde7b..ddfadd24 100644 --- a/templates/mp3proto/Script/TextPane.xml +++ b/templates/mp3proto/Script/TextPane.xml @@ -27,7 +27,7 @@ 0.0, 0.0, 0.0 - + 1 diff --git a/templates/mp3proto/Script/VisorGoo.xml b/templates/mp3proto/Script/VisorGoo.xml index 8067dfd8..d80cc7dc 100644 --- a/templates/mp3proto/Script/VisorGoo.xml +++ b/templates/mp3proto/Script/VisorGoo.xml @@ -3,8 +3,8 @@ VisorGoo - - + + 1.0 @@ -20,7 +20,7 @@ 1.0, 1.0, 1.0, 1.0 - + false diff --git a/templates/mp3proto/Script/Water.xml b/templates/mp3proto/Script/Water.xml index 7e4bded3..e9a84f05 100644 --- a/templates/mp3proto/Script/Water.xml +++ b/templates/mp3proto/Script/Water.xml @@ -38,13 +38,13 @@ 0.0, 0.498039, 1.0, 1.0 - - - - - - - + + + + + + + 0.25 @@ -65,16 +65,16 @@ 1.0, 1.0, 1.0, 1.0 - - - - - - - - - - + + + + + + + + + + 1.0, 1.0, 1.0, 1.0 @@ -120,7 +120,7 @@ 1.0 - + false diff --git a/templates/mp3proto/Script/WeaponGenerator.xml b/templates/mp3proto/Script/WeaponGenerator.xml index 308dad5e..51ed8aa5 100644 --- a/templates/mp3proto/Script/WeaponGenerator.xml +++ b/templates/mp3proto/Script/WeaponGenerator.xml @@ -6,8 +6,8 @@ - - + + 0x9EFB69B1 diff --git a/templates/mp3proto/Script/WorldTeleporter.xml b/templates/mp3proto/Script/WorldTeleporter.xml index aa0f799f..9453a9e0 100644 --- a/templates/mp3proto/Script/WorldTeleporter.xml +++ b/templates/mp3proto/Script/WorldTeleporter.xml @@ -3,24 +3,24 @@ WorldTeleporter - - + + 1.0, 1.0, 1.0 - + 1.0, 1.0, 1.0 - + 1.0, 1.0, 1.0 true - + 1.0 @@ -30,8 +30,8 @@ false - - + + false diff --git a/templates/mp3proto/Structs/ActorParameters.xml b/templates/mp3proto/Structs/ActorParameters.xml index 88e4097f..7c14f398 100644 --- a/templates/mp3proto/Structs/ActorParameters.xml +++ b/templates/mp3proto/Structs/ActorParameters.xml @@ -3,10 +3,10 @@ - - - - + + + + true diff --git a/templates/mp3proto/Structs/ElectricBeamInfo.xml b/templates/mp3proto/Structs/ElectricBeamInfo.xml index 10ca7d3c..038fdcf0 100644 --- a/templates/mp3proto/Structs/ElectricBeamInfo.xml +++ b/templates/mp3proto/Structs/ElectricBeamInfo.xml @@ -1,10 +1,10 @@ - - - - + + + + 1.0 @@ -18,7 +18,7 @@ 150.0 - + 1.0 diff --git a/templates/mp3proto/Structs/FlareDef.xml b/templates/mp3proto/Structs/FlareDef.xml index fc307a08..b5ca88af 100644 --- a/templates/mp3proto/Structs/FlareDef.xml +++ b/templates/mp3proto/Structs/FlareDef.xml @@ -1,7 +1,7 @@ - + 0.0 diff --git a/templates/mp3proto/Structs/FriendlyData.xml b/templates/mp3proto/Structs/FriendlyData.xml index 8526c0fa..725e25bd 100644 --- a/templates/mp3proto/Structs/FriendlyData.xml +++ b/templates/mp3proto/Structs/FriendlyData.xml @@ -36,8 +36,8 @@ 10.0 - - + + @@ -47,8 +47,8 @@ - - + + 10.0 diff --git a/templates/mp3proto/Structs/LaunchProjectileData.xml b/templates/mp3proto/Structs/LaunchProjectileData.xml index 7ab8cc47..1d7160ab 100644 --- a/templates/mp3proto/Structs/LaunchProjectileData.xml +++ b/templates/mp3proto/Structs/LaunchProjectileData.xml @@ -1,7 +1,7 @@ - + 1.0, 1.0, 1.0 @@ -9,7 +9,7 @@ 1.0 - - + + diff --git a/templates/mp3proto/Structs/LayerSwitch.xml b/templates/mp3proto/Structs/LayerSwitch.xml index eb9604f2..56237535 100644 --- a/templates/mp3proto/Structs/LayerSwitch.xml +++ b/templates/mp3proto/Structs/LayerSwitch.xml @@ -1,7 +1,7 @@ - + 0 diff --git a/templates/mp3proto/Structs/PatternedAITypedef.xml b/templates/mp3proto/Structs/PatternedAITypedef.xml index 2a28dd6c..f63a2364 100644 --- a/templates/mp3proto/Structs/PatternedAITypedef.xml +++ b/templates/mp3proto/Structs/PatternedAITypedef.xml @@ -23,14 +23,14 @@ 0.1 - + 0 5.0 - + 0 @@ -79,27 +79,27 @@ 2.0 - + 1000.0 0.0 - + 0.0, 0.0, 0.0 - - + + 1000.0 - - + + 0.0, 0.0, 0.0 - + diff --git a/templates/mp3proto/Structs/PlasmaBeamInfo.xml b/templates/mp3proto/Structs/PlasmaBeamInfo.xml index 451b9b60..081aa8a5 100644 --- a/templates/mp3proto/Structs/PlasmaBeamInfo.xml +++ b/templates/mp3proto/Structs/PlasmaBeamInfo.xml @@ -4,11 +4,11 @@ 0 - - - - - + + + + + 10.0 @@ -42,6 +42,6 @@ 0.0, 0.0, 0.0, 0.0 - + diff --git a/templates/mp3proto/Structs/RagDollData.xml b/templates/mp3proto/Structs/RagDollData.xml index f3478eb3..fdcd7fb3 100644 --- a/templates/mp3proto/Structs/RagDollData.xml +++ b/templates/mp3proto/Structs/RagDollData.xml @@ -34,7 +34,7 @@ 5.0 - + false diff --git a/templates/mp3proto/Structs/ScannableParameters.xml b/templates/mp3proto/Structs/ScannableParameters.xml index e2208d24..d6cdf47b 100644 --- a/templates/mp3proto/Structs/ScannableParameters.xml +++ b/templates/mp3proto/Structs/ScannableParameters.xml @@ -1,6 +1,6 @@ - + diff --git a/templates/mp3proto/Structs/ShockWaveInfo.xml b/templates/mp3proto/Structs/ShockWaveInfo.xml index 0e63e16d..6868aaac 100644 --- a/templates/mp3proto/Structs/ShockWaveInfo.xml +++ b/templates/mp3proto/Structs/ShockWaveInfo.xml @@ -1,7 +1,7 @@ - + 0.0 @@ -18,7 +18,7 @@ 0.0 - - + + diff --git a/templates/mp3proto/Structs/SpacePirateWeaponData.xml b/templates/mp3proto/Structs/SpacePirateWeaponData.xml index cf3d1d84..de7546dd 100644 --- a/templates/mp3proto/Structs/SpacePirateWeaponData.xml +++ b/templates/mp3proto/Structs/SpacePirateWeaponData.xml @@ -19,7 +19,7 @@ true - + 15.0 @@ -27,9 +27,9 @@ 50.0 - - - + + + 25.0 @@ -54,8 +54,8 @@ 2 - - + + 8.0 @@ -68,16 +68,16 @@ 0.0 - - + + 0.0, 0.0, 1.0, 1.0 1.0, 0.0, 0.0, 1.0 - - + + 0.0 diff --git a/templates/mp3proto/Structs/SwarmBasicsData.xml b/templates/mp3proto/Structs/SwarmBasicsData.xml index 8b54963d..cda25893 100644 --- a/templates/mp3proto/Structs/SwarmBasicsData.xml +++ b/templates/mp3proto/Structs/SwarmBasicsData.xml @@ -76,7 +76,7 @@ - + 5 @@ -98,8 +98,8 @@ false - - + + 0.0 diff --git a/templates/mp3proto/Structs/TextProperties.xml b/templates/mp3proto/Structs/TextProperties.xml index 313f4992..5871ee7b 100644 --- a/templates/mp3proto/Structs/TextProperties.xml +++ b/templates/mp3proto/Structs/TextProperties.xml @@ -25,7 +25,7 @@ 1.0, 1.0, 1.0, 1.0 - + 0