Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 4465837

Browse files
fourZKfourZK
committed
Some remaining minor fixes and stuff
1 parent fd4c352 commit 4465837

File tree

11 files changed

+95
-41
lines changed

11 files changed

+95
-41
lines changed

‎Base.rte/Activities/MetaFight.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,8 @@ function MetaFight:UpdateActivity()
976976
self:DisableAIs(false, Activity.NOTEAM);
977977
self:InitAIs()
978978
-- Reset the mouse value and pathfinding so it'll know about the newly placed stuff
979-
UInputMan:SetMouseValueMagnitude(0);
979+
-- TODO: Find out if this needs to be fixed
980+
--UInputMan:SetMouseValueMagnitude(0);
980981
SceneMan.Scene:ResetPathFinding();
981982
-- Start the in-game music track
982983
AudioMan:ClearMusicQueue();

‎Base.rte/Effects/Pyro.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ AddEffect = Attachable
3030
JointStiffness = 1
3131
ScreenEffect = ContentFile
3232
FilePath = Base.rte/Effects/Glows/YellowSmall.png
33-
DrawAfterParent = 0
33+
DrawAfterParent = 1
3434

3535
//To-do: finish AEmitter variants of muzzle flashes
3636
AddEffect = AEmitter
@@ -59,7 +59,7 @@ AddEffect = AEmitter
5959
JointStiffness = 1
6060
ScreenEffect = ContentFile
6161
FilePath = Base.rte/Effects/Glows/YellowSmall.png
62-
DrawAfterParent = 0
62+
DrawAfterParent = 1
6363
AddEmission = Emission
6464
EmittedParticle = MOPixel
6565
CopyOf = Spark Yellow 1

‎Base.rte/Sounds.ini

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ AddSoundContainer = SoundContainer
729729

730730
AddSoundContainer = SoundContainer
731731
PresetName = Robot Head Impact
732-
AttenuationStartDistance = 100
732+
AttenuationStartDistance = 130
733733
AddSound = ContentFile
734734
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/HeadImpact1.flac
735735
AddSound = ContentFile
@@ -761,6 +761,70 @@ AddSoundContainer = SoundContainer
761761
FilePath = Base.rte/Sounds/Penetration/Robot/HeadGib7.flac
762762

763763

764+
AddSoundContainer = SoundContainer
765+
PresetName = Robot Torso Impact
766+
AttenuationStartDistance = 125
767+
AddSound = ContentFile
768+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoImpact1.flac
769+
AddSound = ContentFile
770+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoImpact2.flac
771+
AddSound = ContentFile
772+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoImpact3.flac
773+
AddSound = ContentFile
774+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoImpact4.flac
775+
776+
777+
AddSoundContainer = SoundContainer
778+
PresetName = Robot Torso Gib
779+
AttenuationStartDistance = 140
780+
AddSound = ContentFile
781+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoGib1.flac
782+
AddSound = ContentFile
783+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoGib2.flac
784+
AddSound = ContentFile
785+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoGib3.flac
786+
AddSound = ContentFile
787+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoGib4.flac
788+
AddSound = ContentFile
789+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoGib5.flac
790+
AddSound = ContentFile
791+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoGib6.flac
792+
AddSound = ContentFile
793+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/TorsoGib7.flac
794+
795+
796+
AddSoundContainer = SoundContainer
797+
PresetName = Robot Limb Impact
798+
AttenuationStartDistance = 120
799+
AddSound = ContentFile
800+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbImpact1.flac
801+
AddSound = ContentFile
802+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbImpact2.flac
803+
AddSound = ContentFile
804+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbImpact3.flac
805+
AddSound = ContentFile
806+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbImpact4.flac
807+
808+
809+
AddSoundContainer = SoundContainer
810+
PresetName = Robot Limb Gib
811+
AttenuationStartDistance = 130
812+
AddSound = ContentFile
813+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbGib1.flac
814+
AddSound = ContentFile
815+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbGib2.flac
816+
AddSound = ContentFile
817+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbGib3.flac
818+
AddSound = ContentFile
819+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbGib4.flac
820+
AddSound = ContentFile
821+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbGib5.flac
822+
AddSound = ContentFile
823+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbGib6.flac
824+
AddSound = ContentFile
825+
FilePath = Base.rte/Sounds/Penetration/Robot/Generic/LimbGib7.flac
826+
827+
764828
///////////////////////////////////////////////////////////////////////
765829
// Weapons
766830

‎Coalition.rte/Devices/Weapons/MissileLauncher/Missile.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ function Create(self)
77
local mo = MovableMan:GetMOFromID(self:GetNumberValue("TargetID"));
88
if mo and IsMOSRotating(mo) then
99
self.target = ToMOSRotating(mo);
10-
AudioMan:PlaySound("Base.rte/Devices/Explosives/AntiPersonnelMine/Sounds/MineDetonate.flac", self.Pos);
10+
self.targetSound = CreateSoundContainer("Explosive Device Detonate", "Base.rte");
11+
self.targetSound:Play(self.Pos);
1112
end
1213
end
1314
self.lifeTimer:SetSimTimeLimitMS(self.Lifetime - math.ceil(TimerMan.DeltaTimeMS));

