diff --git a/Base.rte/Activities/OneManArmy.lua b/Base.rte/Activities/OneManArmy.lua index 557f156a7..387b3f74a 100644 --- a/Base.rte/Activities/OneManArmy.lua +++ b/Base.rte/Activities/OneManArmy.lua @@ -295,9 +295,9 @@ function OneManArmy:UpdateActivity() --Get any Actor from the CPU's native tech local passenger = nil; if math.random() >= self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.CPUTechName)) then - passenger = RandomAHuman("Any", self.CPUTechName); + passenger = RandomAHuman("Actors - Light", self.CPUTechName); else - passenger = RandomACrab("Any", self.CPUTechName); + passenger = RandomACrab("Actors - Mecha", self.CPUTechName); end --Equip it with tools and guns if it's a humanoid if IsAHuman(passenger) then diff --git a/Base.rte/Activities/OneManArmyDiggers.lua b/Base.rte/Activities/OneManArmyDiggers.lua index c8dbe33c1..c2ca10d62 100644 --- a/Base.rte/Activities/OneManArmyDiggers.lua +++ b/Base.rte/Activities/OneManArmyDiggers.lua @@ -251,7 +251,7 @@ function OneManArmy:UpdateActivity() -- Set the ship up with a cargo of a few armed and equipped actors for i = 1, actorsInCargo do -- Get any Actor from the CPU's native tech - local passenger = RandomAHuman("Any", self.CPUTechName); + local passenger = RandomAHuman("Actors - " .. (self.Difficulty > 75 and "Heavy" or "Light"), self.CPUTechName); passenger:AddInventoryItem(CreateHDFirearm("Light Digger", "Base.rte")); -- Set AI mode and team so it knows who and what to fight for! diff --git a/Base.rte/Actors/Brains/Brainbot/Brainbot.ini b/Base.rte/Actors/Brains/Brainbot/Brainbot.ini index 8c2c1152e..86b2cbd3b 100644 --- a/Base.rte/Actors/Brains/Brainbot/Brainbot.ini +++ b/Base.rte/Actors/Brains/Brainbot/Brainbot.ini @@ -349,7 +349,6 @@ AddActor = Arm X = -3 Y = -1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Base.rte/Actors/Brains/Brainbot/HandFG.png MaxLength = 13 @@ -569,7 +568,6 @@ AddActor = AHuman AddToGroup = Actors AddToGroup = Brains GoldValue = 100 - Buyable = 1 Mass = 30 HitsMOs = 1 GetsHitByMOs = 1 @@ -606,11 +604,9 @@ AddActor = AHuman FilePath = Base.rte/Actors/Brains/Case/Sounds/EnergyExplosion.flac DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 + Team = 0 Health = 100 ImpulseDamageThreshold = 2800 - Team = 0 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 100 diff --git a/Base.rte/Actors/Brains/Case/BrainCase.ini b/Base.rte/Actors/Brains/Case/BrainCase.ini index 4870c806f..c22a4183c 100644 --- a/Base.rte/Actors/Brains/Case/BrainCase.ini +++ b/Base.rte/Actors/Brains/Case/BrainCase.ini @@ -13,7 +13,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -3 Y = -4 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -34,7 +34,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -3 Y = -3 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -54,7 +54,6 @@ AddActor = Actor AddToGroup = Brains PinStrength = 500 Mass = 43.54 - RestThreshold = 0 HitsMOs = 0 GetsHitByMOs = 1 SpriteFile = ContentFile @@ -93,16 +92,11 @@ AddActor = Actor GibSound = SoundContainer AddSound = ContentFile FilePath = Base.rte/Actors/Brains/Case/Sounds/BrainPop.flac - Status = 0 - Health = 100 Team = 0 - AimAngle = 0 + Health = 100 AimDistance = 0 Perceptiveness = 0.17 CharHeight = 50 - HolsterOffset = Vector - X = -0 - Y = -0 GibImpulseLimit = 25 GibWoundLimit = 15 AddGib = Gib diff --git a/Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini b/Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini index ccd8b2cfc..df9948815 100644 --- a/Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini +++ b/Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini @@ -131,70 +131,42 @@ AddEffect = MOSRotating Offset = Vector X = -4 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = 3 Y = -1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -3 Y = -5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = 3 Y = 2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = 1 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Metal Grey Small A Offset = Vector X = -2 Y = -3.5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Joint Small C Offset = Vector X = -2 Y = 1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 125 GibWoundLimit = 4 GibSound = SoundContainer @@ -259,60 +231,36 @@ AddEffect = MOSRotating Offset = Vector X = -4 Y = -4 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = 0 Y = 2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -1 Y = 1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -2 Y = -5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Rust Tiny A Offset = Vector X = -2 Y = -1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Metal Grey Small C Offset = Vector X = 2 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 85 GibWoundLimit = 3 GibSound = SoundContainer @@ -363,20 +311,12 @@ AddEffect = Attachable AddGib = Gib GibParticle = MOSRotating CopyOf = Green Dummy Head Gib A - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -6 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Tiny A @@ -390,10 +330,6 @@ AddEffect = Attachable Offset = Vector X = 0.5 Y = 2.5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 300 GibWoundLimit = 3 GibSound = SoundContainer @@ -434,7 +370,6 @@ AddActor = Arm X = -3.5 Y = -1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Base.rte/Actors/Infantry/GreenDummy/HandFGA.png MaxLength = 12 @@ -448,80 +383,48 @@ AddActor = Arm Offset = Vector X = -3 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = 3 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -2 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -1 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = 5 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Dark Micro A Offset = Vector X = 6 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Dark Micro A Offset = Vector X = 0 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Micro A Offset = Vector X = -4.5 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 50 GibWoundLimit = 2 GibSound = SoundContainer @@ -636,70 +539,42 @@ AddActor = Leg Offset = Vector X = -6 Y = 1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = -5 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = 0 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -7 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -3 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -2 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Pipe Small C Offset = Vector X = 3 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 60 GibWoundLimit = 3 GibSound = SoundContainer @@ -736,7 +611,6 @@ AddActor = AHuman SpriteOffset = Vector X = -4 Y = -16 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Plastic Green Entry ExitWound = AEmitter @@ -762,10 +636,8 @@ AddActor = AHuman CopyOf = Robot Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 2500 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 100 @@ -852,60 +724,36 @@ AddActor = AHuman Offset = Vector X = -2 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Green Dummy Rib Cage Gib B Offset = Vector X = 0 Y = -5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Metal Rusty Small C Offset = Vector X = -3 Y = -6 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = -3 Y = -9 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -1 Y = -1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Micro A Offset = Vector X = -4 Y = -10 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 3000 GibWoundLimit = 5 GibSound = SoundContainer diff --git a/Base.rte/Actors/Mecha/AIBox/AIBox.ini b/Base.rte/Actors/Mecha/AIBox/AIBox.ini index 72ab4dcdb..f32a67ada 100644 --- a/Base.rte/Actors/Mecha/AIBox/AIBox.ini +++ b/Base.rte/Actors/Mecha/AIBox/AIBox.ini @@ -217,10 +217,8 @@ AddActor = ACrab DeviceSwitchSound = SoundContainer CopyOf = Device Switch PassengerSlots = 2 - Status = 0 Health = 100 ImpulseDamageThreshold = 5000 - AimAngle = 0 AimRange = 1.57 AimDistance = 30 Perceptiveness = 0.1 diff --git a/Base.rte/Actors/Mecha/Medic/MedicDrone.ini b/Base.rte/Actors/Mecha/Medic/MedicDrone.ini index 1cb39f526..4ad854505 100644 --- a/Base.rte/Actors/Mecha/Medic/MedicDrone.ini +++ b/Base.rte/Actors/Mecha/Medic/MedicDrone.ini @@ -113,7 +113,7 @@ AddActor = Turret GibImpulseLimit = 4000 GibWoundLimit = 14 // GibSound = SoundContainer -// CopyOf = Bone Crack +// CopyOf = Robot Gib AddActor = Leg @@ -214,10 +214,8 @@ AddActor = ACrab CopyOf = Bone Crack DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 5000 - AimAngle = 0 AimRange = 1.57 AimDistance = 30 Perceptiveness = 0.1 diff --git a/Base.rte/Actors/Wildlife/Crabs/Crabs.ini b/Base.rte/Actors/Wildlife/Crabs/Crabs.ini index 9b27bd4b7..18a61e140 100644 --- a/Base.rte/Actors/Wildlife/Crabs/Crabs.ini +++ b/Base.rte/Actors/Wildlife/Crabs/Crabs.ini @@ -138,7 +138,6 @@ AddEffect = ACrab DeathSound = SoundContainer CopyOf = Bone Crack PassengerSlots = 0 - Status = 0 Health = 100 ImpulseDamageThreshold = 800 Perceptiveness = 0.4 @@ -333,11 +332,11 @@ AddEffect = ACrab GibParticle = MOSRotating CopyOf = Gib Panel Orange Small F Offset = Vector - X = -3.9375 - Y = 0.8125 + X = -4 + Y = 1 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Panel Orange Small B Offset = Vector - X = 3.6875 - Y = 0.8125 \ No newline at end of file + X = 4 + Y = 1 \ No newline at end of file diff --git a/Base.rte/Actors/Wildlife/Jumper/Jumper.ini b/Base.rte/Actors/Wildlife/Jumper/Jumper.ini index 5832785af..944a5cebf 100644 --- a/Base.rte/Actors/Wildlife/Jumper/Jumper.ini +++ b/Base.rte/Actors/Wildlife/Jumper/Jumper.ini @@ -104,7 +104,6 @@ AddEffect = Attachable SpriteOffset = Vector X = -7 Y = -8 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Bone Entry ExitWound = AEmitter @@ -138,7 +137,6 @@ AddEffect = Attachable X = 0.5 Y = -9 Count = 5 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Tiny A @@ -146,7 +144,6 @@ AddEffect = Attachable X = -0.5 Y = -5 Count = 3 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Bone Micro A @@ -191,8 +188,6 @@ AddEffect = Attachable Y = 2 - - AddActor = AHuman PresetName = Jumper AddToGroup = Actors - Wildlife @@ -211,11 +206,8 @@ AddActor = AHuman CopyOf = Bone Crack // DeathSound = SoundContainer // CopyOf = Wildlife Chirp - Status = 0 Health = 100 ImpulseDamageThreshold = 650 - Team = -1 - AimAngle = 0 AimRange = 0.75 AimDistance = 30 Perceptiveness = 0.5 diff --git a/Base.rte/Actors/Wildlife/MegaCrab/MegaCrab.ini b/Base.rte/Actors/Wildlife/MegaCrab/MegaCrab.ini index 674a929ca..a5332d89d 100644 --- a/Base.rte/Actors/Wildlife/MegaCrab/MegaCrab.ini +++ b/Base.rte/Actors/Wildlife/MegaCrab/MegaCrab.ini @@ -135,7 +135,6 @@ AddEffect = ACrab CopyOf = Bone Crack DeathSound = SoundContainer CopyOf = Bone Crack - Status = 0 Health = 100 ImpulseDamageThreshold = 10000 Perceptiveness = 0 diff --git a/Base.rte/Craft/Rockets/MK2/RocketMK2.ini b/Base.rte/Craft/Rockets/MK2/RocketMK2.ini index dcdf8e91d..83b9ff229 100644 --- a/Base.rte/Craft/Rockets/MK2/RocketMK2.ini +++ b/Base.rte/Craft/Rockets/MK2/RocketMK2.ini @@ -519,8 +519,6 @@ AddEffect = AEmitter BurstScale = 1 BurstTriggered = 1 BurstSpacing = 100 - Flash = None - FlashOnlyOnBurst = 0 AddActor = ACRocket @@ -560,11 +558,8 @@ AddActor = ACRocket DeepCheck = 1 BodyHitSound = SoundContainer CopyOf = Metal Body Blunt Hit - Status = 0 Health = 100 ImpulseDamageThreshold = 9000 - Team = 0 - AimAngle = 0 AimDistance = 30 Perceptiveness = 0.3 CharHeight = 150 diff --git a/Base.rte/Craft/StorageCrate/Crate.ini b/Base.rte/Craft/StorageCrate/Crate.ini index f923fbd57..c5cf07e95 100644 --- a/Base.rte/Craft/StorageCrate/Crate.ini +++ b/Base.rte/Craft/StorageCrate/Crate.ini @@ -88,11 +88,8 @@ AddActor = ACRocket DeepCheck = 1 BodyHitSound = SoundContainer CopyOf = Metal Body Blunt Hit - Status = 0 Health = 100 ImpulseDamageThreshold = 20000 - Team = 0 - AimAngle = 0 AimDistance = 30 CharHeight = 60 HolsterOffset = Vector diff --git a/Base.rte/Devices/Explosives/NapalmBomb/NapalmBomb.ini b/Base.rte/Devices/Explosives/NapalmBomb/NapalmBomb.ini index 56e6ed73a..724f1f3b9 100644 --- a/Base.rte/Devices/Explosives/NapalmBomb/NapalmBomb.ini +++ b/Base.rte/Devices/Explosives/NapalmBomb/NapalmBomb.ini @@ -48,7 +48,6 @@ AddEffect = MOSParticle SpriteOffset = Vector X = -8 Y = -8 - AngularVel = 0 Atom = Atom Material = Material CopyOf = Air diff --git a/Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini b/Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini index acd71450b..6c769cf40 100644 --- a/Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini +++ b/Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini @@ -18,14 +18,14 @@ AddAmmo = AEmitter CopyOf = Grenade Fragment Yellow PresetName = Remote Explosive Door Buster LifeTime = 10 - BurstSize = 75 + BurstSize = 50 Spread = 1.57 MaxVelocity = 125 MinVelocity = 100 AddEmission = Emission EmittedParticle = MOPixel CopyOf = Air Blast Short - BurstSize = 75 + BurstSize = 50 Spread = 1.57 MaxVelocity = 125 MinVelocity = 100 @@ -40,10 +40,8 @@ AddAmmo = AEmitter Spread = 0 MaxVelocity = 150 MinVelocity = 150 - ParticlesPerMinute = 0 EmissionEnabled = 1 EmissionsIgnoreThis = 1 - BurstScale = 1 BurstTriggered = 1 @@ -90,7 +88,6 @@ AddDevice = HDFirearm X = -2 Y = -1 DrawAfterParent = 0 - OneHanded = 0 StanceOffset = Vector X = 8 Y = 5 @@ -175,14 +172,14 @@ AddMOSRotating = MOSRotating AddGib = Gib GibParticle = MOPixel CopyOf = Remote Explosive Door Buster - Count = 75 + Count = 50 Spread = 3.14 MaxVelocity = 125 MinVelocity = 100 AddGib = Gib GibParticle = MOPixel CopyOf = Air Blast Short - Count = 75 + Count = 50 Spread = 3.14 MaxVelocity = 125 MinVelocity = 100 @@ -196,7 +193,6 @@ AddMOSRotating = MOSRotating AddGib = Gib GibParticle = MOPixel CopyOf = Air Blast Scripted - Spread = 0 MaxVelocity = 100 MinVelocity = 100 InheritsVel = 0 diff --git a/Base.rte/Devices/Shared.ini b/Base.rte/Devices/Shared.ini index 869b2a3de..0c3b50726 100644 --- a/Base.rte/Devices/Shared.ini +++ b/Base.rte/Devices/Shared.ini @@ -7,8 +7,6 @@ AddEffect = MOPixel Mass = 0.01 LifeTime = 10 Sharpness = 0 - HitsMOs = 0 - GetsHitByMOs = 0 Color = Color R = 255 G = 0 @@ -16,11 +14,6 @@ AddEffect = MOPixel Atom = Atom Material = Material CopyOf = Air - TrailColor = Color - R = 255 - G = 0 - B = 255 - TrailLength = 0 AddAmmo = Round @@ -28,15 +21,12 @@ AddAmmo = Round ParticleCount = 1 Particle = MOPixel CopyOf = Null Bullet - Shell = None FireVelocity = 10 AddAmmo = Magazine PresetName = Null Magazine Mass = 0 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -44,7 +34,6 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Null Round Discardable = 0 @@ -59,8 +48,6 @@ AddAmmo = Magazine AddDevice = HeldDevice PresetName = Null Item Mass = 0 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png Buyable = 0 diff --git a/Base.rte/Devices/Shared/Scripts/RecoilTilt.lua b/Base.rte/Devices/Shared/Scripts/RecoilTilt.lua index d618f9d57..4b939978b 100644 --- a/Base.rte/Devices/Shared/Scripts/RecoilTilt.lua +++ b/Base.rte/Devices/Shared/Scripts/RecoilTilt.lua @@ -21,8 +21,9 @@ function Update(self) local jointOffset = Vector(self.JointOffset.X * self.FlipFactor, self.JointOffset.Y):RadRotate(self.RotAngle); self.Pos = self.Pos - jointOffset + Vector(jointOffset.X, jointOffset.Y):RadRotate(-self.setRecoilAngle * self.FlipFactor); if self.recoilStanceFactor ~= 0 then - local setStanceAngle = self.setRecoilAngle * self.recoilStanceFactor; - self.StanceOffset = Vector(self.origStanceOffset.X, self.origStanceOffset.Y):RadRotate(setStanceAngle); - self.SharpStanceOffset = Vector(self.origSharpStanceOffset.X, self.origSharpStanceOffset.Y):RadRotate(setStanceAngle); + local setStanceAngle = self.setRecoilAngle * self.recoilStanceFactor * 0.5; + local xFactor = 1 + setStanceAngle * 0.5; + self.StanceOffset = Vector(self.origStanceOffset.X/xFactor, self.origStanceOffset.Y):RadRotate(setStanceAngle); + self.SharpStanceOffset = Vector(self.origSharpStanceOffset.X/xFactor, self.origSharpStanceOffset.Y):RadRotate(setStanceAngle); end end \ No newline at end of file diff --git a/Base.rte/Devices/Shields/RiotShield/RiotShield.ini b/Base.rte/Devices/Shields/RiotShield/RiotShield.ini index 374848c53..8e6120dcc 100644 --- a/Base.rte/Devices/Shields/RiotShield/RiotShield.ini +++ b/Base.rte/Devices/Shields/RiotShield/RiotShield.ini @@ -11,7 +11,7 @@ AddEffect = MOSRotating SpriteFile = ContentFile FilePath = Base.rte/Devices/Shields/RiotShield/Gibs/RiotGibA.png FrameCount = 1 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -52,7 +52,7 @@ AddEffect = MOSRotating SpriteFile = ContentFile FilePath = Base.rte/Devices/Shields/RiotShield/Gibs/RiotGibB.png FrameCount = 1 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material diff --git a/Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayer.ini b/Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayer.ini index 3dd2a7aac..091c607be 100644 --- a/Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayer.ini +++ b/Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayer.ini @@ -23,9 +23,7 @@ AddAmmo = Round G = 143 B = 143 TrailLength = 3 - Shell = None FireVelocity = 11 - ShellVelocity = 0 Separation = 8 @@ -50,9 +48,7 @@ AddAmmo = Round G = 115 B = 115 TrailLength = 3 - Shell = None FireVelocity = 11 - ShellVelocity = 0 Separation = 8 @@ -152,7 +148,6 @@ AddDevice = HDFirearm SharpLength = 0 Magazine = Magazine CopyOf = Magazine Concrete Sprayer - Flash = None FireSound = SoundContainer AttenuationStartDistance = 150 AddSound = ContentFile @@ -177,8 +172,6 @@ AddDevice = HDFirearm SharpShakeRange = 0 NoSupportFactor = 2 ParticleSpreadRange = 6 - ShellSpreadRange = 0 - ShellAngVelRange = 0 MuzzleOffset = Vector X = 13 Y = -1 diff --git a/Base.rte/Devices/Tools/Digger/Digger.ini b/Base.rte/Devices/Tools/Digger/Digger.ini index 877f4abf9..b3a7c4f1a 100644 --- a/Base.rte/Devices/Tools/Digger/Digger.ini +++ b/Base.rte/Devices/Tools/Digger/Digger.ini @@ -10,7 +10,7 @@ AddEffect = MOSRotating SpriteFile = ContentFile FilePath = Base.rte/Devices/Tools/Digger/Gibs/DiggerGibA.png FrameCount = 1 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -56,7 +56,6 @@ AddAmmo = Round G = 127 B = 127 TrailLength = 11 - Shell = None FireVelocity = 100 Separation = 12 @@ -87,7 +86,6 @@ AddAmmo = Round G = 255 B = 159 TrailLength = 12 - Shell = None FireVelocity = 95 Separation = 9 @@ -118,7 +116,6 @@ AddAmmo = Round G = 234 B = 234 TrailLength = 13 - Shell = None FireVelocity = 90 Separation = 6 @@ -149,7 +146,6 @@ AddAmmo = Round G = 249 B = 242 TrailLength = 14 - Shell = None FireVelocity = 85 Separation = 3 diff --git a/Base.rte/Devices/Tools/Disarmer/Disarmer.ini b/Base.rte/Devices/Tools/Disarmer/Disarmer.ini index 8720f69c5..d7ea477ca 100644 --- a/Base.rte/Devices/Tools/Disarmer/Disarmer.ini +++ b/Base.rte/Devices/Tools/Disarmer/Disarmer.ini @@ -49,11 +49,8 @@ AddEffect = MOPixel AddEffect = AEmitter PresetName = Disarmer Sound Blip - Mass = 0 PinStrength = 4000 LifeTime = 5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -66,17 +63,12 @@ AddEffect = AEmitter FilePath = Base.rte/Devices/Explosives/RemoteExplosive/Sounds/RemoteExplosiveDetonate.flac BurstTriggered = 1 EmissionEnabled = 1 - Flash = None - FlashOnlyOnBurst = 0 AddEffect = AEmitter PresetName = Disarmer Sound Disarm - Mass = 0 PinStrength = 4000 LifeTime = 5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -89,8 +81,6 @@ AddEffect = AEmitter FilePath = Base.rte/Devices/Explosives/RemoteExplosive/Sounds/RemoteExplosiveActivate.flac BurstTriggered = 1 EmissionEnabled = 1 - Flash = None - FlashOnlyOnBurst = 0 /////////////////////////////////////////////////////////////////////// @@ -100,8 +90,6 @@ AddEffect = AEmitter AddAmmo = Magazine PresetName = Magazine Disarmer Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -109,10 +97,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = -1 - RTTRatio = 0 RegularRound = Round CopyOf = Null Round - TracerRound = None Discardable = 0 diff --git a/Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini b/Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini index 8222bdfbc..16afaa4fd 100644 --- a/Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini +++ b/Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini @@ -16,11 +16,6 @@ AddEffect = MOPixel Atom = Atom Material = Material CopyOf = Military Stuff - TrailColor = Color - R = 255 - G = 0 - B = 255 - TrailLength = 0 AddActor = AtomGroup @@ -43,14 +38,8 @@ AddEffect = AEmitter PinStrength = 1000 Mass = 1 RestThreshold = 500 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png - FrameCount = 1 - SpriteOffset = Vector - X = -1 - Y = -1 AtomGroup = AtomGroup CopyOf = Grapple Gun AtomGroup DeepCheck = 0 @@ -64,8 +53,6 @@ AddEffect = AEmitter LoopSetting = -1 BurstTriggered = 1 EmissionEnabled = 1 - Flash = None - FlashOnlyOnBurst = 0 AddEffect = MOSRotating @@ -88,9 +75,6 @@ AddEffect = MOSRotating AddEffect = MOSRotating PresetName = Grapple Gun Guide Arrow - Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Devices/Tools/GrappleGun/Arrow.png FrameCount = 2 @@ -107,10 +91,7 @@ AddAmmo = Round ParticleCount = 1 Particle = MOSRotating CopyOf = Grapple Gun Claw - Shell = None FireVelocity = 1 - ShellVelocity = 0 - Separation = 0 AddAmmo = Magazine @@ -125,9 +106,6 @@ AddAmmo = Magazine SpriteOffset = Vector X = -2 Y = -7 - ParentOffset = Vector - X = 4 - Y = 0 EntryWound = AEmitter CopyOf = Dent Metal ExitWound = AEmitter @@ -150,13 +128,14 @@ AddAmmo = Magazine JointOffset = Vector X = 0 Y = 0 + ParentOffset = Vector + X = 4 + Y = 0 DrawAfterParent = 0 RoundCount = -1 - RTTRatio = 0 Discardable = 0 RegularRound = Round CopyOf = Round Grapple Gun - TracerRound = None AddDevice = HDFirearm @@ -212,7 +191,6 @@ AddDevice = HDFirearm SharpLength = 200 Magazine = Magazine CopyOf = Magazine Grapple Gun - Flash = None FireSound = SoundContainer AttenuationStartDistance = 145 AddSound = ContentFile @@ -225,8 +203,6 @@ AddDevice = HDFirearm SharpShakeRange = 0 NoSupportFactor = 0 ParticleSpreadRange = 0 - ShellSpreadRange = 0 - ShellAngVelRange = 0 MuzzleOffset = Vector X = 5 Y = 0 diff --git a/Base.rte/Devices/Tools/Repeller/Repeller.ini b/Base.rte/Devices/Tools/Repeller/Repeller.ini index dede1b2f3..44119624d 100644 --- a/Base.rte/Devices/Tools/Repeller/Repeller.ini +++ b/Base.rte/Devices/Tools/Repeller/Repeller.ini @@ -24,9 +24,7 @@ AddAmmo = Round G = 255 B = 255 TrailLength = 2 - Shell = None FireVelocity = 45 - ShellVelocity = 0 Separation = -15 @@ -71,7 +69,6 @@ AddAmmo = Magazine RoundCount = 3000 RegularRound = Round CopyOf = Round Repeller - TracerRound = None /////////////////////////////////////////////////////////////////////// @@ -128,7 +125,6 @@ AddDevice = HDFirearm SharpLength = 0 Magazine = Magazine CopyOf = Magazine Repeller - Flash = None FireSound = SoundContainer AttenuationStartDistance = 160 AddSound = ContentFile @@ -153,8 +149,6 @@ AddDevice = HDFirearm SharpShakeRange = 0 NoSupportFactor = 1.5 ParticleSpreadRange = 150 - ShellSpreadRange = 0 - ShellAngVelRange = 0 MuzzleOffset = Vector X = 9 Y = -1 diff --git a/Base.rte/Devices/Weapons/Shotgun/Shotgun.ini b/Base.rte/Devices/Weapons/Shotgun/Shotgun.ini index a87939099..cab7f9c05 100644 --- a/Base.rte/Devices/Weapons/Shotgun/Shotgun.ini +++ b/Base.rte/Devices/Weapons/Shotgun/Shotgun.ini @@ -14,12 +14,10 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 6 - RTTRatio = 0 RegularRound = Round CopyOf = Round Shotgun PresetName = Round Shotgun Shell = None - TracerRound = None Discardable = 0 diff --git a/Base.rte/Effects.ini b/Base.rte/Effects.ini index 7b3b6effb..873c3e271 100644 --- a/Base.rte/Effects.ini +++ b/Base.rte/Effects.ini @@ -537,7 +537,7 @@ AddEffect = MOPixel PresetName = Smack Particle Mass = 8 Sharpness = 0.2 /// Penetrates Military Stuff at Vel = 60 - LifeTime = 1 + LifeTime = 10 HitsMOs = 1 GetsHitByMOs = 0 WoundDamageMultiplier = 2 diff --git a/Base.rte/Effects/Gibs.ini b/Base.rte/Effects/Gibs.ini index e81ec7796..29da3857d 100644 --- a/Base.rte/Effects/Gibs.ini +++ b/Base.rte/Effects/Gibs.ini @@ -2269,7 +2269,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -4 Y = -4 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -2293,7 +2293,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -6 Y = -3 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -2317,7 +2317,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -5 Y = -3 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -2509,7 +2509,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -3 Y = -3 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -2533,7 +2533,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -3 Y = -3 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -2557,7 +2557,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -3 Y = -3 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -2581,7 +2581,7 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -4 Y = -3 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material diff --git a/Base.rte/Effects/Pyro.ini b/Base.rte/Effects/Pyro.ini index 57b35eb04..71d07e34e 100644 --- a/Base.rte/Effects/Pyro.ini +++ b/Base.rte/Effects/Pyro.ini @@ -402,7 +402,6 @@ AddEffect = MOSParticle SpriteOffset = Vector X = -8 Y = -8 - AngularVel = 0 Atom = Atom Material = Material CopyOf = Air @@ -435,7 +434,6 @@ AddEffect = MOSParticle SpriteOffset = Vector X = -14 Y = -14 - AngularVel = 0 Atom = Atom Material = Material CopyOf = Air @@ -466,7 +464,6 @@ AddEffect = MOSParticle SpriteOffset = Vector X = -18 Y = -18 - AngularVel = 0 Atom = Atom Material = Material CopyOf = Air @@ -856,8 +853,6 @@ AddEffect = AEmitter BurstScale = 2 BurstTriggered = 1 BurstSpacing = 500 - EmissionDamage = 0 - FlashOnlyOnBurst = 0 AddEffect = AEmitter @@ -966,7 +961,6 @@ AddEffect = MOSParticle SpriteOffset = Vector X = -4 Y = -4 - AngularVel = 0 Atom = Atom Material = Material CopyOf = Air Blast @@ -1530,13 +1524,10 @@ AddEffect = AEmitter // FilePath = Base.rte/Sounds/Actors/JetpackEnd.flac EmissionEnabled = 1 EmissionsIgnoreThis = 0 -// ParticlesPerMinute = 6500 BurstSize = 1 BurstScale = 2 BurstTriggered = 1 BurstSpacing = 500 - EmissionDamage = 0 - FlashOnlyOnBurst = 0 AddEffect = AEmitter @@ -1631,9 +1622,6 @@ AddEffect = AEmitter ParticlesPerMinute = 0 BurstScale = 2 BurstTriggered = 1 - BurstSpacing = 500 - EmissionDamage = 0 - FlashOnlyOnBurst = 0 /////////////////////////////////////////////////////////////////////// @@ -1698,7 +1686,6 @@ AddAmmo = AEmitter BurstSize = 1 BurstScale = 1 BurstTriggered = 1 - EmissionDamage = 0 GibImpulseLimit = 0 @@ -1803,5 +1790,4 @@ AddAmmo = AEmitter BurstSize = 1 BurstScale = 1 BurstTriggered = 1 - EmissionDamage = 0 GibImpulseLimit = 0 \ No newline at end of file diff --git a/Base.rte/Effects/Pyro/Flame/Flame.lua b/Base.rte/Effects/Pyro/Flame/Flame.lua index 806842f74..dc291e9e4 100644 --- a/Base.rte/Effects/Pyro/Flame/Flame.lua +++ b/Base.rte/Effects/Pyro/Flame/Flame.lua @@ -42,7 +42,6 @@ function Update(self) self.targetStickAngle = mo.RotAngle; self.stickPos = SceneMan:ShortestDistance(mo.Pos, self.Pos, SceneMan.SceneWrapsX) * 0.8; - self.Pos = mo.Pos + Vector(self.stickPos.X, self.stickPos.Y); end elseif not self.isShort and math.random() < 0.1 then --Spawn another, shorter flame particle occasionally diff --git a/Base.rte/Effects/Wounds.ini b/Base.rte/Effects/Wounds.ini index cba9f7789..3fad38d40 100644 --- a/Base.rte/Effects/Wounds.ini +++ b/Base.rte/Effects/Wounds.ini @@ -915,6 +915,7 @@ AddEffect = AEmitter PresetName = Dent Metal Door BurstSound = SoundContainer CopyOf = Metal Door Impact + BurstDamage = 0.3 AddEffect = AEmitter diff --git a/Base.rte/Materials.ini b/Base.rte/Materials.ini index dec6e6318..bf7747d78 100644 --- a/Base.rte/Materials.ini +++ b/Base.rte/Materials.ini @@ -915,12 +915,11 @@ AddMaterial = Material PresetName = Door Metal Bounce = 0.1 Friction = 0.9 - StructuralIntegrity = 350 + StructuralIntegrity = 300 DensityKGPerVolumeL = 8.5 GibImpulseLimitPerVolumeL = 15 GibWoundLimitPerVolumeL = 0.1 Priority = 10 - SettleMaterial = 182 Color = Color R = 185 G = 195 diff --git a/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Doors/Doors.ini b/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Doors/Doors.ini index 4d54ab63f..6e0497cf7 100644 --- a/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Doors/Doors.ini +++ b/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Doors/Doors.ini @@ -257,6 +257,7 @@ AddEffect = MOSRotating AddEffect = Attachable PresetName = Door Slide Short A PinStrength = 2000 + RestThreshold = 10000 Mass = 163.02 HitsMOs = 1 GetsHitByMOs = 1 @@ -270,7 +271,6 @@ AddEffect = Attachable CopyOf = Dent Metal Door ExitWound = AEmitter CopyOf = Dent Metal Light - AngularVel = 0 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -293,7 +293,7 @@ AddEffect = Attachable Y = 0 DrawAfterParent = 1 GibImpulseLimit = 9000 - GibWoundLimit = 100 + GibWoundLimit = 200 GibSound = SoundContainer CopyOf = Metal Door Gib AddGib = Gib @@ -412,6 +412,7 @@ AddEffect = Attachable AddEffect = Attachable PresetName = Door Rotate Short A PinStrength = 2000 + RestThreshold = 10000 Mass = 245.35 HitsMOs = 1 GetsHitByMOs = 1 @@ -425,7 +426,6 @@ AddEffect = Attachable CopyOf = Dent Metal Door ExitWound = AEmitter CopyOf = Dent Metal Light - AngularVel = 0 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -448,7 +448,7 @@ AddEffect = Attachable Y = 0 DrawAfterParent = 0 GibImpulseLimit = 12000 - GibWoundLimit = 100 + GibWoundLimit = 200 GibSound = SoundContainer CopyOf = Metal Door Gib AddGib = Gib @@ -556,6 +556,7 @@ AddEffect = Attachable AddEffect = Attachable PresetName = Door Slide Long A PinStrength = 3000 + RestThreshold = 10000 Mass = 466.75 HitsMOs = 1 GetsHitByMOs = 1 @@ -569,7 +570,6 @@ AddEffect = Attachable CopyOf = Dent Metal Door ExitWound = AEmitter CopyOf = Dent Metal Light - AngularVel = 0 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -592,7 +592,7 @@ AddEffect = Attachable Y = 0 DrawAfterParent = 0 GibImpulseLimit = 14000 - GibWoundLimit = 200 + GibWoundLimit = 400 GibSound = SoundContainer CopyOf = Metal Door Gib AddGib = Gib @@ -709,6 +709,7 @@ AddEffect = Attachable AddEffect = Attachable PresetName = Door Rotate Long A PinStrength = 3000 + RestThreshold = 10000 Mass = 956.46 HitsMOs = 1 GetsHitByMOs = 1 @@ -718,12 +719,10 @@ AddEffect = Attachable SpriteOffset = Vector X = -46 Y = -7 - AngularVel = 6 EntryWound = AEmitter CopyOf = Dent Metal Door ExitWound = AEmitter CopyOf = Dent Metal Light - AngularVel = 0 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -746,7 +745,7 @@ AddEffect = Attachable Y = 0 DrawAfterParent = 0 GibImpulseLimit = 18000 - GibWoundLimit = 200 + GibWoundLimit = 400 GibSound = SoundContainer CopyOf = Metal Door Gib AddGib = Gib @@ -908,7 +907,6 @@ AddEffect = ADoor SpriteOffset = Vector X = -16 Y = -7 - AngularVel = 6 EntryWound = AEmitter CopyOf = Leaking Machinery ExitWound = AEmitter @@ -1028,9 +1026,7 @@ AddActor = ADoor PinStrength = 10000 SpriteAnimMode = 5 SpriteAnimDuration = 250 - Status = 0 Health = 100 - Team = 0 HUDVisible = 0 Perceptiveness = 0 CharHeight = 40 @@ -1064,7 +1060,6 @@ AddActor = ADoor PinStrength = 10000 SpriteAnimMode = 5 SpriteAnimDuration = 250 - Status = 0 Health = 100 HUDVisible = 0 Perceptiveness = 0 @@ -1101,9 +1096,7 @@ AddActor = ADoor PinStrength = 10000 SpriteAnimMode = 5 SpriteAnimDuration = 250 - Status = 0 Health = 100 - Team = 0 HUDVisible = 0 Perceptiveness = 0 Rotation = Matrix @@ -1138,9 +1131,7 @@ AddActor = ADoor PinStrength = 10000 SpriteAnimMode = 5 SpriteAnimDuration = 250 - Status = 0 Health = 100 - Team = 0 HUDVisible = 0 Perceptiveness = 0 Rotation = Matrix @@ -1174,9 +1165,7 @@ AddActor = ADoor PinStrength = 10000 SpriteAnimMode = 5 SpriteAnimDuration = 250 - Status = 0 Health = 100 - Team = 0 HUDVisible = 0 Perceptiveness = 0 Door = Attachable diff --git a/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Teleporters/Teleporters.ini b/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Teleporters/Teleporters.ini index 6e2095e89..3e75e7e6a 100644 --- a/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Teleporters/Teleporters.ini +++ b/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Teleporters/Teleporters.ini @@ -43,8 +43,6 @@ AddEffect = AEmitter Mass = 0 PinStrength = 4000 LifeTime = 500 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -56,8 +54,6 @@ AddEffect = AEmitter FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Teleporters/Sounds/Teleport.flac BurstTriggered = 1 EmissionEnabled = 1 - Flash = None - FlashOnlyOnBurst = 0 AddEffect = AEmitter @@ -65,8 +61,6 @@ AddEffect = AEmitter Mass = 0 PinStrength = 4000 LifeTime = 500 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -78,8 +72,6 @@ AddEffect = AEmitter FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Teleporters/Sounds/Teleport.flac BurstTriggered = 1 EmissionEnabled = 1 - Flash = None - FlashOnlyOnBurst = 0 AddActor = AEmitter @@ -101,7 +93,6 @@ AddActor = AEmitter SpriteOffset = Vector X = -24 Y = -24 - HFlipped = 0 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -136,7 +127,6 @@ AddActor = AEmitter SpriteOffset = Vector X = -24 Y = -24 - HFlipped = 0 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material diff --git a/Base.rte/Scripts/Shared/SmokeTrail.lua b/Base.rte/Scripts/Shared/SmokeTrail.lua index 5d851684c..52fe8690e 100644 --- a/Base.rte/Scripts/Shared/SmokeTrail.lua +++ b/Base.rte/Scripts/Shared/SmokeTrail.lua @@ -1,18 +1,30 @@ function Create(self) self.smokeTrailLifeTime = self:NumberValueExists("SmokeTrailLifeTime") and self:GetNumberValue("SmokeTrailLifeTime") or 150; self.smokeTrailRadius = self:NumberValueExists("SmokeTrailRadius") and self:GetNumberValue("SmokeTrailRadius") or ToMOSprite(self):GetSpriteHeight() * 0.5; + self.smokeTrailTwirl = self:NumberValueExists("SmokeTrailTwirl") and self:GetNumberValue("SmokeTrailTwirl") or 0; + self.smokeTwirlCounter = math.random() < 0.5 and math.pi or 0; end function Update(self) local effect; local offset = self.Vel * rte.PxTravelledPerFrame; --The effect will be created the next frame so move it one frame backwards towards the barrel - local trailLength = math.floor(offset.Magnitude + 0.5); - for i = 1, trailLength, 6 do - effect = CreateMOSParticle("Tiny Smoke Trail 1", "Base.rte"); + local trailLength = math.floor(offset.Magnitude * 0.5 - 1); + for i = 1, trailLength do + local effect = CreateMOSParticle("Tiny Smoke Trail 1", "Base.rte"); if effect then - effect.Pos = self.Pos - offset * (i/trailLength) + Vector(RangeRand(-1, 1), RangeRand(-1, 1)) * self.smokeTrailRadius; - effect.Vel = self.Vel * RangeRand(0.75, 1.0); - effect.Lifetime = self.smokeTrailLifeTime * RangeRand(1.0, 1.5); + effect.Pos = self.Pos - (offset * i/trailLength) + Vector(RangeRand(-1, 1), RangeRand(-1, 1)) * self.smokeTrailRadius; + effect.Vel = self.Vel * RangeRand(0.75, 1); + effect.Lifetime = self.smokeTrailLifeTime * RangeRand(0.5, 1); + + if self.smokeTrailTwirl > 0 then + effect.AirResistance = effect.AirResistance * RangeRand(0.9, 1); + effect.GlobalAccScalar = effect.GlobalAccScalar * math.random(); + + effect.Pos = self.Pos - offset + (offset * i/trailLength); + effect.Vel = self.Vel + Vector(0, math.sin(self.smokeTwirlCounter) * self.smokeTrailTwirl + RangeRand(-0.1, 0.1)):RadRotate(self.Vel.AbsRadAngle); + + self.smokeTwirlCounter = self.smokeTwirlCounter + RangeRand(-0.2, 0.4); + end MovableMan:AddParticle(effect); end end diff --git a/Base.rte/Sounds.ini b/Base.rte/Sounds.ini index 3fe9b925c..b19b7f8a6 100644 --- a/Base.rte/Sounds.ini +++ b/Base.rte/Sounds.ini @@ -96,15 +96,23 @@ AddSoundContainer = SoundContainer PresetName = Flesh Body Blunt Hit AttenuationStartDistance = 130 AddSound = ContentFile - FilePath = Base.rte/Sounds/Physics/Foomph.flac + FilePath = Base.rte/Sounds/Physics/Human/Impact1.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/Human/Impact2.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/Human/Impact3.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/Human/Impact4.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/Human/Impact5.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/Human/Impact6.wav AddSound = ContentFile FilePath = Base.rte/Sounds/Physics/Duns.flac AddSound = ContentFile FilePath = Base.rte/Sounds/Physics/SmallThud.flac AddSound = ContentFile FilePath = Base.rte/Sounds/Physics/Flumph.flac - AddSound = ContentFile - FilePath = Base.rte/Sounds/Physics/SquishSplat.flac AddSoundContainer = SoundContainer @@ -165,6 +173,32 @@ AddSoundContainer = SoundContainer FilePath = Base.rte/Sounds/Physics/MetalBlunt2.flac +AddSoundContainer = SoundContainer + PresetName = Metal Body Blunt Hit Light + AttenuationStartDistance = 135 + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/RobotLight/Impact1.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/RobotLight/Impact2.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/RobotLight/Impact3.wav + + +AddSoundContainer = SoundContainer + PresetName = Metal Body Blunt Hit Medium + AttenuationStartDistance = 140 + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/RobotHeavy/Impact1.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/RobotHeavy/Impact2.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/RobotHeavy/Impact3.wav + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/ClankCrash.flac + AddSound = ContentFile + FilePath = Base.rte/Sounds/Physics/Crash1.flac + + AddSoundContainer = SoundContainer PresetName = Metal Body Blunt Hit Large AttenuationStartDistance = 150 @@ -647,15 +681,15 @@ AddSoundContainer = SoundContainer PresetName = Robot Head Impact AttenuationStartDistance = 100 AddSound = ContentFile - FilePath = Base.rte/Sounds/Penetration/Weapon/GunGib1.flac + FilePath = Base.rte/Sounds/Penetration/Robot/Generic/HeadImpact1.flac AddSound = ContentFile - FilePath = Base.rte/Sounds/Penetration/Weapon/GunGib2.flac + FilePath = Base.rte/Sounds/Penetration/Robot/Generic/HeadImpact2.flac AddSound = ContentFile - FilePath = Base.rte/Sounds/Penetration/Weapon/GunGib3.flac + FilePath = Base.rte/Sounds/Penetration/Robot/Generic/HeadImpact3.flac AddSound = ContentFile - FilePath = Base.rte/Sounds/Penetration/Weapon/GunGib4.flac + FilePath = Base.rte/Sounds/Penetration/Robot/Generic/HeadImpact4.flac AddSound = ContentFile - FilePath = Base.rte/Sounds/Penetration/Weapon/GunGib5.flac + FilePath = Base.rte/Sounds/Penetration/Robot/Generic/HeadImpact5.flac /////////////////////////////////////////////////////////////////////// diff --git a/Base.rte/Sounds/Physics/Human/Impact1.wav b/Base.rte/Sounds/Physics/Human/Impact1.wav new file mode 100644 index 000000000..d9268615f Binary files /dev/null and b/Base.rte/Sounds/Physics/Human/Impact1.wav differ diff --git a/Base.rte/Sounds/Physics/Human/Impact2.wav b/Base.rte/Sounds/Physics/Human/Impact2.wav new file mode 100644 index 000000000..f1f87d677 Binary files /dev/null and b/Base.rte/Sounds/Physics/Human/Impact2.wav differ diff --git a/Base.rte/Sounds/Physics/Human/Impact3.wav b/Base.rte/Sounds/Physics/Human/Impact3.wav new file mode 100644 index 000000000..c7bae93bb Binary files /dev/null and b/Base.rte/Sounds/Physics/Human/Impact3.wav differ diff --git a/Base.rte/Sounds/Physics/Human/Impact4.wav b/Base.rte/Sounds/Physics/Human/Impact4.wav new file mode 100644 index 000000000..2970c3f55 Binary files /dev/null and b/Base.rte/Sounds/Physics/Human/Impact4.wav differ diff --git a/Base.rte/Sounds/Physics/Human/Impact5.wav b/Base.rte/Sounds/Physics/Human/Impact5.wav new file mode 100644 index 000000000..03f1a19d6 Binary files /dev/null and b/Base.rte/Sounds/Physics/Human/Impact5.wav differ diff --git a/Base.rte/Sounds/Physics/Human/Impact6.wav b/Base.rte/Sounds/Physics/Human/Impact6.wav new file mode 100644 index 000000000..862073998 Binary files /dev/null and b/Base.rte/Sounds/Physics/Human/Impact6.wav differ diff --git a/Base.rte/Sounds/Physics/RobotHeavy/Impact1.wav b/Base.rte/Sounds/Physics/RobotHeavy/Impact1.wav new file mode 100644 index 000000000..b7d20078d Binary files /dev/null and b/Base.rte/Sounds/Physics/RobotHeavy/Impact1.wav differ diff --git a/Base.rte/Sounds/Physics/RobotHeavy/Impact2.wav b/Base.rte/Sounds/Physics/RobotHeavy/Impact2.wav new file mode 100644 index 000000000..2fc16536b Binary files /dev/null and b/Base.rte/Sounds/Physics/RobotHeavy/Impact2.wav differ diff --git a/Base.rte/Sounds/Physics/RobotHeavy/Impact3.wav b/Base.rte/Sounds/Physics/RobotHeavy/Impact3.wav new file mode 100644 index 000000000..b1b50f767 Binary files /dev/null and b/Base.rte/Sounds/Physics/RobotHeavy/Impact3.wav differ diff --git a/Base.rte/Sounds/Physics/RobotLight/Impact1.wav b/Base.rte/Sounds/Physics/RobotLight/Impact1.wav new file mode 100644 index 000000000..102c9b104 Binary files /dev/null and b/Base.rte/Sounds/Physics/RobotLight/Impact1.wav differ diff --git a/Base.rte/Sounds/Physics/RobotLight/Impact2.wav b/Base.rte/Sounds/Physics/RobotLight/Impact2.wav new file mode 100644 index 000000000..bea10020e Binary files /dev/null and b/Base.rte/Sounds/Physics/RobotLight/Impact2.wav differ diff --git a/Base.rte/Sounds/Physics/RobotLight/Impact3.wav b/Base.rte/Sounds/Physics/RobotLight/Impact3.wav new file mode 100644 index 000000000..4aa3450cd Binary files /dev/null and b/Base.rte/Sounds/Physics/RobotLight/Impact3.wav differ diff --git a/Browncoats.rte/Actors/Infantry/BrowncoatHeavy/BrowncoatHeavy.ini b/Browncoats.rte/Actors/Infantry/BrowncoatHeavy/BrowncoatHeavy.ini index 71feb342e..7a2c67483 100644 --- a/Browncoats.rte/Actors/Infantry/BrowncoatHeavy/BrowncoatHeavy.ini +++ b/Browncoats.rte/Actors/Infantry/BrowncoatHeavy/BrowncoatHeavy.ini @@ -76,17 +76,17 @@ AddEffect = Attachable PresetName = Browncoat Heavy Misc Part A Mass = 3 HitsMOs = 0 - GetsHitByMOs = 0 + GetsHitByMOs = 1 SpriteFile = ContentFile FilePath = Browncoats.rte/Actors/Infantry/BrowncoatHeavy/MiscPartA.png FrameCount = 1 SpriteOffset = Vector - X = -5 - Y = -4 + X = -4 + Y = -5 AngularVel = 6 DrawAfterParent = 1 EntryWound = AEmitter - CopyOf = Dent Metal Light + CopyOf = Dent Metal Chest Plate ExitWound = AEmitter CopyOf = Dent Metal Light AtomGroup = AtomGroup @@ -101,12 +101,19 @@ AddEffect = Attachable JointOffset = Vector X = 0 Y = 0 -// BreakWound = AEmitter -// CopyOf = Wound Bone Break GibImpulseLimit = 1500 GibWoundLimit = 5 -// GibSound = SoundContainer -// CopyOf = Bone Crack + GibSound = SoundContainer + CopyOf = Bone Crack + AddGib = Gib + GibParticle = MOSRotating + CopyOf = Gib Metal Grey Small B + AddGib = Gib + GibParticle = MOSParticle + CopyOf = Gib Metal Grey Tiny A + AddGib = Gib + GibParticle = MOSParticle + CopyOf = Gib Metal Grey Micro A AddEffect = Attachable @@ -138,15 +145,13 @@ AddEffect = Attachable BreakWound = AEmitter CopyOf = Wound Flesh Body PresetName = Wound Browncoat Heavy Neck - ParticlesPerMinute = 6000 - JointOffset = Vector - X = 0 - Y = 0 + BurstSound = SoundContainer + CopyOf = Flesh Head Gib + ParticlesPerMinute = 3000 + BurstScale = 5 DrawAfterParent = 1 GibImpulseLimit = 2000 GibWoundLimit = 15 -// GibSound = SoundContainer -// CopyOf = Bone Crack AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Heavy Soldier Hat Gib A @@ -261,12 +266,9 @@ AddEffect = Attachable GibImpulseLimit = 1500 GibWoundLimit = 13 GibSound = SoundContainer - CopyOf = Flesh Head Gib + CopyOf = Flesh Limb Gib AddAttachable = Attachable CopyOf = Browncoat Heavy Hat - ParentOffset = Vector - X = 0 - Y = 0 AddGib = Gib GibParticle = MOPixel CopyOf = Drop Blood @@ -388,7 +390,6 @@ AddActor = Arm X = -3.5 Y = 1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Browncoats.rte/Actors/Infantry/BrowncoatHeavy/HandFGB.png MaxLength = 14 @@ -409,88 +410,66 @@ AddActor = Arm Offset = Vector X = 3 Y = 0 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Bone Small A Offset = Vector X = -4 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Bone Small E Offset = Vector X = 0 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -2 Y = 4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Bone Micro A Offset = Vector X = -4 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Micro A Offset = Vector X = -4 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Tiny A Offset = Vector X = -5 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Tiny A Offset = Vector X = -3 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = -3 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = 1 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = 0 Y = 1 - Count = 1 - Spread = 0 GibImpulseLimit = 2000 GibWoundLimit = 13 GibSound = SoundContainer @@ -612,56 +591,42 @@ AddActor = Leg Offset = Vector X = 0 Y = -3 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Misc Gib B Offset = Vector X = -3 Y = 0 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Misc Gib C Offset = Vector X = 5 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = 1 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -3 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Micro A Offset = Vector X = 3 Y = -5 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Tiny A Offset = Vector X = 4 Y = -4 - Count = 1 - Spread = 0 GibImpulseLimit = 2500 GibWoundLimit = 15 GibSound = SoundContainer @@ -697,7 +662,6 @@ AddActor = AHuman SpriteOffset = Vector X = -6 Y = -14 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Flesh Entry Strong ExitWound = AEmitter @@ -723,10 +687,8 @@ AddActor = AHuman CopyOf = Human Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 3900 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 105 @@ -742,7 +704,7 @@ AddActor = AHuman CopyOf = Browncoat Heavy Misc Part A ParentOffset = Vector X = 5 - Y = -5 + Y = -4 Jetpack = AEmitter CopyOf = Browncoat Jetpack SpriteFile = ContentFile @@ -805,88 +767,66 @@ AddActor = AHuman Offset = Vector X = 0.5 Y = -9 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Torso Gib A Offset = Vector X = 0 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Misc Gib A Offset = Vector X = 1 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Flesh Small D Offset = Vector X = -1.5 Y = -1.5 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Misc Gib B Offset = Vector X = 3 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Misc Gib D Offset = Vector X = -3 Y = -6 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -4.5 Y = -3 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -2.5 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Bone Micro A Offset = Vector X = -2.5 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Tiny A Offset = Vector X = -1.5 Y = 2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Tiny A Offset = Vector X = -0.5 Y = -5 - Count = 1 - Spread = 0 GibImpulseLimit = 5800 GibWoundLimit = 33 GibSound = SoundContainer diff --git a/Browncoats.rte/Actors/Infantry/BrowncoatHeavy/MiscPartA.png b/Browncoats.rte/Actors/Infantry/BrowncoatHeavy/MiscPartA.png index 99c74a0da..16122e981 100644 Binary files a/Browncoats.rte/Actors/Infantry/BrowncoatHeavy/MiscPartA.png and b/Browncoats.rte/Actors/Infantry/BrowncoatHeavy/MiscPartA.png differ diff --git a/Browncoats.rte/Actors/Infantry/BrowncoatLight/BrowncoatLight.ini b/Browncoats.rte/Actors/Infantry/BrowncoatLight/BrowncoatLight.ini index abab8fd1c..8204dd4b6 100644 --- a/Browncoats.rte/Actors/Infantry/BrowncoatLight/BrowncoatLight.ini +++ b/Browncoats.rte/Actors/Infantry/BrowncoatLight/BrowncoatLight.ini @@ -373,7 +373,6 @@ AddActor = Arm X = -3.5 Y = -1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Browncoats.rte/Actors/Infantry/BrowncoatLight/HandFGA.png MaxLength = 14 @@ -394,88 +393,66 @@ AddActor = Arm Offset = Vector X = 3 Y = 0 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Bone Small A Offset = Vector X = -4 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Bone Small E Offset = Vector X = 0 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -2 Y = 4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Bone Micro A Offset = Vector X = -4 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Micro A Offset = Vector X = -4 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Tiny A Offset = Vector X = -5 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Tiny A Offset = Vector X = -3 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = -3 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = 1 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Military Tiny A Offset = Vector X = 0 Y = 1 - Count = 1 - Spread = 0 GibImpulseLimit = 1500 GibWoundLimit = 10 GibSound = SoundContainer @@ -597,64 +574,48 @@ AddActor = Leg Offset = Vector X = 0 Y = -3 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Misc Gib B Offset = Vector X = -3 Y = 0 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Misc Gib C Offset = Vector X = 5 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Browncoat Misc Gib F Offset = Vector X = 5 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = 1 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -3 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Micro A Offset = Vector X = 3 Y = -5 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Tiny A Offset = Vector X = 4 Y = -4 - Count = 1 - Spread = 0 GibImpulseLimit = 2000 GibWoundLimit = 12 GibSound = SoundContainer @@ -690,7 +651,6 @@ AddActor = AHuman SpriteOffset = Vector X = -5 Y = -12 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Flesh Entry Strong ExitWound = AEmitter @@ -716,10 +676,8 @@ AddActor = AHuman CopyOf = Human Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 3100 - AimAngle = 0 AimDistance = 33 Perceptiveness = 1 CharHeight = 105 diff --git a/Browncoats.rte/Devices/Explosives/FuelBomb/FuelBomb.lua b/Browncoats.rte/Devices/Explosives/FuelBomb/FuelBomb.lua index 0a3ef39d2..c5ad44bce 100644 --- a/Browncoats.rte/Devices/Explosives/FuelBomb/FuelBomb.lua +++ b/Browncoats.rte/Devices/Explosives/FuelBomb/FuelBomb.lua @@ -42,12 +42,12 @@ function Update(self) end local partsLeft = 0; for i = 1, #self.partList do - if MovableMan:IsParticle(self.partList[i]) and self.partList[i].PresetName == "Browncoat Fuel Bomb Fuel" then + if self.partList[i] and MovableMan:IsParticle(self.partList[i]) and self.partList[i].PresetName == "Browncoat Fuel Bomb Fuel" then if self.explodeTimer:IsPastSimMS(self.explodeTime + self.partList[i].queue) then local fire = CreatePEmitter("Flame ".. math.random(2) .." Hurt"); fire.Pos = Vector(self.partList[i].Pos.X, self.partList[i].Pos.Y); fire.Vel = self.Vel; - if self.partList[i].target then + if self.partList[i].target and self.partList[i].target.ID ~= rte.NoMOID and not self.partList[i].target.ToDelete then fire.Pos = self.partList[i].target.Pos + self.partList[i].stickPos; fire.Vel = Vector(-self.partList[i].stickPos.X, -self.partList[i].stickPos.Y); fire.Sharpness = self.partList[i].target.ID * 0.001; @@ -81,9 +81,9 @@ function Update(self) else --Look for targets to douse with fuel for i = 1, #self.partList do - if MovableMan:IsParticle(self.partList[i]) and self.partList[i].PresetName == "Browncoat Fuel Bomb Fuel" then + if self.partList[i] and MovableMan:IsParticle(self.partList[i]) and self.partList[i].PresetName == "Browncoat Fuel Bomb Fuel" then - if self.partList[i].target and IsMOSRotating(self.partList[i].target) and self.partList[i].target.ID ~= rte.NoMOID then + if self.partList[i].target and self.partList[i].target.ID ~= rte.NoMOID and not self.partList[i].target.ToDelete then if math.random() < 0.01 then self.partList[i].Vel = self.partList[i].target.Vel; @@ -106,6 +106,8 @@ function Update(self) end end end + else + self.partList[i] = nil; end end end diff --git a/Browncoats.rte/Devices/Weapons/Backblast/Backblast.ini b/Browncoats.rte/Devices/Weapons/Backblast/Backblast.ini index b54577a4b..f59fd3ea3 100644 --- a/Browncoats.rte/Devices/Weapons/Backblast/Backblast.ini +++ b/Browncoats.rte/Devices/Weapons/Backblast/Backblast.ini @@ -141,10 +141,8 @@ AddAmmo = Magazine Y = 4 DrawAfterParent = 0 RoundCount = 2 - RTTRatio = 0 RegularRound = Round CopyOf = Round IN-2 - TracerRound = None Discardable = 1 @@ -226,8 +224,6 @@ AddDevice = HDFirearm SharpShakeRange = 1 NoSupportFactor = 2 ParticleSpreadRange = 0 - ShellSpreadRange = 8 - ShellAngVelRange = 2 MuzzleOffset = Vector X = 15 Y = -2 diff --git a/Browncoats.rte/Devices/Weapons/Firestorm/Firestorm.ini b/Browncoats.rte/Devices/Weapons/Firestorm/Firestorm.ini index 505141ee1..45935a054 100644 --- a/Browncoats.rte/Devices/Weapons/Firestorm/Firestorm.ini +++ b/Browncoats.rte/Devices/Weapons/Firestorm/Firestorm.ini @@ -242,17 +242,13 @@ AddAmmo = Round ParticleCount = 1 Particle = AEmitter CopyOf = CA-1 Shot - Shell = None FireVelocity = 30 - ShellVelocity = 12 Separation = 0 AddAmmo = Magazine PresetName = Magazine CA-1 Mass = 4 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -260,10 +256,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round CA-1 - TracerRound = None AIBlastRadius = 120 @@ -356,8 +350,6 @@ AddDevice = HDFirearm SharpShakeRange = 1 NoSupportFactor = 1 ParticleSpreadRange = 0 - ShellSpreadRange = 8 - ShellAngVelRange = 2 MuzzleOffset = Vector X = 22 Y = 0 diff --git a/Browncoats.rte/Devices/Weapons/Flash/Flash.ini b/Browncoats.rte/Devices/Weapons/Flash/Flash.ini index ce425bbc4..aefba9df1 100644 --- a/Browncoats.rte/Devices/Weapons/Flash/Flash.ini +++ b/Browncoats.rte/Devices/Weapons/Flash/Flash.ini @@ -296,8 +296,6 @@ AddAmmo = AEmitter AddAmmo = Magazine PresetName = Magazine Browncoat Rocket Launcher Mass = 5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -311,8 +309,8 @@ AddAmmo = Magazine Particle = AEmitter CopyOf = Null Emitter AIFireVel = 250 - TracerRound = None AIBlastRadius = 120 + Discardable = 0 /////////////////////////////////////////////////////////////////////// @@ -394,8 +392,6 @@ AddDevice = HDFirearm SharpShakeRange = 2 NoSupportFactor = 2 ParticleSpreadRange = 20 - ShellSpreadRange = 0 - ShellAngVelRange = 0 MuzzleOffset = Vector X = 18 Y = 0 diff --git a/Browncoats.rte/Devices/Weapons/Longshot/Longshot.ini b/Browncoats.rte/Devices/Weapons/Longshot/Longshot.ini index 374cbb04a..d3905bd04 100644 --- a/Browncoats.rte/Devices/Weapons/Longshot/Longshot.ini +++ b/Browncoats.rte/Devices/Weapons/Longshot/Longshot.ini @@ -73,10 +73,8 @@ AddAmmo = Magazine Y = 4 DrawAfterParent = 0 RoundCount = 6 - RTTRatio = 0 RegularRound = Round CopyOf = Round SR-6 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Browncoats.rte/Devices/Weapons/Magmaul/Magmaul.ini b/Browncoats.rte/Devices/Weapons/Magmaul/Magmaul.ini index e0356c184..bac4cf598 100644 --- a/Browncoats.rte/Devices/Weapons/Magmaul/Magmaul.ini +++ b/Browncoats.rte/Devices/Weapons/Magmaul/Magmaul.ini @@ -53,9 +53,7 @@ AddAmmo = Round ParticleCount = 1 Particle = AEmitter CopyOf = GL-1 Shot Fire - Shell = None FireVelocity = 27 - ShellVelocity = 12 Separation = 0 @@ -64,17 +62,13 @@ AddAmmo = Round ParticleCount = 1 Particle = TDExplosive CopyOf = GL-1 Shot Fuel - Shell = None FireVelocity = 27 - ShellVelocity = 12 Separation = 0 AddAmmo = Magazine PresetName = Magazine GL-1 Fire Mass = 3 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -82,43 +76,18 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round GL-1 Fire - TracerRound = None Discardable = 0 AIBlastRadius = 70 AddAmmo = Magazine + CopyOf = Magazine GL-1 Fire PresetName = Magazine GL-1 Fuel - Mass = 3 - HitsMOs = 0 - GetsHitByMOs = 0 - SpriteFile = ContentFile - FilePath = Base.rte/Null.png - FrameCount = 1 - SpriteOffset = Vector - X = -1 - Y = -1 - AtomGroup = AtomGroup - CopyOf = Null AtomGroup - JointStrength = 200 - JointStiffness = 1 - JointOffset = Vector - X = 0 - Y = 0 - ParentOffset = Vector - X = -3 - Y = 0 - DrawAfterParent = 0 - RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round GL-1 Fuel - TracerRound = None - Discardable = 0 - AIBlastRadius = 70 + /////////////////////////////////////////////////////////////////////// // Magmaul @@ -209,8 +178,6 @@ AddDevice = HDFirearm SharpShakeRange = 1 NoSupportFactor = 2 ParticleSpreadRange = 0 - ShellSpreadRange = 8 - ShellAngVelRange = 2 MuzzleOffset = Vector X = 10 Y = 0 diff --git a/Browncoats.rte/Devices/Weapons/Magmaul/MagmaulFuelBomb.lua b/Browncoats.rte/Devices/Weapons/Magmaul/MagmaulFuelBomb.lua index 611825efe..e310fa8cd 100644 --- a/Browncoats.rte/Devices/Weapons/Magmaul/MagmaulFuelBomb.lua +++ b/Browncoats.rte/Devices/Weapons/Magmaul/MagmaulFuelBomb.lua @@ -28,7 +28,7 @@ function Update(self) local moCheck = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y); if moCheck ~= rte.NoMOID then local actor = MovableMan:GetMOFromID(MovableMan:GetMOFromID(moCheck).RootID); - if actor.Team ~= self.Team then + if actor and actor.Team ~= self.Team then self:GibThis(); end end diff --git a/Browncoats.rte/Devices/Weapons/Stinger/Stinger.ini b/Browncoats.rte/Devices/Weapons/Stinger/Stinger.ini index e1e40294a..68ba7d418 100644 --- a/Browncoats.rte/Devices/Weapons/Stinger/Stinger.ini +++ b/Browncoats.rte/Devices/Weapons/Stinger/Stinger.ini @@ -75,10 +75,8 @@ AddAmmo = Magazine Y = 2 DrawAfterParent = 0 RoundCount = 10 - RTTRatio = 0 RegularRound = Round CopyOf = Round HG-10 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer.ini b/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer.ini index 9c235b18c..0861b6699 100644 --- a/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer.ini +++ b/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer.ini @@ -73,11 +73,8 @@ AddAmmo = Magazine Y = 5 DrawAfterParent = 0 RoundCount = 7 - RTTRatio = 0 RegularRound = Round CopyOf = Round PY-7 - TracerRound = None - Discardable = 1 /////////////////////////////////////////////////////////////////////// diff --git a/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer000.png b/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer000.png index 28d2b7ae9..ad455dc3d 100644 Binary files a/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer000.png and b/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer000.png differ diff --git a/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer001.png b/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer001.png index 5cf598ec5..13a887c07 100644 Binary files a/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer001.png and b/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer001.png differ diff --git a/Coalition.rte/Actors/Infantry/CoalitionHeavy/CoalitionHeavy.ini b/Coalition.rte/Actors/Infantry/CoalitionHeavy/CoalitionHeavy.ini index 11bdbbcab..39789c229 100644 --- a/Coalition.rte/Actors/Infantry/CoalitionHeavy/CoalitionHeavy.ini +++ b/Coalition.rte/Actors/Infantry/CoalitionHeavy/CoalitionHeavy.ini @@ -86,7 +86,6 @@ AddEffect = Attachable // Coalition Heavy - AddEffect = Attachable CopyOf = Coalition Light Head PresetName = Coalition Heavy Head @@ -133,7 +132,6 @@ AddActor = Arm X = -4 Y = -1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Coalition.rte/Actors/Infantry/CoalitionLight/HandFGA.png MaxLength = 14 @@ -384,7 +382,6 @@ AddActor = AHuman SpriteOffset = Vector X = -8 Y = -12 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Flesh Entry ExitWound = AEmitter @@ -410,10 +407,8 @@ AddActor = AHuman CopyOf = Human Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 2600 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 100 @@ -507,96 +502,72 @@ AddActor = AHuman Offset = Vector X = 0 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Coalition Soldier Misc Gib A Offset = Vector X = 1 Y = -6 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Micro A Offset = Vector X = 1 Y = -2.5 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Micro A Offset = Vector X = -2 Y = -6.5 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Tiny A Offset = Vector X = -0.5 Y = -6 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Coalition Soldier Misc Gib B Offset = Vector X = 4 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Coalition Soldier Misc Gib C Offset = Vector X = -4 Y = -6 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Bone Small D Offset = Vector X = -2.5 Y = -1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -3.5 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -4.5 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -4.5 Y = -10 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Coalition Soldier Misc Gib D Offset = Vector X = 1 Y = 2 - Count = 1 - Spread = 0 GibImpulseLimit = 5200 GibWoundLimit = 20 GibSound = SoundContainer diff --git a/Coalition.rte/Actors/Infantry/CoalitionLight/CoalitionLight.ini b/Coalition.rte/Actors/Infantry/CoalitionLight/CoalitionLight.ini index 14165af9a..db37f17c6 100644 --- a/Coalition.rte/Actors/Infantry/CoalitionLight/CoalitionLight.ini +++ b/Coalition.rte/Actors/Infantry/CoalitionLight/CoalitionLight.ini @@ -262,7 +262,6 @@ AddActor = Arm X = -3.5 Y = -1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Coalition.rte/Actors/Infantry/CoalitionLight/HandFGA.png MaxLength = 14 @@ -571,7 +570,6 @@ AddActor = AHuman SpriteOffset = Vector X = -7 Y = -12 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Clothed Flesh Torso ExitWound = AEmitter @@ -597,10 +595,8 @@ AddActor = AHuman CopyOf = Human Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 2400 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 SharpAimDelay = 250 @@ -696,80 +692,66 @@ AddActor = AHuman Offset = Vector X = 0.5 Y = -9 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Coalition Soldier Rib Cage Gib A Offset = Vector X = 0 Y = -2 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Coalition Soldier Misc Gib A Offset = Vector X = 1 Y = -4 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Flesh Small D Offset = Vector X = -1.5 Y = -1.5 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Coalition Soldier Misc Gib B Offset = Vector X = 3 Y = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Coalition Soldier Misc Gib D Offset = Vector X = -3 Y = -6 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -4.5 Y = -3 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A Offset = Vector X = -2.5 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Bone Micro A Offset = Vector X = -2.5 Y = -1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Tiny A Offset = Vector X = -1.5 Y = 2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Tiny A Offset = Vector X = -0.5 Y = -5 - Spread = 0 GibImpulseLimit = 4800 GibWoundLimit = 16 GibSound = SoundContainer diff --git a/Coalition.rte/Actors/Mecha/BlastRunner/BlastRunner.ini b/Coalition.rte/Actors/Mecha/BlastRunner/BlastRunner.ini index c296dfa0d..a0e761777 100644 --- a/Coalition.rte/Actors/Mecha/BlastRunner/BlastRunner.ini +++ b/Coalition.rte/Actors/Mecha/BlastRunner/BlastRunner.ini @@ -5,8 +5,6 @@ AddEffect = MOSRotating PresetName = Particle Blast Runner Explosion Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -116,22 +114,13 @@ AddAmmo = Round Atom = Atom Material = Material CopyOf = Bullet Metal - TrailColor = Color - R = 255 - G = 0 - B = 255 - TrailLength = 0 - Shell = None FireVelocity = 50 - ShellVelocity = 0 Separation = 0 AddDevice = HDFirearm PresetName = Blast Runner Digger Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 Buyable = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png @@ -139,21 +128,10 @@ AddDevice = HDFirearm CopyOf = Null AtomGroup JointStrength = 200 JointStiffness = 0.5 - StanceOffset = Vector - X = 0 - Y = 0 - SharpStanceOffset = Vector - X = 0 - Y = 0 - SupportOffset = Vector - X = 0 - Y = 0 SharpLength = 0 Magazine = Magazine PresetName = Magazine Blast Runner Digger Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -185,14 +163,6 @@ AddDevice = HDFirearm SharpShakeRange = 1 NoSupportFactor = 1 ParticleSpreadRange = 360 - ShellSpreadRange = 8 - ShellAngVelRange = 2 - MuzzleOffset = Vector - X = 0 - Y = 0 - EjectionOffset = Vector - X = 0 - Y = 0 GibImpulseLimit = 0.1 GibWoundLimit = 2 @@ -204,17 +174,12 @@ AddDevice = HDFirearm AddActor = Turret PresetName = Blast Runner Turret Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup CopyOf = Null AtomGroup JointStrength = 1000 JointStiffness = 0 - JointOffset = Vector - X = 0 - Y = 0 MountedMO = HDFirearm CopyOf = Blast Runner Digger @@ -319,10 +284,8 @@ AddActor = ACrab CopyOf = Bone Crack DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 5500 - AimAngle = 0 AimRange = 0.5 AimDistance = 0 CharHeight = 100 diff --git a/Coalition.rte/Actors/Mecha/GatlingDrone/GatlingDrone.ini b/Coalition.rte/Actors/Mecha/GatlingDrone/GatlingDrone.ini index 97c78a10b..11b1d5678 100644 --- a/Coalition.rte/Actors/Mecha/GatlingDrone/GatlingDrone.ini +++ b/Coalition.rte/Actors/Mecha/GatlingDrone/GatlingDrone.ini @@ -617,10 +617,8 @@ AddActor = ACrab DeviceSwitchSound = SoundContainer CopyOf = Device Switch PassengerSlots = 2 - Status = 0 Health = 100 ImpulseDamageThreshold = 5500 - AimAngle = 0 AimRange = 0.6 AimDistance = 30 Perceptiveness = 0.75 diff --git a/Coalition.rte/Actors/Turrets/GatlingTurret/GatlingTurret.ini b/Coalition.rte/Actors/Turrets/GatlingTurret/GatlingTurret.ini index b50101a7e..eb482b50c 100644 --- a/Coalition.rte/Actors/Turrets/GatlingTurret/GatlingTurret.ini +++ b/Coalition.rte/Actors/Turrets/GatlingTurret/GatlingTurret.ini @@ -56,10 +56,8 @@ AddActor = ACrab DeviceSwitchSound = SoundContainer CopyOf = Device Switch PassengerSlots = 2 - Status = 0 Health = 100 ImpulseDamageThreshold = 5500 - AimAngle = 0 AimRange = 0.6 AimDistance = 30 Perceptiveness = 0.75 diff --git a/Coalition.rte/Devices/Weapons/AutoCannon/AutoCannon.ini b/Coalition.rte/Devices/Weapons/AutoCannon/AutoCannon.ini index f8b28f102..da8f4e7f4 100644 --- a/Coalition.rte/Devices/Weapons/AutoCannon/AutoCannon.ini +++ b/Coalition.rte/Devices/Weapons/AutoCannon/AutoCannon.ini @@ -167,10 +167,8 @@ AddAmmo = Magazine JointStiffness = 1 DrawAfterParent = 0 RoundCount = 15 - RTTRatio = 0 RegularRound = Round CopyOf = Round Coalition Auto Cannon - TracerRound = None AIBlastRadius = 30 diff --git a/Coalition.rte/Devices/Weapons/AutoShotgun/AutoShotgun.ini b/Coalition.rte/Devices/Weapons/AutoShotgun/AutoShotgun.ini index b22a8f342..ba6e4642e 100644 --- a/Coalition.rte/Devices/Weapons/AutoShotgun/AutoShotgun.ini +++ b/Coalition.rte/Devices/Weapons/AutoShotgun/AutoShotgun.ini @@ -28,15 +28,12 @@ AddAmmo = Magazine Y = 2 DrawAfterParent = 0 RoundCount = 10 - RTTRatio = 0 RegularRound = Round CopyOf = Round Coalition Buckshot PresetName = Round Coalition Buckshot Auto ParticleCount = 7 Shell = MOSParticle CopyOf = Shell - TracerRound = None - Discardable = 1 /////////////////////////////////////////////////////////////////////// diff --git a/Coalition.rte/Devices/Weapons/GrenadeLauncher/GrenadeLauncher.ini b/Coalition.rte/Devices/Weapons/GrenadeLauncher/GrenadeLauncher.ini index ec304c83a..850ec0f84 100644 --- a/Coalition.rte/Devices/Weapons/GrenadeLauncher/GrenadeLauncher.ini +++ b/Coalition.rte/Devices/Weapons/GrenadeLauncher/GrenadeLauncher.ini @@ -213,13 +213,9 @@ AddActor = Actor Depth = 1 DeepCheck = 0 ImpulseDamageThreshold = 10000 - Status = 0 Health = 100 + HUDVisible = 0 Team = -1 - AimAngle = 0 - AimDistance = 0 - Perceptiveness = 0 - CharHeight = 0 GibImpulseLimit = 9999999999 GibWoundLimit = 2 @@ -337,10 +333,8 @@ AddAmmo = Magazine JointStiffness = 1 DrawAfterParent = 1 RoundCount = 6 - RTTRatio = 0 RegularRound = Round CopyOf = Round Grenade Launcher Impact Grenade - TracerRound = None Discardable = 1 AIBlastRadius = 50 diff --git a/Coalition.rte/Devices/Weapons/MissileLauncher/MissileLauncher.ini b/Coalition.rte/Devices/Weapons/MissileLauncher/MissileLauncher.ini index 211d96e37..9f6db5cd7 100644 --- a/Coalition.rte/Devices/Weapons/MissileLauncher/MissileLauncher.ini +++ b/Coalition.rte/Devices/Weapons/MissileLauncher/MissileLauncher.ini @@ -53,8 +53,6 @@ AddEffect = MOSRotating AddEffect = AEmitter PresetName = Coalition Missile Launcher FX Mass = 0 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -87,10 +85,7 @@ AddEffect = AEmitter EmissionEnabled = 1 EmissionsIgnoreThis = 1 BurstSize = 1 - BurstScale = 1 BurstTriggered = 1 - BurstSpacing = 500 - EmissionDamage = 0 /////////////////////////////////////////////////////////////////////// @@ -151,11 +146,7 @@ AddAmmo = AEmitter EmissionEnabled = 1 EmissionsIgnoreThis = 0 BurstSize = 1 - BurstScale = 1 BurstTriggered = 1 - BurstSpacing = 500 - EmissionDamage = 0 - FlashOnlyOnBurst = 0 GibImpulseLimit = 5 AddGib = Gib GibParticle = MOSParticle @@ -314,7 +305,6 @@ AddAmmo = AEmitter EmissionEnabled = 1 EmissionsIgnoreThis = 1 BurstSize = 1 - BurstScale = 1 BurstTriggered = 1 Flash = Attachable CopyOf = Muzzle Flash Pistol @@ -411,9 +401,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Coalition Missile Launcher Mass = 5 - HitsMOs = 0 - GetsHitByMOs = 0 - CollidesWithTerrainWhenAttached = 1 SpriteFile = ContentFile FilePath = Base.rte/Null.png FrameCount = 1 @@ -421,12 +408,9 @@ AddAmmo = Magazine CopyOf = Null AtomGroup JointStrength = 200 JointStiffness = 1 - DrawAfterParent = 0 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round Coalition Missile Launcher - TracerRound = None Discardable = 0 AIBlastRadius = 120 diff --git a/Coalition.rte/Devices/Weapons/Pistol/Pistol.ini b/Coalition.rte/Devices/Weapons/Pistol/Pistol.ini index 2e76f8089..9288bb4a2 100644 --- a/Coalition.rte/Devices/Weapons/Pistol/Pistol.ini +++ b/Coalition.rte/Devices/Weapons/Pistol/Pistol.ini @@ -65,10 +65,8 @@ AddAmmo = Magazine JointStiffness = 1 DrawAfterParent = 0 RoundCount = 10 - RTTRatio = 0 RegularRound = Round CopyOf = Round Coalition Pistol - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Coalition.rte/Devices/Weapons/Shotgun/Shotgun.ini b/Coalition.rte/Devices/Weapons/Shotgun/Shotgun.ini index d2abd7565..1b8447278 100644 --- a/Coalition.rte/Devices/Weapons/Shotgun/Shotgun.ini +++ b/Coalition.rte/Devices/Weapons/Shotgun/Shotgun.ini @@ -26,17 +26,13 @@ AddAmmo = Round G = 198 B = 178 TrailLength = 10 - Shell = None FireVelocity = 80 - ShellVelocity = 8 Separation = 8 AddAmmo = Magazine PresetName = Magazine Coalition Shotgun Mass = 0.5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -44,10 +40,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 6 - RTTRatio = 0 RegularRound = Round CopyOf = Round Coalition Buckshot - TracerRound = None Discardable = 0 @@ -138,14 +132,9 @@ AddDevice = HDFirearm SharpShakeRange = 3 NoSupportFactor = 2 ParticleSpreadRange = 3 - ShellSpreadRange = 8 - ShellAngVelRange = 2 MuzzleOffset = Vector X = 11 Y = -1 - EjectionOffset = Vector - X = -2 - Y = -2 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 diff --git a/Coalition.rte/Devices/Weapons/UberCannon/UberCannon.ini b/Coalition.rte/Devices/Weapons/UberCannon/UberCannon.ini index 7c23fd241..8a59021d0 100644 --- a/Coalition.rte/Devices/Weapons/UberCannon/UberCannon.ini +++ b/Coalition.rte/Devices/Weapons/UberCannon/UberCannon.ini @@ -328,11 +328,7 @@ AddEffect = AEmitter EmissionEnabled = 1 EmissionsIgnoreThis = 0 BurstSize = 1 - BurstScale = 1 BurstTriggered = 1 - EmissionDamage = 0 - Flash = None - FlashOnlyOnBurst = 0 GibSound = SoundContainer AttenuationStartDistance = 200 AddSound = ContentFile @@ -423,10 +419,8 @@ AddAmmo = Magazine JointStiffness = 1 DrawAfterParent = 0 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round Coalition Uber Cannon - TracerRound = None Discardable = 1 AIBlastRadius = 200 diff --git a/CreditsAssets.txt b/CreditsAssets.txt index 7f9b2791b..aa9817923 100644 --- a/CreditsAssets.txt +++ b/CreditsAssets.txt @@ -1156,4 +1156,28 @@ ClothArmorImpact: kevlar_bullet_impact (Insurgency: Sandstorm) carpet_bullet_impact - + +******************************************************************************* +Base.rte\Sounds\Physics\Human +------------------------------------------------------------------------------- +Impact: + +body_medium_impact_hard (Insurgency: Sandstorm) + + +******************************************************************************* +Base.rte\Sounds\Physics\RobotHeavy +------------------------------------------------------------------------------- +Impact: + +MoaBodyFallDefault (Warframe) + + +******************************************************************************* +Base.rte\Sounds\Physics\RobotLight +------------------------------------------------------------------------------- +Impact: + +CrpArachnoidMicroLand (Warframe) + ******************************************************************************* \ No newline at end of file diff --git a/Dummy.rte/Actors/Brains/Controller/Controller.ini b/Dummy.rte/Actors/Brains/Controller/Controller.ini index 474cb2540..7ed04c063 100644 --- a/Dummy.rte/Actors/Brains/Controller/Controller.ini +++ b/Dummy.rte/Actors/Brains/Controller/Controller.ini @@ -37,19 +37,14 @@ AddEffect = Actor Resolution = 4 Depth = 6 DeepCheck = 1 -// PainSound = SoundContainer -// AddSound = ContentFile -// FilePath = Base.rte/Actors/Brains/Case/Sounds/ DeathSound = SoundContainer AddSound = ContentFile FilePath = Base.rte/Actors/Brains/Case/Sounds/EnergyExplosion.flac GibSound = SoundContainer AddSound = ContentFile FilePath = Base.rte/Actors/Brains/Case/Sounds/EnergyExplosion.flac - Status = 0 - Health = 100 Team = 0 - AimAngle = 0 + Health = 100 AimDistance = 0 Perceptiveness = 0.7 CharHeight = 50 diff --git a/Dummy.rte/Actors/Infantry/DummyLight/DummyLight.ini b/Dummy.rte/Actors/Infantry/DummyLight/DummyLight.ini index eb7a509af..1a1718bc5 100644 --- a/Dummy.rte/Actors/Infantry/DummyLight/DummyLight.ini +++ b/Dummy.rte/Actors/Infantry/DummyLight/DummyLight.ini @@ -31,70 +31,42 @@ AddEffect = MOSRotating Offset = Vector X = -4 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Tiny A Offset = Vector X = 3 Y = -1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -3 Y = -5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = 3 Y = 2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = 1 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Panel Orange Small A Offset = Vector X = -2 Y = -3.5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Joint Small C Offset = Vector X = -2 Y = 1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 125 GibWoundLimit = 4 GibSound = SoundContainer @@ -188,60 +160,36 @@ AddEffect = MOSRotating Offset = Vector X = -4 Y = -4 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Tiny A Offset = Vector X = 0 Y = 2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -1 Y = 1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -2 Y = -5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Rust Tiny A Offset = Vector X = -2 Y = -1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Panel Orange Small C Offset = Vector X = 2 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 85 GibWoundLimit = 3 GibSound = SoundContainer @@ -296,40 +244,24 @@ AddEffect = Attachable Offset = Vector X = 0 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -6 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Dummy Light Head Gib B Offset = Vector X = -2 Y = 3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Tiny A Offset = Vector X = 0.5 Y = 2.5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 400 GibWoundLimit = 4 GibSound = SoundContainer @@ -370,7 +302,6 @@ AddActor = Arm X = -3.5 Y = -1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Dummy.rte/Actors/Infantry/DummyLight/HandFGA.png MaxLength = 12 @@ -384,80 +315,48 @@ AddActor = Arm Offset = Vector X = -3 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Tiny A Offset = Vector X = 3 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -2 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -1 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = 5 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Dark Micro A Offset = Vector X = 6 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Dark Micro A Offset = Vector X = 0 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Micro A Offset = Vector X = -4.5 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 50 GibWoundLimit = 3 GibSound = SoundContainer @@ -572,70 +471,42 @@ AddActor = Leg Offset = Vector X = -6 Y = 1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Tiny A Offset = Vector X = -5 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Tiny A Offset = Vector X = 0 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -7 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -3 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -2 Y = -2 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Pipe Small C Offset = Vector X = 3 Y = 0 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 60 GibWoundLimit = 3 GibSound = SoundContainer @@ -672,7 +543,6 @@ AddActor = AHuman SpriteOffset = Vector X = -4 Y = -16 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Bone Entry ExitWound = AEmitter @@ -698,10 +568,8 @@ AddActor = AHuman CopyOf = Bone Crack DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 2700 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 100 @@ -901,60 +769,36 @@ AddActor = AHuman Offset = Vector X = -2 Y = -3 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Dummy Light Rib Cage Gib B Offset = Vector X = 0 Y = -5 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Panel Orange Small F Offset = Vector X = -3 Y = -6 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Tiny A Offset = Vector X = -3 Y = -9 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -1 Y = -1 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel Orange Micro A Offset = Vector X = -4 Y = -10 - Count = 1 - Spread = 0 - MinVelocity = 0 - MaxVelocity = 0 GibImpulseLimit = 4000 GibWoundLimit = 6 GibSound = SoundContainer diff --git a/Dummy.rte/Actors/Mecha/Dreadnought/Dreadnought.ini b/Dummy.rte/Actors/Mecha/Dreadnought/Dreadnought.ini index 880569291..a47461308 100644 --- a/Dummy.rte/Actors/Mecha/Dreadnought/Dreadnought.ini +++ b/Dummy.rte/Actors/Mecha/Dreadnought/Dreadnought.ini @@ -259,10 +259,8 @@ AddDevice = HDFirearm JointStrength = 200 JointStiffness = 1 RoundCount = 100 - RTTRatio = 4 RegularRound = Round CopyOf = Round Dummy Nailer Machinegun - TracerRound = None Discardable = 0 Flash = Attachable CopyOf = Muzzle Flash SMG @@ -297,7 +295,7 @@ AddDevice = HDFirearm GibImpulseLimit = 0.1 GibWoundLimit = 8 // GibSound = SoundContainer -// CopyOf = Bone Crack +// CopyOf = Robot Gib /////////////////////////////////////////////////////////////////////// @@ -435,7 +433,7 @@ AddEffect = Attachable GibImpulseLimit = 2200 GibWoundLimit = 10 // GibSound = SoundContainer -// CopyOf = Bone Crack +// CopyOf = Robot Gib AddEffect = Attachable @@ -527,7 +525,7 @@ AddEffect = Attachable GibImpulseLimit = 2200 GibWoundLimit = 10 // GibSound = SoundContainer -// CopyOf = Bone Crack +// CopyOf = Robot Gib AddEffect = Attachable @@ -619,7 +617,7 @@ AddEffect = Attachable GibImpulseLimit = 2200 GibWoundLimit = 10 // GibSound = SoundContainer -// CopyOf = Bone Crack +// CopyOf = Robot Gib /////////////////////////////////////////////////////////////////////// @@ -794,7 +792,7 @@ AddActor = Turret GibImpulseLimit = 2200 GibWoundLimit = 16 // GibSound = SoundContainer -// CopyOf = Bone Crack +// CopyOf = Robot Gib AddActor = Leg @@ -912,10 +910,8 @@ AddActor = ACrab DeviceSwitchSound = SoundContainer CopyOf = Device Switch PassengerSlots = 2 - Status = 0 Health = 100 ImpulseDamageThreshold = 2100 - AimAngle = 0 AimRange = 0.5 AimDistance = 30 Perceptiveness = 0.75 diff --git a/Dummy.rte/Actors/Turrets/SmallTurret/SmallTurret.ini b/Dummy.rte/Actors/Turrets/SmallTurret/SmallTurret.ini index 100c024fd..67998582a 100644 --- a/Dummy.rte/Actors/Turrets/SmallTurret/SmallTurret.ini +++ b/Dummy.rte/Actors/Turrets/SmallTurret/SmallTurret.ini @@ -53,8 +53,6 @@ AddDevice = HDFirearm Magazine = Magazine PresetName = Magazine Small Turret Nailer Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -62,10 +60,8 @@ AddDevice = HDFirearm JointStrength = 200 JointStiffness = 1 RoundCount = 80 - RTTRatio = 4 RegularRound = Round CopyOf = Round Dummy Nailer Machinegun - TracerRound = None Discardable = 0 Flash = Attachable CopyOf = Muzzle Flash SMG @@ -443,11 +439,8 @@ AddActor = ACrab CopyOf = Bone Crack DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 10000 - Team = 0 - AimAngle = 0 AimRange = 0.88 AimDistance = 30 Perceptiveness = 0.75 @@ -612,11 +605,8 @@ AddActor = ACrab CopyOf = Bone Crack DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 10000 - Team = 0 - AimAngle = 0 AimRange = 0.88 AimDistance = 30 Perceptiveness = 0.75 diff --git a/Dummy.rte/Craft/Rockets/Rocklet.ini b/Dummy.rte/Craft/Rockets/Rocklet.ini index 69b6f0a04..ce5a5a64e 100644 --- a/Dummy.rte/Craft/Rockets/Rocklet.ini +++ b/Dummy.rte/Craft/Rockets/Rocklet.ini @@ -327,11 +327,8 @@ AddEffect = ACRocket DeepCheck = 1 BodyHitSound = SoundContainer CopyOf = Metal Body Blunt Hit - Status = 0 Health = 100 ImpulseDamageThreshold = 6000 - Team = 0 - AimAngle = 0 AimDistance = 30 CharHeight = 90 HolsterOffset = Vector diff --git a/Dummy.rte/Devices/Explosives/DisruptorGrenade/DisruptorGrenade.ini b/Dummy.rte/Devices/Explosives/DisruptorGrenade/DisruptorGrenade.ini index 9f1ef6b8b..879a2194e 100644 --- a/Dummy.rte/Devices/Explosives/DisruptorGrenade/DisruptorGrenade.ini +++ b/Dummy.rte/Devices/Explosives/DisruptorGrenade/DisruptorGrenade.ini @@ -69,8 +69,6 @@ AddEffect = AEmitter Mass = 1 PinStrength = 500 LifeTime = 12000 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -100,12 +98,7 @@ AddEffect = AEmitter EmissionsIgnoreThis = 1 ParticlesPerMinute = 1700 BurstSize = 2 - BurstScale = 1 - BurstDamage = 0 BurstTriggered = 0 - EmissionDamage = 0 - Flash = None - FlashOnlyOnBurst = 0 AddDevice = TDExplosive diff --git a/Dummy.rte/Devices/Weapons/Annihilator/Annihilator.ini b/Dummy.rte/Devices/Weapons/Annihilator/Annihilator.ini index cf7b2397e..7d9875445 100644 --- a/Dummy.rte/Devices/Weapons/Annihilator/Annihilator.ini +++ b/Dummy.rte/Devices/Weapons/Annihilator/Annihilator.ini @@ -7,8 +7,6 @@ AddEffect = AEmitter Mass = 0 PinStrength = 4000 LifeTime = 5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -25,8 +23,6 @@ AddEffect = AEmitter FilePath = Dummy.rte/Devices/Weapons/Annihilator/Sounds/Fire3.flac BurstTriggered = 1 EmissionEnabled = 1 - Flash = None - FlashOnlyOnBurst = 0 AddEffect = MOPixel @@ -44,11 +40,6 @@ AddEffect = MOPixel Atom = Atom Material = Material CopyOf = Air - TrailColor = Color - R = 255 - G = 0 - B = 255 - TrailLength = 0 ScreenEffect = ContentFile FilePath = Base.rte/Effects/Glows/YellowBig.png EffectStartTime = 0 @@ -74,11 +65,6 @@ AddEffect = MOPixel Atom = Atom Material = Material CopyOf = Air - TrailColor = Color - R = 255 - G = 0 - B = 255 - TrailLength = 0 ScreenEffect = ContentFile FilePath = Base.rte/Effects/Glows/RedTiny.png EffectStartTime = 0 @@ -127,15 +113,12 @@ AddAmmo = Round Particle = MOPixel CopyOf = Null Bullet FireVelocity = 100 - ShellVelocity = 0 Separation = 0 AddAmmo = Magazine PresetName = Magazine Dummy Annihilator Mass = 3 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -204,7 +187,6 @@ AddDevice = HDFirearm SharpLength = 250 Magazine = Magazine CopyOf = Magazine Dummy Annihilator - Flash = None FireSound = SoundContainer AttenuationStartDistance = 190 AddSound = ContentFile @@ -229,14 +211,9 @@ AddDevice = HDFirearm SharpShakeRange = 0 NoSupportFactor = 0 ParticleSpreadRange = 0 - ShellSpreadRange = 6 - ShellAngVelRange = 5 MuzzleOffset = Vector X = 18 Y = 0 - EjectionOffset = Vector - X = -15 - Y = -3 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 @@ -275,9 +252,7 @@ AddDevice = HDFirearm AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Device Small J - Count = 1 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Device Small H - Count = 1 GibWoundLimit = 8 \ No newline at end of file diff --git a/Dummy.rte/Devices/Weapons/BlasterRifle/BlasterRifle.ini b/Dummy.rte/Devices/Weapons/BlasterRifle/BlasterRifle.ini index 5e55f0ba7..67d2a2b0f 100644 --- a/Dummy.rte/Devices/Weapons/BlasterRifle/BlasterRifle.ini +++ b/Dummy.rte/Devices/Weapons/BlasterRifle/BlasterRifle.ini @@ -105,10 +105,8 @@ AddAmmo = Magazine DrawAfterParent = 0 RoundCount = 24 Discardable = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round Dummy Blaster - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Dummy.rte/Devices/Weapons/Destroyer/Destroyer.ini b/Dummy.rte/Devices/Weapons/Destroyer/Destroyer.ini index 2986778b2..08cadd7db 100644 --- a/Dummy.rte/Devices/Weapons/Destroyer/Destroyer.ini +++ b/Dummy.rte/Devices/Weapons/Destroyer/Destroyer.ini @@ -83,11 +83,6 @@ AddEffect = MOPixel Atom = Atom Material = Material CopyOf = Bullet Metal - TrailColor = Color - R = 255 - G = 0 - B = 255 - TrailLength = 10 ScreenEffect = ContentFile FilePath = Base.rte/Effects/Glows/YellowBig.png EffectStartTime = 0 @@ -160,7 +155,6 @@ AddAmmo = AEmitter EmissionsIgnoreThis = 0 ParticlesPerMinute = 8000 BurstSize = 1 - BurstScale = 1 BurstTriggered = 0 GibSound = SoundContainer AttenuationStartDistance = 220 @@ -201,8 +195,6 @@ AddAmmo = AEmitter AddAmmo = Magazine PresetName = Magazine Dummy Destroyer Mass = 5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -210,7 +202,6 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Null Round PresetName = Round Dummy Destroyer @@ -218,7 +209,6 @@ AddAmmo = Magazine CopyOf = Destroyer Trail Glow AIFireVel = 100 AILifeTime = 1000 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Dummy.rte/Devices/Weapons/Destroyer/DestroyerCannon.lua b/Dummy.rte/Devices/Weapons/Destroyer/DestroyerCannon.lua index d9bbedf5a..3a7cff82f 100644 --- a/Dummy.rte/Devices/Weapons/Destroyer/DestroyerCannon.lua +++ b/Dummy.rte/Devices/Weapons/Destroyer/DestroyerCannon.lua @@ -84,7 +84,7 @@ function Update(self) par.Team = self.Team; par.IgnoresTeamHits = true; par.Pos = self.MuzzlePos; - par.Vel = Vector(math.max(self.maxFireVel * self.charge, self.minFireVel) * self.FlipFactor, 0):RadRotate(self.RotAngle); + par.Vel = Vector((self.minFireVel + (self.maxFireVel - self.minFireVel) * self.charge) * self.FlipFactor, 0):RadRotate(self.RotAngle); MovableMan:AddParticle(par); self.charge = 0; diff --git a/Dummy.rte/Devices/Weapons/FragNailer/FragNailer.ini b/Dummy.rte/Devices/Weapons/FragNailer/FragNailer.ini index e8833a956..4b595bd2b 100644 --- a/Dummy.rte/Devices/Weapons/FragNailer/FragNailer.ini +++ b/Dummy.rte/Devices/Weapons/FragNailer/FragNailer.ini @@ -47,11 +47,6 @@ AddEffect = MOPixel Atom = Atom Material = Material CopyOf = Air - TrailColor = Color - R = 255 - G = 0 - B = 255 - TrailLength = 0 ScreenEffect = ContentFile FilePath = Base.rte/Effects/Glows/FireGlow1.png EffectStartTime = 0 @@ -63,8 +58,6 @@ AddEffect = MOPixel AddEffect = MOSRotating PresetName = Particle Dummy Frag Nailer Explosion Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -127,17 +120,13 @@ AddAmmo = Round ParticleCount = 1 Particle = MOSRotating CopyOf = Particle Dummy Frag Nailer Bomb - Shell = None FireVelocity = 50 - ShellVelocity = 0 Separation = 0 AddAmmo = Magazine PresetName = Magazine Dummy Frag Nailer Grenadier Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -145,10 +134,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 4 - RTTRatio = 0 RegularRound = Round CopyOf = Round Dummy Frag Nailer Grenadier - TracerRound = None Discardable = 0 AIBlastRadius = 30 @@ -242,14 +229,9 @@ AddDevice = HDFirearm SharpShakeRange = 1 NoSupportFactor = 1 ParticleSpreadRange = 3 - ShellSpreadRange = 8 - ShellAngVelRange = 0 MuzzleOffset = Vector X = 10 Y = 1 - EjectionOffset = Vector - X = -1 - Y = -1 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 diff --git a/Dummy.rte/Devices/Weapons/ImpulseGrenadeLauncher/ImpulseGrenadeLauncher.ini b/Dummy.rte/Devices/Weapons/ImpulseGrenadeLauncher/ImpulseGrenadeLauncher.ini index ceca68627..03b613978 100644 --- a/Dummy.rte/Devices/Weapons/ImpulseGrenadeLauncher/ImpulseGrenadeLauncher.ini +++ b/Dummy.rte/Devices/Weapons/ImpulseGrenadeLauncher/ImpulseGrenadeLauncher.ini @@ -37,7 +37,6 @@ AddEffect = AEmitter EmissionEnabled = 1 EmissionsIgnoreThis = 0 BurstSize = 1 - BurstScale = 1 BurstTriggered = 1 GibSound = SoundContainer AttenuationStartDistance = 210 @@ -100,17 +99,13 @@ AddAmmo = Round ParticleCount = 1 Particle = AEmitter CopyOf = Particle Dummy Impulse Grenade Launcher - Shell = None FireVelocity = 40 - ShellVelocity = 10 Separation = 5 AddAmmo = Magazine PresetName = Magazine Dummy Impulse Grenade Launcher Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -118,10 +113,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round Dummy Impulse Grenade Launcher - TracerRound = None Discardable = 0 AIBlastRadius = 70 @@ -214,14 +207,9 @@ AddDevice = HDFirearm SharpShakeRange = 1 NoSupportFactor = 3 ParticleSpreadRange = 3 - ShellSpreadRange = 8 - ShellAngVelRange = 0 MuzzleOffset = Vector X = 10 Y = 0 - EjectionOffset = Vector - X = -1 - Y = -1 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 diff --git a/Dummy.rte/Devices/Weapons/NailerMachinegun/NailerMachinegun.ini b/Dummy.rte/Devices/Weapons/NailerMachinegun/NailerMachinegun.ini index f94cccca0..181632b80 100644 --- a/Dummy.rte/Devices/Weapons/NailerMachinegun/NailerMachinegun.ini +++ b/Dummy.rte/Devices/Weapons/NailerMachinegun/NailerMachinegun.ini @@ -35,12 +35,10 @@ AddAmmo = Magazine DeepCheck = 0 DrawAfterParent = 0 RoundCount = 100 - RTTRatio = 0 RegularRound = Round CopyOf = Round Dummy Nailgun PresetName = Round Dummy Nailer Machinegun FireVelocity = 85 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Dummy.rte/Devices/Weapons/Nailgun/Nailgun.ini b/Dummy.rte/Devices/Weapons/Nailgun/Nailgun.ini index 175d0d1eb..bd464497c 100644 --- a/Dummy.rte/Devices/Weapons/Nailgun/Nailgun.ini +++ b/Dummy.rte/Devices/Weapons/Nailgun/Nailgun.ini @@ -73,10 +73,8 @@ AddAmmo = Magazine DeepCheck = 0 DrawAfterParent = 0 RoundCount = 12 - RTTRatio = 0 RegularRound = Round CopyOf = Round Dummy Nailgun - TracerRound = None /////////////////////////////////////////////////////////////////////// @@ -135,7 +133,6 @@ AddDevice = HDFirearm SharpLength = 100 Magazine = Magazine CopyOf = Magazine Dummy Nailgun - Flash = None FireSound = SoundContainer AttenuationStartDistance = 160 AddSound = ContentFile diff --git a/Dummy.rte/Devices/Weapons/RailPistol/RailPistol.ini b/Dummy.rte/Devices/Weapons/RailPistol/RailPistol.ini index 78a25b9f7..3ca4bc802 100644 --- a/Dummy.rte/Devices/Weapons/RailPistol/RailPistol.ini +++ b/Dummy.rte/Devices/Weapons/RailPistol/RailPistol.ini @@ -73,10 +73,8 @@ AddAmmo = Magazine DeepCheck = 0 DrawAfterParent = 0 RoundCount = 8 - RTTRatio = 0 RegularRound = Round CopyOf = Round Dummy Rail Pistol - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Dummy.rte/Devices/Weapons/Repeater/Repeater.ini b/Dummy.rte/Devices/Weapons/Repeater/Repeater.ini index 8533af9af..f54e3e8f3 100644 --- a/Dummy.rte/Devices/Weapons/Repeater/Repeater.ini +++ b/Dummy.rte/Devices/Weapons/Repeater/Repeater.ini @@ -65,8 +65,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Dummy Repeater Mass = 3 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -74,10 +72,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 12 - RTTRatio = 0 RegularRound = Round CopyOf = Round Dummy Repeater - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Dummy.rte/Devices/Weapons/ScoutingRifle/ScoutingRifle.ini b/Dummy.rte/Devices/Weapons/ScoutingRifle/ScoutingRifle.ini index ea8ddff83..4a1cdf3a8 100644 --- a/Dummy.rte/Devices/Weapons/ScoutingRifle/ScoutingRifle.ini +++ b/Dummy.rte/Devices/Weapons/ScoutingRifle/ScoutingRifle.ini @@ -66,10 +66,8 @@ AddAmmo = Magazine Y = 1 DrawAfterParent = 0 RoundCount = 8 - RTTRatio = 0 RegularRound = Round CopyOf = Round Dummy Scouting Rifle - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Imperatus.rte/Actors/Brains/Brainbot/Brainbot.ini b/Imperatus.rte/Actors/Brains/Brainbot/Brainbot.ini index e81acb3e3..5e3fdf9d1 100644 --- a/Imperatus.rte/Actors/Brains/Brainbot/Brainbot.ini +++ b/Imperatus.rte/Actors/Brains/Brainbot/Brainbot.ini @@ -339,11 +339,9 @@ AddActor = AHuman FilePath = Base.rte/Actors/Brains/Case/Sounds/EnergyExplosion.flac DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 + Team = 0 Health = 100 ImpulseDamageThreshold = 2800 - Team = 0 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 100 diff --git a/Imperatus.rte/Actors/Infantry/AllPurpose/AllPurposeRobot.ini b/Imperatus.rte/Actors/Infantry/AllPurpose/AllPurposeRobot.ini index f6ac85bed..055b27ead 100644 --- a/Imperatus.rte/Actors/Infantry/AllPurpose/AllPurposeRobot.ini +++ b/Imperatus.rte/Actors/Infantry/AllPurpose/AllPurposeRobot.ini @@ -10,7 +10,7 @@ AddEffect = MOSRotating SpriteFile = ContentFile FilePath = Imperatus.rte/Actors/Infantry/AllPurpose/Gibs/HeadAGibA.png FrameCount = 1 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -57,7 +57,7 @@ AddEffect = MOSRotating SpriteFile = ContentFile FilePath = Imperatus.rte/Actors/Infantry/AllPurpose/Gibs/HeadAGibB.png FrameCount = 1 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -85,7 +85,6 @@ AddEffect = MOSRotating Spread = 2.25 MaxVelocity = 15 MinVelocity = 5 - GibImpulseLimit = 25 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Micro A @@ -138,6 +137,8 @@ AddActor = Attachable X = -1 Y = 6 DrawAfterParent = 1 + //GibSound = SoundContainer + // CopyOf = Robot Head Gib Industrial AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 @@ -241,7 +242,6 @@ AddActor = Arm X = -4 Y = -2 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Imperatus.rte/Actors/Infantry/AllPurpose/Hand.png MaxLength = 13 @@ -490,18 +490,15 @@ AddActor = AHuman Depth = 3 DeepCheck = 0 BodyHitSound = SoundContainer - CopyOf = Metal Body Blunt Hit + CopyOf = Metal Body Blunt Hit Medium PainSound = SoundContainer CopyOf = Robot Pain DeathSound = SoundContainer CopyOf = Robot Death DeviceSwitchSound = SoundContainer CopyOf = Robot Stride - Status = 0 Health = 100 ImpulseDamageThreshold = 3200 - Team = 0 - AimAngle = 0 AimDistance = 30 SharpAimDelay = 280 Perceptiveness = 0.9 diff --git a/Imperatus.rte/Actors/Infantry/Combat/CombatRobot.ini b/Imperatus.rte/Actors/Infantry/Combat/CombatRobot.ini index 878db7c8a..5ffe05441 100644 --- a/Imperatus.rte/Actors/Infantry/Combat/CombatRobot.ini +++ b/Imperatus.rte/Actors/Infantry/Combat/CombatRobot.ini @@ -10,7 +10,7 @@ AddEffect = MOSRotating SpriteFile = ContentFile FilePath = Imperatus.rte/Actors/Infantry/Combat/Gibs/HeadBGibA.png FrameCount = 1 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -56,7 +56,6 @@ AddEffect = MOSRotating AddEffect = Attachable PresetName = Imperatus Combat Robot Backpack Mass = 2 - Sharpness = 1 HitsMOs = 0 GetsHitByMOs = 0 CollidesWithTerrainWhenAttached = 1 @@ -275,18 +274,15 @@ AddActor = AHuman Depth = 6 DeepCheck = 0 BodyHitSound = SoundContainer - CopyOf = Metal Body Blunt Hit + CopyOf = Metal Body Blunt Hit Medium PainSound = SoundContainer CopyOf = Robot Pain DeathSound = SoundContainer CopyOf = Robot Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 3500 - Team = 0 - AimAngle = 0 AimDistance = 30 SharpAimDelay = 300 Perceptiveness = 0.8 diff --git a/Imperatus.rte/Devices/Weapons/Banshee/Banshee.ini b/Imperatus.rte/Devices/Weapons/Banshee/Banshee.ini index d8d6d32f9..3bd3d0c30 100644 --- a/Imperatus.rte/Devices/Weapons/Banshee/Banshee.ini +++ b/Imperatus.rte/Devices/Weapons/Banshee/Banshee.ini @@ -162,7 +162,6 @@ AddAmmo = Magazine Y = 2 DrawAfterParent = 0 RoundCount = 4 - RTTRatio = 0 RegularRound = Round CopyOf = Round Imperatus Heavy Sniper @@ -195,7 +194,6 @@ AddDevice = HDFirearm ExitWound = AEmitter CopyOf = Dent Metal GoldValue = 150 - Buyable = 1 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material diff --git a/Imperatus.rte/Devices/Weapons/Chunker/Chunker.ini b/Imperatus.rte/Devices/Weapons/Chunker/Chunker.ini index 24a84fd87..2f22b8645 100644 --- a/Imperatus.rte/Devices/Weapons/Chunker/Chunker.ini +++ b/Imperatus.rte/Devices/Weapons/Chunker/Chunker.ini @@ -37,8 +37,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Imperatus Chunker Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -46,10 +44,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 3 - RTTRatio = 0 RegularRound = Round CopyOf = Round Imperatus Chunker - TracerRound = None Discardable = 0 diff --git a/Imperatus.rte/Devices/Weapons/Devastator/Devastator.ini b/Imperatus.rte/Devices/Weapons/Devastator/Devastator.ini index 8f1a800dc..97c56f220 100644 --- a/Imperatus.rte/Devices/Weapons/Devastator/Devastator.ini +++ b/Imperatus.rte/Devices/Weapons/Devastator/Devastator.ini @@ -168,10 +168,8 @@ AddAmmo = Magazine JointStiffness = 1 DrawAfterParent = 0 RoundCount = 5 - RTTRatio = 0 RegularRound = Round CopyOf = Round Imperatus Flak Cannon - TracerRound = None AIBlastRadius = 110 diff --git a/Imperatus.rte/Devices/Weapons/Marauder/Marauder.ini b/Imperatus.rte/Devices/Weapons/Marauder/Marauder.ini index 6496d0e23..1971e6b82 100644 --- a/Imperatus.rte/Devices/Weapons/Marauder/Marauder.ini +++ b/Imperatus.rte/Devices/Weapons/Marauder/Marauder.ini @@ -86,8 +86,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Imperatus Revolver Cannon Mass = 8 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -96,10 +94,8 @@ AddAmmo = Magazine JointStiffness = 1 RoundCount = 5 Discardable = 0 - RTTRatio = 0 RegularRound = Round CopyOf = Round Imperatus Revolver Cannon - TracerRound = None /////////////////////////////////////////////////////////////////////// @@ -194,8 +190,6 @@ AddDevice = HDFirearm SharpShakeRange = 3 NoSupportFactor = 3 ParticleSpreadRange = 0.5 - ShellSpreadRange = 0 - ShellAngVelRange = 0 MuzzleOffset = Vector X = 16 Y = -2 diff --git a/Imperatus.rte/Devices/Weapons/Mauler/Mauler.ini b/Imperatus.rte/Devices/Weapons/Mauler/Mauler.ini index cc6460026..8165a5086 100644 --- a/Imperatus.rte/Devices/Weapons/Mauler/Mauler.ini +++ b/Imperatus.rte/Devices/Weapons/Mauler/Mauler.ini @@ -62,8 +62,6 @@ AddAmmo = AEmitter RestThreshold = -1 AirResistance = 0.035 AirThreshold = 30 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -125,7 +123,6 @@ AddAmmo = AEmitter EmissionEnabled = 1 EmissionsIgnoreThis = 0 ParticlesPerMinute = 0 - BurstScale = 1 BurstTriggered = 1 @@ -134,9 +131,6 @@ AddAmmo = Round ParticleCount = 1 Particle = AEmitter CopyOf = Imperatus Mauler Shot - //Shell = AEmitter - // CopyOf = Smoking Cannon Casing - //ShellVelocity = 10 FireVelocity = 10 AIFireVel = 60 AILifeTime = 800 @@ -181,10 +175,8 @@ AddAmmo = Magazine Y = 3 DrawAfterParent = 0 RoundCount = 8 - RTTRatio = 0 RegularRound = Round CopyOf = Round Imperatus Mauler - TracerRound = None /////////////////////////////////////////////////////////////////////// @@ -275,14 +267,9 @@ AddDevice = HDFirearm SharpShakeRange = 2 NoSupportFactor = 2 ParticleSpreadRange = 20 - ShellSpreadRange = 10 - ShellAngVelRange = 5 MuzzleOffset = Vector X = 19 Y = 0 - EjectionOffset = Vector - X = 0 - Y = -1 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 diff --git a/Imperatus.rte/Devices/Weapons/Slugger/Slugger.ini b/Imperatus.rte/Devices/Weapons/Slugger/Slugger.ini index e7597089d..515f433c3 100644 --- a/Imperatus.rte/Devices/Weapons/Slugger/Slugger.ini +++ b/Imperatus.rte/Devices/Weapons/Slugger/Slugger.ini @@ -84,8 +84,6 @@ AddAmmo = MOSRotating AddAmmo = Magazine PresetName = Magazine Imperatus Slugger Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -93,7 +91,6 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round PresetName = Round Imperatus Slugger ParticleCount = 1 @@ -104,7 +101,6 @@ AddAmmo = Magazine FireVelocity = 30 ShellVelocity = 8 Separation = 5 - TracerRound = None Discardable = 0 AIBlastRadius = 20 diff --git a/Missions.rte/Objects/BombMaker/BombMaker.ini b/Missions.rte/Objects/BombMaker/BombMaker.ini index 0df2b33c1..209fe326c 100644 --- a/Missions.rte/Objects/BombMaker/BombMaker.ini +++ b/Missions.rte/Objects/BombMaker/BombMaker.ini @@ -20,7 +20,6 @@ AddActor = AEmitter SpriteOffset = Vector X = -14 Y = -10 - HFlipped = 0 EntryWound = AEmitter CopyOf = Dent Metal Light ExitWound = AEmitter @@ -42,7 +41,6 @@ AddActor = AEmitter // EmissionSound = SoundContainer // AddSound = ContentFile // FilePath = TBA - EmissionDamage = 0 EmissionOffset = Vector X = 13 Y = 6 @@ -57,7 +55,6 @@ AddActor = AEmitter MaxVelocity = 3 MinVelocity = 2 PushesEmitter = 0 - Team = 0 GibImpulseLimit = 200 GibWoundLimit = 30 GibSound = SoundContainer diff --git a/Missions.rte/Objects/Eggsac/Eggsac.ini b/Missions.rte/Objects/Eggsac/Eggsac.ini index 7cfe2ab00..7d64f65dc 100644 --- a/Missions.rte/Objects/Eggsac/Eggsac.ini +++ b/Missions.rte/Objects/Eggsac/Eggsac.ini @@ -19,7 +19,6 @@ AddActor = AEmitter SpriteOffset = Vector X = -16 Y = 0 - HFlipped = 0 EntryWound = AEmitter CopyOf = Wound Bone Entry ExitWound = AEmitter @@ -41,7 +40,6 @@ AddActor = AEmitter AddSound = ContentFile FilePath = Base.rte/Sounds/Physics/Chomp.flac EmissionsIgnoreThis = 1 - EmissionDamage = 0 EmissionOffset = Vector X = 0 Y = 50 @@ -55,7 +53,6 @@ AddActor = AEmitter MaxVelocity = 1.0 MinVelocity = 0 PushesEmitter = 0 - Team = 0 GibImpulseLimit = 25 GibWoundLimit = 50 AddGib = Gib diff --git a/Missions.rte/Objects/OldBrain/OldBrain.ini b/Missions.rte/Objects/OldBrain/OldBrain.ini index 63d7574b4..9554ec810 100644 --- a/Missions.rte/Objects/OldBrain/OldBrain.ini +++ b/Missions.rte/Objects/OldBrain/OldBrain.ini @@ -58,7 +58,7 @@ AddEffect = MOSRotating SpriteFile = ContentFile FilePath = Missions.rte/Objects/OldBrain/Gibs/OldBrainGib.png FrameCount = 1 - AngularVel = 60 + AngularVel = 6 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material diff --git a/Missions.rte/Objects/RotatingPad/RotatingPad.ini b/Missions.rte/Objects/RotatingPad/RotatingPad.ini index 8bf1823ef..b9a4ca0f2 100644 --- a/Missions.rte/Objects/RotatingPad/RotatingPad.ini +++ b/Missions.rte/Objects/RotatingPad/RotatingPad.ini @@ -45,7 +45,6 @@ AddActor = Actor SpriteOffset = Vector X = -18 Y = -4 - HFlipped = 0 EntryWound = AEmitter CopyOf = Dent Metal ExitWound = AEmitter @@ -66,10 +65,7 @@ AddActor = Actor // GibSound = SoundContainer // AddSound = ContentFile // FilePath = TBA - Status = 0 Health = 100 - Team = 0 - AimAngle = 0 AimDistance = 0 CharHeight = 50 HolsterOffset = Vector diff --git a/Missions.rte/Objects/Terminal/Terminal.ini b/Missions.rte/Objects/Terminal/Terminal.ini index 68481e8e8..ef42eb8cd 100644 --- a/Missions.rte/Objects/Terminal/Terminal.ini +++ b/Missions.rte/Objects/Terminal/Terminal.ini @@ -37,9 +37,4 @@ AddEffect = AEmitter EmissionsIgnoreThis = 0 ParticlesPerMinute = 0 BurstSize = 0 - BurstScale = 0 - BurstDamage = 0 - BurstTriggered = 0 - EmissionDamage = 0 - Flash = None - FlashOnlyOnBurst = 0 \ No newline at end of file + BurstTriggered = 0 \ No newline at end of file diff --git a/Missions.rte/Objects/ZombieGenerator/ZombieGenerator.ini b/Missions.rte/Objects/ZombieGenerator/ZombieGenerator.ini index 8fb9568d6..fc2f66162 100644 --- a/Missions.rte/Objects/ZombieGenerator/ZombieGenerator.ini +++ b/Missions.rte/Objects/ZombieGenerator/ZombieGenerator.ini @@ -423,7 +423,6 @@ AddActor = AEmitter SpriteOffset = Vector X = -20 Y = -52 - HFlipped = 0 EntryWound = AEmitter CopyOf = Dent Metal Light ExitWound = AEmitter @@ -445,7 +444,6 @@ AddActor = AEmitter // EmissionSound = SoundContainer // AddSound = ContentFile // FilePath = Base.rte/Actors/Brains/Case/Sounds/BrainPop.flac - EmissionDamage = 0 EmissionOffset = Vector X = 0 Y = 50 @@ -458,7 +456,6 @@ AddActor = AEmitter MaxVelocity = 1.0 MinVelocity = 0 PushesEmitter = 0 - Team = 0 GibImpulseLimit = 25 GibWoundLimit = 50 GibSound = SoundContainer diff --git a/Ronin.rte/Actors/Brains/Commander/RoninCommander.ini b/Ronin.rte/Actors/Brains/Commander/RoninCommander.ini index 826d16a3e..23d53126f 100644 --- a/Ronin.rte/Actors/Brains/Commander/RoninCommander.ini +++ b/Ronin.rte/Actors/Brains/Commander/RoninCommander.ini @@ -35,7 +35,6 @@ AddActor = AHuman AddLine = Press Jump and then Crouch to perform a somersault, or double-tap Crouch to lunge out! Mass = 50 GoldValue = 125 - Sharpness = 1 HitsMOs = 1 GetsHitByMOs = 1 ScriptPath = Base.rte/AI/HumanAI.lua @@ -46,7 +45,6 @@ AddActor = AHuman SpriteOffset = Vector X = -7 Y = -12 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Flesh Entry Strong ExitWound = AEmitter @@ -72,10 +70,9 @@ AddActor = AHuman CopyOf = Human Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 + Team = 0 Health = 100 ImpulseDamageThreshold = 2000 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 100 @@ -204,7 +201,6 @@ AddActor = AHuman X = 0.5 Y = -9 Count = 5 - Spread = 0 // To-do: Replace with custom gibs that aren't lazy copies of Coalition gibs. AddGib = Gib GibParticle = MOSRotating @@ -212,40 +208,30 @@ AddActor = AHuman Offset = Vector X = 0 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib A Offset = Vector X = 1 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib B Offset = Vector X = 3 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib D Offset = Vector X = -3 Y = -6 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Flesh Small D Offset = Vector X = -1.5 Y = -1.5 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Flesh Small D @@ -253,7 +239,6 @@ AddActor = AHuman X = -1.5 Y = -1.5 Count = 6 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A @@ -261,7 +246,6 @@ AddActor = AHuman X = -4.5 Y = -3 Count = 3 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A @@ -269,7 +253,6 @@ AddActor = AHuman X = -2.5 Y = 1 Count = 2 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Bone Micro A @@ -277,7 +260,6 @@ AddActor = AHuman X = -2.5 Y = -1 Count = 3 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Tiny A @@ -285,15 +267,12 @@ AddActor = AHuman X = -1.5 Y = 2 Count = 2 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Tiny A Offset = Vector X = -0.5 Y = -5 - Count = 1 - Spread = 0 GibImpulseLimit = 7000 GibWoundLimit = 16 GibSound = SoundContainer diff --git a/Ronin.rte/Actors/Infantry/RoninHeavy/RoninHeavy.ini b/Ronin.rte/Actors/Infantry/RoninHeavy/RoninHeavy.ini index 930cb8c3c..558264eb3 100644 --- a/Ronin.rte/Actors/Infantry/RoninHeavy/RoninHeavy.ini +++ b/Ronin.rte/Actors/Infantry/RoninHeavy/RoninHeavy.ini @@ -119,7 +119,6 @@ AddEffect = MOSRotating AddEffect = Attachable PresetName = Ronin Motorcycle Helmet Mass = 4 - Sharpness = 1 HitsMOs = 0 GetsHitByMOs = 1 CollidesWithTerrainWhenAttached = 1 @@ -143,7 +142,6 @@ AddEffect = Attachable DeepCheck = 0 JointStrength = 180 JointStiffness = 0.3 - BreakWound = None JointOffset = Vector X = 0 Y = 0 @@ -185,8 +183,6 @@ AddEffect = Attachable Offset = Vector X = 0 Y = -1 - Count = 1 - Spread = 0 MinVelocity = 0 MaxVelocity = 0 GibSound = SoundContainer @@ -198,7 +194,6 @@ AddEffect = Attachable AddEffect = Attachable PresetName = Ronin Dummy Mask Mass = 3 - Sharpness = 1 HitsMOs = 0 GetsHitByMOs = 1 CollidesWithTerrainWhenAttached = 1 @@ -222,7 +217,6 @@ AddEffect = Attachable DeepCheck = 0 JointStrength = 150 JointStiffness = 0.2 - BreakWound = None JointOffset = Vector X = 0 Y = 0 @@ -281,7 +275,6 @@ AddEffect = Attachable AddEffect = Attachable PresetName = Ronin Soldier Helmet Mass = 3 - Sharpness = 1 HitsMOs = 0 GetsHitByMOs = 1 CollidesWithTerrainWhenAttached = 1 @@ -306,7 +299,6 @@ AddEffect = Attachable DeepCheck = 0 JointStrength = 60 JointStiffness = 0.1 - BreakWound = None JointOffset = Vector X = 0 Y = 0 @@ -375,7 +367,6 @@ AddEffect = Attachable AddEffect = Attachable PresetName = Ronin Browncoat Mask Mass = 2 - Sharpness = 1 HitsMOs = 0 GetsHitByMOs = 1 CollidesWithTerrainWhenAttached = 1 @@ -450,7 +441,6 @@ AddEffect = Attachable AddEffect = Attachable PresetName = Ronin Chest Plate Mass = 3 - Sharpness = 1 HitsMOs = 0 GetsHitByMOs = 1 ScriptPath = Base.rte/Scripts/Shared/RandomFrame.lua @@ -560,7 +550,6 @@ AddActor = AHuman Description = A hefty Ronin soldier equipped with pieces of makeshift armor as protection. Mass = 48 GoldValue = 90 - Sharpness = 1 HitsMOs = 1 GetsHitByMOs = 1 ScriptPath = Base.rte/AI/HumanAI.lua @@ -571,7 +560,6 @@ AddActor = AHuman SpriteOffset = Vector X = -7 Y = -12 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Clothed Flesh Torso ExitWound = AEmitter @@ -597,10 +585,8 @@ AddActor = AHuman CopyOf = Human Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 1600 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 SharpAimDelay = 200 @@ -697,47 +683,36 @@ AddActor = AHuman X = 0.5 Y = -9 Count = 5 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Rib Cage Gib A Offset = Vector X = 0 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib A Offset = Vector X = 1 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib B Offset = Vector X = 3 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib D Offset = Vector X = -3 Y = -6 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Flesh Small D Offset = Vector X = -1.5 Y = -1.5 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Flesh Small D @@ -745,7 +720,6 @@ AddActor = AHuman X = -1.5 Y = -1.5 Count = 6 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A @@ -753,7 +727,6 @@ AddActor = AHuman X = -4.5 Y = -3 Count = 3 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A @@ -761,7 +734,6 @@ AddActor = AHuman X = -2.5 Y = 1 Count = 2 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Bone Micro A @@ -769,7 +741,6 @@ AddActor = AHuman X = -2.5 Y = -1 Count = 3 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Tiny A @@ -777,15 +748,12 @@ AddActor = AHuman X = -1.5 Y = 2 Count = 2 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Panel White Tiny A Offset = Vector X = -0.5 Y = -5 - Count = 1 - Spread = 0 GibImpulseLimit = 6000 GibWoundLimit = 15 GibSound = SoundContainer diff --git a/Ronin.rte/Actors/Infantry/RoninLight/RoninLight.ini b/Ronin.rte/Actors/Infantry/RoninLight/RoninLight.ini index c72012698..938d4ae60 100644 --- a/Ronin.rte/Actors/Infantry/RoninLight/RoninLight.ini +++ b/Ronin.rte/Actors/Infantry/RoninLight/RoninLight.ini @@ -235,7 +235,6 @@ AddActor = Arm X = -3.5 Y = -1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Ronin.rte/Actors/Infantry/RoninLight/HandFGA.png MaxLength = 14 @@ -539,7 +538,6 @@ AddActor = AHuman Description = The Ronin infantry unit: a random rag-tag human soldier that is prone to injury. Comes equipped with a standard issue jetpack. Mass = 48 GoldValue = 75 - Sharpness = 1 HitsMOs = 1 GetsHitByMOs = 1 ScriptPath = Base.rte/AI/HumanAI.lua @@ -550,7 +548,6 @@ AddActor = AHuman SpriteOffset = Vector X = -7 Y = -12 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Flesh Entry Deadly ExitWound = AEmitter @@ -576,10 +573,8 @@ AddActor = AHuman CopyOf = Human Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 1600 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 SharpAimDelay = 100 @@ -692,40 +687,30 @@ AddActor = AHuman Offset = Vector X = 0 Y = -2 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib A Offset = Vector X = 1 Y = -4 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib B Offset = Vector X = 3 Y = 1 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Ronin Soldier Misc Gib D Offset = Vector X = -3 Y = -6 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Flesh Small D Offset = Vector X = -1.5 Y = -1.5 - Count = 1 - Spread = 0 AddGib = Gib GibParticle = MOSRotating CopyOf = Gib Flesh Small D @@ -733,7 +718,6 @@ AddActor = AHuman X = -1.5 Y = -1.5 Count = 6 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A @@ -741,7 +725,6 @@ AddActor = AHuman X = -4.5 Y = -3 Count = 3 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Micro A @@ -749,7 +732,6 @@ AddActor = AHuman X = -2.5 Y = 1 Count = 2 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Bone Micro A @@ -757,7 +739,6 @@ AddActor = AHuman X = -2.5 Y = -1 Count = 3 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Flesh Tiny A @@ -765,15 +746,12 @@ AddActor = AHuman X = -1.5 Y = 2 Count = 2 - Spread = 0 AddGib = Gib GibParticle = MOSParticle CopyOf = Gib Metal Grey Tiny A Offset = Vector X = -0.5 Y = -5 - Count = 1 - Spread = 0 GibImpulseLimit = 5000 GibWoundLimit = 14 GibSound = SoundContainer diff --git a/Ronin.rte/Craft/Rocket/RocketMK1.ini b/Ronin.rte/Craft/Rocket/RocketMK1.ini index 4de2694a7..2299d2d14 100644 --- a/Ronin.rte/Craft/Rocket/RocketMK1.ini +++ b/Ronin.rte/Craft/Rocket/RocketMK1.ini @@ -117,11 +117,8 @@ AddActor = ACRocket DeepCheck = 1 BodyHitSound = SoundContainer CopyOf = Metal Body Blunt Hit - Status = 0 Health = 100 ImpulseDamageThreshold = 8000 - Team = 0 - AimAngle = 0 AimDistance = 30 Perceptiveness = 0.3 CharHeight = 150 diff --git a/Ronin.rte/Devices/Tools/Shovel/Shovel.ini b/Ronin.rte/Devices/Tools/Shovel/Shovel.ini index a99b3d364..8642d8403 100644 --- a/Ronin.rte/Devices/Tools/Shovel/Shovel.ini +++ b/Ronin.rte/Devices/Tools/Shovel/Shovel.ini @@ -64,11 +64,9 @@ AddAmmo = Magazine JointStiffness = 1 DrawAfterParent = 0 RoundCount = -1 - RTTRatio = 0 Discardable = 0 RegularRound = Round CopyOf = Round Ronin Shovel - TracerRound = None AddDevice = HDFirearm diff --git a/Ronin.rte/Devices/Weapons/357Magnum/357Magnum.ini b/Ronin.rte/Devices/Weapons/357Magnum/357Magnum.ini index 7d63615c9..44162de94 100644 --- a/Ronin.rte/Devices/Weapons/357Magnum/357Magnum.ini +++ b/Ronin.rte/Devices/Weapons/357Magnum/357Magnum.ini @@ -36,8 +36,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Ronin 357 Magnum Mass = 0.5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -48,7 +46,6 @@ AddAmmo = Magazine Discardable = 0 RegularRound = Round CopyOf = Round Ronin 357 Magnum - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Ronin.rte/Devices/Weapons/DoubleBarreledShotgun/DoubleBarreledShotgun.ini b/Ronin.rte/Devices/Weapons/DoubleBarreledShotgun/DoubleBarreledShotgun.ini index 2245d4bbc..c95b1316a 100644 --- a/Ronin.rte/Devices/Weapons/DoubleBarreledShotgun/DoubleBarreledShotgun.ini +++ b/Ronin.rte/Devices/Weapons/DoubleBarreledShotgun/DoubleBarreledShotgun.ini @@ -37,8 +37,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Ronin Double-Barrel Shotgun Mass = 0.5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -46,11 +44,9 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 2 - RTTRatio = 0 Discardable = 0 RegularRound = Round CopyOf = Round Ronin Double-Barrel Shotgun - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Ronin.rte/Devices/Weapons/K98K/K98K.ini b/Ronin.rte/Devices/Weapons/K98K/K98K.ini index 8a34d7dc6..7a78e0dc5 100644 --- a/Ronin.rte/Devices/Weapons/K98K/K98K.ini +++ b/Ronin.rte/Devices/Weapons/K98K/K98K.ini @@ -38,8 +38,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Ronin Kar98 Mass = 1.50 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -47,10 +45,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 5 - RTTRatio = 0 RegularRound = Round CopyOf = Round Ronin Kar98 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini b/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini index 2436d5ce7..4c34a42e7 100644 --- a/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini +++ b/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini @@ -70,10 +70,8 @@ AddAmmo = Magazine Y = 1 DrawAfterParent = 0 RoundCount = 8 - RTTRatio = 0 RegularRound = Round CopyOf = Round Ronin M1 Garand - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Ronin.rte/Devices/Weapons/M79/M79.ini b/Ronin.rte/Devices/Weapons/M79/M79.ini index 2e22810fc..0ec04341d 100644 --- a/Ronin.rte/Devices/Weapons/M79/M79.ini +++ b/Ronin.rte/Devices/Weapons/M79/M79.ini @@ -145,8 +145,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Ronin M79 Grenade Launcher Impact Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -154,10 +152,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round Ronin M79 Grenade Launcher Impact - TracerRound = None Discardable = 0 AIBlastRadius = 180 diff --git a/Ronin.rte/Devices/Weapons/Model590/Model590.ini b/Ronin.rte/Devices/Weapons/Model590/Model590.ini index 6c8b39a73..fa9bacd76 100644 --- a/Ronin.rte/Devices/Weapons/Model590/Model590.ini +++ b/Ronin.rte/Devices/Weapons/Model590/Model590.ini @@ -27,7 +27,6 @@ AddAmmo = Round G = 155 B = 155 TrailLength = 10 - Shell = None FireVelocity = 95 Separation = 9 @@ -35,8 +34,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Ronin Model 590 Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -44,11 +41,9 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 5 - RTTRatio = 0 Discardable = 0 RegularRound = Round CopyOf = Round Ronin Model 590 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Ronin.rte/Devices/Weapons/RPG7/RPG7.ini b/Ronin.rte/Devices/Weapons/RPG7/RPG7.ini index 1e3c982cd..c9a8c9a36 100644 --- a/Ronin.rte/Devices/Weapons/RPG7/RPG7.ini +++ b/Ronin.rte/Devices/Weapons/RPG7/RPG7.ini @@ -51,6 +51,8 @@ AddAmmo = AEmitter SmokeTrailLifeTime = 500 AddCustomValue = NumberValue SmokeTrailRadius = 1 + AddCustomValue = NumberValue + SmokeTrailTwirl = 4 SpriteFile = ContentFile FilePath = Ronin.rte/Devices/Weapons/RPG7/RPG.png FrameCount = 1 @@ -274,9 +276,6 @@ AddAmmo = Magazine DeepCheck = 1 JointStrength = 200 JointStiffness = 1 - JointOffset = Vector - X = 0 - Y = 0 ParentOffset = Vector X = 15 Y = -1 @@ -284,7 +283,6 @@ AddAmmo = Magazine RoundCount = 1 RegularRound = Round CopyOf = Round Ronin RPG-7 - TracerRound = None Discardable = 0 AIBlastRadius = 60 @@ -370,8 +368,6 @@ AddDevice = HDFirearm SharpShakeRange = 1 NoSupportFactor = 1 ParticleSpreadRange = 0 - ShellSpreadRange = 8 - ShellAngVelRange = 2 MuzzleOffset = Vector X = 15 Y = 0 diff --git a/Ronin.rte/Devices/Weapons/RocketPropelledChainsaw/RocketPropelledChainsaw.ini b/Ronin.rte/Devices/Weapons/RocketPropelledChainsaw/RocketPropelledChainsaw.ini index fabe7be07..e3dd7761b 100644 --- a/Ronin.rte/Devices/Weapons/RocketPropelledChainsaw/RocketPropelledChainsaw.ini +++ b/Ronin.rte/Devices/Weapons/RocketPropelledChainsaw/RocketPropelledChainsaw.ini @@ -199,8 +199,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Ronin RPC Mass = 7 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -211,7 +209,6 @@ AddAmmo = Magazine Discardable = 0 RegularRound = Round CopyOf = Round Ronin RPC - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Ronin.rte/Devices/Weapons/SPAS12/SPAS12.ini b/Ronin.rte/Devices/Weapons/SPAS12/SPAS12.ini index 6fba273e4..b7394d982 100644 --- a/Ronin.rte/Devices/Weapons/SPAS12/SPAS12.ini +++ b/Ronin.rte/Devices/Weapons/SPAS12/SPAS12.ini @@ -52,11 +52,9 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 8 - RTTRatio = 0 Discardable = 0 RegularRound = Round CopyOf = Round Ronin SPAS 12 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Techion.rte/Actors/Infantry/SilverMan/SilverMan.ini b/Techion.rte/Actors/Infantry/SilverMan/SilverMan.ini index d3edae520..1727270f5 100644 --- a/Techion.rte/Actors/Infantry/SilverMan/SilverMan.ini +++ b/Techion.rte/Actors/Infantry/SilverMan/SilverMan.ini @@ -12,7 +12,6 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -5 Y = -5 - FrameCount = 1 AngularVel = 5 AtomGroup = AtomGroup AutoGenerate = 1 @@ -62,7 +61,6 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -4 Y = -8 - FrameCount = 1 AngularVel = 5 AtomGroup = AtomGroup AutoGenerate = 1 @@ -112,7 +110,6 @@ AddEffect = MOSRotating SpriteOffset = Vector X = -5 Y = -4 - FrameCount = 1 AngularVel = 5 AtomGroup = AtomGroup AutoGenerate = 1 @@ -288,7 +285,6 @@ AddActor = Arm X = -4 Y = -2 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Techion.rte/Actors/Infantry/SilverMan/HandFGA.png MaxLength = 14 @@ -544,11 +540,8 @@ AddActor = AHuman CopyOf = Robot Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 2800 - Team = 0 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 100 diff --git a/Techion.rte/Actors/Infantry/WhiteBot/WhiteBot.ini b/Techion.rte/Actors/Infantry/WhiteBot/WhiteBot.ini index 56e1e807d..094177a3c 100644 --- a/Techion.rte/Actors/Infantry/WhiteBot/WhiteBot.ini +++ b/Techion.rte/Actors/Infantry/WhiteBot/WhiteBot.ini @@ -5,7 +5,6 @@ AddEffect = MOSRotating PresetName = Techion Whitebot Head Gib A Mass = 2 - Sharpness = 1 HitsMOs = 1 GetsHitByMOs = 1 SpriteFile = ContentFile @@ -56,7 +55,6 @@ AddEffect = MOSRotating AddEffect = MOSRotating PresetName = Techion Whitebot Torso Gib A Mass = 18 - Sharpness = 1 HitsMOs = 1 GetsHitByMOs = 1 SpriteFile = ContentFile @@ -111,7 +109,6 @@ AddEffect = MOSRotating AddActor = Attachable PresetName = Techion Whitebot Chest Plate A Mass = 4 - Sharpness = 1 HitsMOs = 1 GetsHitByMOs = 1 CollidesWithTerrainWhenAttached = 1 @@ -253,7 +250,7 @@ AddActor = Arm JointStrength = 240 JointStiffness = 0.5 BreakWound = AEmitter - CopyOf = Dent Metal + CopyOf = Leaking Machinery JointOffset = Vector X = -4 Y = -1 @@ -511,11 +508,8 @@ AddActor = AHuman CopyOf = Robot Death DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 3000 - Team = 0 - AimAngle = 0 AimDistance = 30 Perceptiveness = 1 CharHeight = 100 diff --git a/Techion.rte/Devices/Explosives/NanoSwarmGrenade/NanoSwarmGrenade.ini b/Techion.rte/Devices/Explosives/NanoSwarmGrenade/NanoSwarmGrenade.ini index 0c59d55a3..3d1e84990 100644 --- a/Techion.rte/Devices/Explosives/NanoSwarmGrenade/NanoSwarmGrenade.ini +++ b/Techion.rte/Devices/Explosives/NanoSwarmGrenade/NanoSwarmGrenade.ini @@ -24,9 +24,6 @@ AddEffect = AEmitter Resolution = 1 Depth = 0 DeepCheck = 0 - EmissionOffset = Vector - X = 0 - Y = 0 EmissionSound = SoundContainer AttenuationStartDistance = 175 AddSound = ContentFile @@ -36,12 +33,7 @@ AddEffect = AEmitter EmissionsIgnoreThis = 1 ParticlesPerMinute = 1 BurstSize = 0 - BurstScale = 0 BurstTriggered = 1 - BurstSpacing = 0 - EmissionDamage = 0 - Flash = None - FlashOnlyOnBurst = 0 AddEffect = MOPixel @@ -142,8 +134,6 @@ AddEffect = MOPixel AddDevice = MOSRotating PresetName = Nanoswarm Canister Effect Mass = 0 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup diff --git a/Techion.rte/Devices/Shared.ini b/Techion.rte/Devices/Shared.ini index 5983cf263..78c8f6138 100644 --- a/Techion.rte/Devices/Shared.ini +++ b/Techion.rte/Devices/Shared.ini @@ -144,11 +144,6 @@ AddEffect = MOPixel Atom = Atom Material = Material CopyOf = Bullet Metal - TrailColor = Color - R = 255 - G = 255 - B = 255 - TrailLength = 0 ScreenEffect = ContentFile FilePath = Base.rte/Effects/Glows/BlueBig.png EffectStartStrength = 0.3 @@ -183,7 +178,7 @@ AddParticle = MOPixel R = 255 G = 255 B = 255 - TrailLength = 8 + TrailLength = 7 ScreenEffect = ContentFile FilePath = Techion.rte/Devices/Shared/Glows/PulseShotGlow.png EffectAlwaysShows = 1 diff --git a/Techion.rte/Devices/Tools/Nanolyzer/Nanolyzer.ini b/Techion.rte/Devices/Tools/Nanolyzer/Nanolyzer.ini index eb741f27b..76c17248e 100644 --- a/Techion.rte/Devices/Tools/Nanolyzer/Nanolyzer.ini +++ b/Techion.rte/Devices/Tools/Nanolyzer/Nanolyzer.ini @@ -209,20 +209,13 @@ AddAmmo = Round Atom = Atom Material = Material CopyOf = Air - TrailColor = Color - R = 255 - G = 0 - B = 255 - TrailLength = 0 ScreenEffect = ContentFile FilePath = Base.rte/Effects/Glows/BlueTiny.png EffectStartTime = 0 EffectStopTime = 400 EffectStartStrength = 1 EffectStopStrength = 0 - Shell = None FireVelocity = 12 - ShellVelocity = 0 Separation = 5 @@ -234,17 +227,13 @@ AddAmmo = Round PresetName = Techion Nanolyzer Particle B Mass = 0.1 Sharpness = 5 - Shell = None FireVelocity = 16 - ShellVelocity = 0 Separation = 5 AddAmmo = Magazine PresetName = Magazine Techion Nanolyzer Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -349,14 +338,9 @@ AddDevice = HDFirearm SharpShakeRange = 1 NoSupportFactor = 2 ParticleSpreadRange = 30 - ShellSpreadRange = 0 - ShellAngVelRange = 0 MuzzleOffset = Vector X = 5 Y = 0 - EjectionOffset = Vector - X = -3 - Y = -3 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 diff --git a/Techion.rte/Devices/Weapons/GigaPulsar/GigaPulsar.ini b/Techion.rte/Devices/Weapons/GigaPulsar/GigaPulsar.ini index ee87c53ea..ab44c9835 100644 --- a/Techion.rte/Devices/Weapons/GigaPulsar/GigaPulsar.ini +++ b/Techion.rte/Devices/Weapons/GigaPulsar/GigaPulsar.ini @@ -7,8 +7,6 @@ AddEffect = AEmitter Mass = 0 PinStrength = 4000 LifeTime = 5 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -71,12 +69,10 @@ AddAmmo = Magazine JointStiffness = 1 DrawAfterParent = 0 RoundCount = 80 - Discardable = 1 RegularRound = Round CopyOf = Round Techion Pulse Rifle PresetName = Round Techion Giga Pulsar FireVelocity = 70 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Techion.rte/Devices/Weapons/MicroPulsar/MicroPulsar.ini b/Techion.rte/Devices/Weapons/MicroPulsar/MicroPulsar.ini index c85be26ec..3911c9c30 100644 --- a/Techion.rte/Devices/Weapons/MicroPulsar/MicroPulsar.ini +++ b/Techion.rte/Devices/Weapons/MicroPulsar/MicroPulsar.ini @@ -14,11 +14,16 @@ AddParticle = MOPixel GlobalAccScalar = 0.1 Color = Color R = 255 - G = 0 + G = 255 B = 255 Atom = Atom Material = Material CopyOf = Air + TrailColor = Color + R = 255 + G = 255 + B = 255 + TrailLength = 4 ScreenEffect = ContentFile FilePath = Techion.rte/Devices/Shared/Glows/PulseShotGlowShort.png EffectAlwaysShows = 1 @@ -35,8 +40,6 @@ AddParticle = MOPixel AddAmmo = Magazine PresetName = Magazine Techion Micro Pulsar Mass = 1 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -45,7 +48,6 @@ AddAmmo = Magazine JointStiffness = 1 RoundCount = 12 Discardable = 0 - RTTRatio = 0 RegularRound = Round PresetName = Round Techion Micro Pulsar ParticleCount = 1 @@ -57,7 +59,6 @@ AddAmmo = Magazine AIFireVel = 500 ShellVelocity = 0 Separation = 5 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Techion.rte/Devices/Weapons/NanoRifle/NanoRifle.ini b/Techion.rte/Devices/Weapons/NanoRifle/NanoRifle.ini index 997dc9c07..ec71b4de7 100644 --- a/Techion.rte/Devices/Weapons/NanoRifle/NanoRifle.ini +++ b/Techion.rte/Devices/Weapons/NanoRifle/NanoRifle.ini @@ -213,10 +213,8 @@ AddAmmo = Magazine Y = 1 DrawAfterParent = 0 RoundCount = 2 - RTTRatio = 0 RegularRound = Round CopyOf = Round Techion Nano Rifle - TracerRound = None Discardable = 1 diff --git a/Techion.rte/Devices/Weapons/Nucleo/Nucleo.ini b/Techion.rte/Devices/Weapons/Nucleo/Nucleo.ini index 64dc29f98..622f4105a 100644 --- a/Techion.rte/Devices/Weapons/Nucleo/Nucleo.ini +++ b/Techion.rte/Devices/Weapons/Nucleo/Nucleo.ini @@ -167,8 +167,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Techion Nucleo Mass = 0 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -176,10 +174,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 3 - RTTRatio = 0 RegularRound = Round CopyOf = Round Techion Nucleo - TracerRound = None Discardable = 0 diff --git a/Techion.rte/Devices/Weapons/PulseRifle/PulseRifle.ini b/Techion.rte/Devices/Weapons/PulseRifle/PulseRifle.ini index 1e7db05e0..a10a36de1 100644 --- a/Techion.rte/Devices/Weapons/PulseRifle/PulseRifle.ini +++ b/Techion.rte/Devices/Weapons/PulseRifle/PulseRifle.ini @@ -17,9 +17,6 @@ AddAmmo = Magazine JointOffset = Vector X = -1 Y = -2 - ParentOffset = Vector - X = 0 - Y = 0 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -48,7 +45,6 @@ AddAmmo = Magazine FireVelocity = 80 ShellVelocity = 0 Separation = 5 - TracerRound = None /////////////////////////////////////////////////////////////////////// diff --git a/Uzira.rte/Actors/Undead/Skeletons/Skeletons.ini b/Uzira.rte/Actors/Undead/Skeletons/Skeletons.ini index ea79edf9c..7d8a516b9 100644 --- a/Uzira.rte/Actors/Undead/Skeletons/Skeletons.ini +++ b/Uzira.rte/Actors/Undead/Skeletons/Skeletons.ini @@ -590,7 +590,6 @@ AddActor = Arm X = -3 Y = -2 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Uzira.rte/Actors/Undead/Skeletons/Hand.png MaxLength = 14 @@ -927,9 +926,7 @@ AddActor = AHuman CopyOf = Bone Crack DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 - AimAngle = 0 AimDistance = 30 Perceptiveness = 0.6 CharHeight = 90 diff --git a/Uzira.rte/Actors/Undead/Zombies/Zombies.ini b/Uzira.rte/Actors/Undead/Zombies/Zombies.ini index 52b63ac6d..6ad915727 100644 --- a/Uzira.rte/Actors/Undead/Zombies/Zombies.ini +++ b/Uzira.rte/Actors/Undead/Zombies/Zombies.ini @@ -780,7 +780,6 @@ AddActor = Arm X = -3 Y = -1 DrawAfterParent = 1 - HeldDevice = None Hand = ContentFile FilePath = Uzira.rte/Actors/Undead/Zombies/HandFGA.png MaxLength = 14 @@ -1275,7 +1274,6 @@ AddActor = AHuman SpriteOffset = Vector X = -5 Y = -16 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Dry Flesh Entry ExitWound = AEmitter @@ -1302,10 +1300,8 @@ AddActor = AHuman CopyOf = Flesh Body Blunt Hit DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 1000 - AimAngle = 0 AimDistance = 30 Perceptiveness = 0.4 CharHeight = 90 @@ -1607,16 +1603,13 @@ AddActor = AHuman CopyOf = Culled Clone PresetName = Thin Culled Clone Description = A thin half-baked clone, rejected because of various flaws from the production plant and sold at a discount without jetpack and armor. They are very effective in large groups armed with cheap weapons. - Mass = 26.77 - HitsMOs = 1 - GetsHitByMOs = 1 + Mass = 23.77 SpriteFile = ContentFile FilePath = Uzira.rte/Actors/Undead/Zombies/TorsoC.png FrameCount = 1 SpriteOffset = Vector X = -5 Y = -16 - AngularVel = 0 AtomGroup = AtomGroup AutoGenerate = 1 Material = Material @@ -1705,7 +1698,6 @@ AddActor = AHuman SpriteOffset = Vector X = -5 Y = -16 - AngularVel = 0 EntryWound = AEmitter CopyOf = Wound Dry Flesh Entry ExitWound = AEmitter @@ -1732,10 +1724,8 @@ AddActor = AHuman CopyOf = Flesh Body Blunt Hit DeviceSwitchSound = SoundContainer CopyOf = Device Switch - Status = 0 Health = 100 ImpulseDamageThreshold = 1500 - AimAngle = 0 AimDistance = 30 Perceptiveness = 0.4 CharHeight = 90 diff --git a/Uzira.rte/Devices/Weapons/Blunderbuss/Blunderbuss.ini b/Uzira.rte/Devices/Weapons/Blunderbuss/Blunderbuss.ini index 03b155f6e..14d09772b 100644 --- a/Uzira.rte/Devices/Weapons/Blunderbuss/Blunderbuss.ini +++ b/Uzira.rte/Devices/Weapons/Blunderbuss/Blunderbuss.ini @@ -17,8 +17,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Uzira Blunderbuss Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -26,10 +24,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round Uzira Blunderbuss - TracerRound = None Discardable = 0 @@ -110,14 +106,9 @@ AddDevice = HDFirearm SharpShakeRange = 2 NoSupportFactor = 2 ParticleSpreadRange = 15 - ShellSpreadRange = 8 - ShellAngVelRange = 2 MuzzleOffset = Vector X = 12 Y = 0 - EjectionOffset = Vector - X = -4 - Y = -2 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 diff --git a/Uzira.rte/Devices/Weapons/Blunderpop/Blunderpop.ini b/Uzira.rte/Devices/Weapons/Blunderpop/Blunderpop.ini index 6cab02df2..066e2a4d9 100644 --- a/Uzira.rte/Devices/Weapons/Blunderpop/Blunderpop.ini +++ b/Uzira.rte/Devices/Weapons/Blunderpop/Blunderpop.ini @@ -35,8 +35,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Uzira Blunderpop Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -44,10 +42,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round Uzira Blunderpop - TracerRound = None Discardable = 0 @@ -129,14 +125,9 @@ AddDevice = HDFirearm SharpShakeRange = 3 NoSupportFactor = 3 ParticleSpreadRange = 20 - ShellSpreadRange = 8 - ShellAngVelRange = 2 MuzzleOffset = Vector X = 2 Y = -3 - EjectionOffset = Vector - X = -4 - Y = -2 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1 diff --git a/Uzira.rte/Devices/Weapons/Musket/Musket.ini b/Uzira.rte/Devices/Weapons/Musket/Musket.ini index 7a1bea9cd..f954ed6d0 100644 --- a/Uzira.rte/Devices/Weapons/Musket/Musket.ini +++ b/Uzira.rte/Devices/Weapons/Musket/Musket.ini @@ -34,8 +34,6 @@ AddAmmo = Round AddAmmo = Magazine PresetName = Magazine Uzira Musket Mass = 2 - HitsMOs = 0 - GetsHitByMOs = 0 SpriteFile = ContentFile FilePath = Base.rte/Null.png AtomGroup = AtomGroup @@ -43,10 +41,8 @@ AddAmmo = Magazine JointStrength = 200 JointStiffness = 1 RoundCount = 1 - RTTRatio = 0 RegularRound = Round CopyOf = Round Uzira Musket - TracerRound = None Discardable = 0 @@ -131,14 +127,9 @@ AddDevice = HDFirearm SharpShakeRange = 4 NoSupportFactor = 2 ParticleSpreadRange = 0 - ShellSpreadRange = 8 - ShellAngVelRange = 2 MuzzleOffset = Vector X = 15 Y = 0 - EjectionOffset = Vector - X = -4 - Y = -2 AddGib = Gib GibParticle = MOPixel CopyOf = Spark Yellow 1