‎Dummy.rte/Devices/Tools/Shielder/Shielder.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ AddAmmo = MOSRotating
108108
AutoGenerate = 1
109109
Material = Material
110110
CopyOf = Door Metal
111-
Resolution = 4
111+
Resolution = 2
112112
Depth = 0
113113
DeepGroup = AtomGroup
114114
AutoGenerate = 1
115115
Material = Material
116116
CopyOf = Door Metal
117-
Resolution = 4
117+
Resolution = 2
118118
Depth = 10
119119
DeepCheck = 0
120120
/*To-do: enable this once ScreenEffect works properly on MOSRotating
@@ -272,7 +272,7 @@ AddAmmo = Magazine
272272
AddDevice = HDFirearm
273273
PresetName = Shielder
274274
Description = This tool materializes a temporary energy shield in front of the user for protection and/or slowing down enemy pursuers.
275-
AddToGroup = Tools
275+
AddToGroup = Shields
276276
Mass = 8
277277
HitsMOs = 0
278278
GetsHitByMOs = 1
@@ -306,7 +306,6 @@ AddDevice = HDFirearm
306306
X = -6
307307
Y = 4
308308
DrawAfterParent = 0
309-
DualWieldable = 1
310309
StanceOffset = Vector
311310
X = 8
312311
Y = 5

‎Dummy.rte/Devices/Weapons/FragNailer/FragNailerBomb.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function Update(self)
1919
for i = 1, dots do
2020
local checkPos = self.Pos + trace * (i/dots);
2121
local checkPix = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y);
22-
if checkPix ~= rte.NoMOID and (self.ID == rte.NoMOID or (self.ID ~= rte.NoMOID and checkPix ~= self.ID)) and MovableMan:GetMOFromID(checkPix).Team ~= self.Team then
22+
if checkPix ~= rte.NoMOID and (self.ID == rte.NoMOID or checkPix ~= self.ID) and MovableMan:GetMOFromID(checkPix).Team ~= self.Team then
2323
checkPos = checkPos + SceneMan:ShortestDistance(checkPos, self.Pos, SceneMan.SceneWrapsX):SetMagnitude(3);
2424

2525
self.target = MovableMan:GetMOFromID(checkPix);

‎Imperatus.rte/Actors/Infantry/AllPurpose/AllPurposeRobot.ini

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@ AddActor = Arm
299299
MinVelocity = 5
300300
GibImpulseLimit = 480
301301
GibWoundLimit = 10
302+
GibSound = SoundContainer
303+
CopyOf = Robot Limb Gib
302304

303305

304306
AddActor = Arm
@@ -452,6 +454,8 @@ AddActor = Leg
452454
MinVelocity = 5
453455
GibImpulseLimit = 700
454456
GibWoundLimit = 10
457+
GibSound = SoundContainer
458+
CopyOf = Robot Limb Gib
455459

456460

457461
AddActor = Leg
@@ -799,4 +803,6 @@ AddActor = AHuman
799803
MaxVelocity = 10
800804
MinVelocity = 1
801805
GibImpulseLimit = 4000
802-
GibWoundLimit = 30
806+
GibWoundLimit = 30
807+
GibSound = SoundContainer
808+
CopyOf = Robot Torso Gib

‎Imperatus.rte/Actors/Infantry/Combat/CombatRobot.ini

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ AddEffect = Attachable
126126
GibImpulseLimit = 1000
127127
GibWoundLimit = 11
128128
GibSound = SoundContainer
129-
CopyOf = Bone Crack
129+
CopyOf = Robot Limb Gib
130130
AddGib = Gib
131131
GibParticle = MOSRotating
132132
CopyOf = Gib Metal Grey Small A
@@ -404,6 +404,8 @@ AddActor = Leg
404404
MinVelocity = 5
405405
GibImpulseLimit = 1000
406406
GibWoundLimit = 15
407+
GibSound = SoundContainer
408+
CopyOf = Robot Limb Gib
407409

408410

409411
AddActor = Leg
@@ -624,4 +626,6 @@ AddActor = AHuman
624626
MaxVelocity = 10
625627
MinVelocity = 1
626628
GibImpulseLimit = 4200
627-
GibWoundLimit = 35
629+
GibWoundLimit = 35
630+
GibSound = SoundContainer
631+
CopyOf = Robot Torso Gib

‎Ronin.rte/Actors/Brains/Commander/RoninCommander.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ AddActor = AHuman
3232
AddToGroup = Brains
3333
Description = MultiLineText
3434
AddLine = Established Ronin Commander unit. Capable of remote-controlling units like any other commanding Brain.
35-
AddLine = Double-tap the Crouch key to lunge out!
35+
AddLine = Double-tap the Crouch key to perform a tactical lunge!
3636
Mass = 50
3737
GoldValue = 125
3838
HitsMOs = 1

‎Ronin.rte/Devices/Shared/Throwable.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ function OnCollideWithMO(self, mo, rootMO)
1212
if force.Magnitude * self.Sharpness > mo.Material.StructuralIntegrity then
1313
local woundName = mo:GetEntryWoundPresetName();
1414
if woundName ~= "" then
15-
local wound = CreateAEmitter(woundName);
16-
local dist = SceneMan:ShortestDistance(mo.Pos, self.Pos, SceneMan.SceneWrapsX):RadRotate(-mo.RotAngle);
17-
wound.InheritedRotAngleOffset = dist.AbsRadAngle;
18-
mo:AddWound(wound, dist:SetMagnitude(dist.Magnitude - self.Radius), true);
15+
local wound = CreateAEmitter(woundName);
16+
local dist = SceneMan:ShortestDistance(mo.Pos, self.Pos, SceneMan.SceneWrapsX);
17+
local stickOffset = Vector(dist.X * mo.FlipFactor, dist.Y):RadRotate(-mo.RotAngle * mo.FlipFactor);
18+
wound.InheritedRotAngleOffset = stickOffset.AbsRadAngle - (mo.HFlipped and math.pi or 0);
19+
mo:AddWound(wound, Vector(stickOffset.X, stickOffset.Y):SetMagnitude(stickOffset.Magnitude - self.Radius), true);
1920
end
2021
end
2122
self.thrown = false;

0 commit comments

Comments
 (0)