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

Commit ecee367

Browse files
trauntstraunts
committed
Merge branch 'development' into GI-251-ACraft-MaxMass-update
2 parents 26eb6b8 + 467df76 commit ecee367

File tree

41 files changed

+263
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+263
-49
lines changed

‎Base.rte/AI/HumanBehaviors.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,7 @@ function HumanBehaviors.ThrowTarget(AI, Owner, Abort)
27132713
end
27142714
elseif MO.ClassName == "ACrab" then
27152715
AI.Target = ToACrab(MO)
2716-
local Legs = AI.Target.LFGLeg or AI.Target.LFGLeg or AI.Target.LBGLeg or AI.Target.RFGLeg -- the legs
2716+
local Legs = AI.Target.LeftFGLeg or AI.Target.RightFGLeg or AI.Target.LeftBGLeg or AI.Target.RightFGLeg -- the legs
27172717
if Legs then
27182718
AimPoint = Legs.Pos
27192719
end

‎Base.rte/Activities/MetaFight.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ function MetaFight:StartActivity()
581581
end
582582

583583
-- Further reduce value if actors are badly damaged in terms of wounds
584-
if Act.TotalWoundCount / Act.TotalWoundLimit > 0.5 then
584+
if Act.WoundCount / Act.GibWoundLimit > 0.5 then
585585
value = value * 0.5
586586
end
587587

‎Base.rte/Actors/Brains/Brainbot/Brainbot.ini

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ AddActor = Attachable
3535
JointStrength = 1000
3636
JointStiffness = 0.3
3737
BreakWound = AEmitter
38+
CopyOf = Leaking Machinery
39+
ParentBreakWound = AEmitter
3840
CopyOf = Leaking Machinery Heavy
3941
JointOffset = Vector
4042
X = 0.5
@@ -345,12 +347,15 @@ AddActor = Arm
345347
JointStiffness = 0.5
346348
BreakWound = AEmitter
347349
CopyOf = Leaking Machinery
350+
ParentBreakWound = AEmitter
351+
CopyOf = Leaking Machinery
348352
JointOffset = Vector
349353
X = -3
350354
Y = -1
351355
DrawAfterParent = 1
352356
Hand = ContentFile
353357
FilePath = Base.rte/Actors/Brains/Brainbot/HandFG.png
358+
GripStrength = 100
354359
MaxLength = 13
355360
IdleOffset = Vector
356361
X = 7
@@ -443,6 +448,8 @@ AddActor = Attachable
443448
JointStiffness = 0.5
444449
BreakWound = AEmitter
445450
CopyOf = Leaking Machinery
451+
ParentBreakWound = AEmitter
452+
CopyOf = Leaking Machinery
446453
JointOffset = Vector
447454
X = 3
448455
Y = 0
@@ -488,6 +495,8 @@ AddActor = Leg
488495
JointStiffness = 0.5
489496
BreakWound = AEmitter
490497
CopyOf = Leaking Machinery
498+
ParentBreakWound = AEmitter
499+
CopyOf = Leaking Machinery
491500
JointOffset = Vector
492501
X = -5
493502
Y = 2

‎Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ AddEffect = Attachable
304304
JointStiffness = 0.1
305305
BreakWound = AEmitter
306306
CopyOf = Leaking Machinery
307+
ParentBreakWound = AEmitter
308+
CopyOf = Leaking Machinery
307309
JointOffset = Vector
308310
X = 0
309311
Y = 6
@@ -366,12 +368,15 @@ AddActor = Arm
366368
JointStiffness = 0.5
367369
BreakWound = AEmitter
368370
CopyOf = Leaking Machinery
371+
ParentBreakWound = AEmitter
372+
CopyOf = Leaking Machinery
369373
JointOffset = Vector
370374
X = -3.5
371375
Y = -1
372376
DrawAfterParent = 1
373377
Hand = ContentFile
374378
FilePath = Base.rte/Actors/Infantry/GreenDummy/HandFGA.png
379+
GripStrength = 100
375380
MaxLength = 12
376381
IdleOffset = Vector
377382
X = 5
@@ -473,6 +478,8 @@ AddActor = Attachable
473478
JointStiffness = 0.5
474479
BreakWound = AEmitter
475480
CopyOf = Leaking Machinery
481+
ParentBreakWound = AEmitter
482+
CopyOf = Leaking Machinery
476483
JointOffset = Vector
477484
X = -3
478485
Y = -2
@@ -514,6 +521,8 @@ AddActor = Leg
514521
JointStiffness = 0.5
515522
BreakWound = AEmitter
516523
CopyOf = Leaking Machinery
524+
ParentBreakWound = AEmitter
525+
CopyOf = Leaking Machinery
517526
JointOffset = Vector
518527
X = -5
519528
Y = 2

‎Base.rte/Actors/Mecha/AIBox/AIBox.ini

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ AddActor = Turret
3636
JointStrength = 4000
3737
JointStiffness = 0.9
3838
BreakWound = AEmitter
39+
CopyOf = Leaking Machinery
40+
ParentBreakWound = AEmitter
3941
CopyOf = Leaking Machinery Heavy
4042
JointOffset = Vector
4143
X = 0
@@ -141,7 +143,9 @@ AddActor = Leg
141143
JointStrength = 165
142144
JointStiffness = 0.5
143145
BreakWound = AEmitter
144-
CopyOf = Wound Bone Break
146+
CopyOf = Leaking Machinery
147+
ParentBreakWound = AEmitter
148+
CopyOf = Leaking Machinery
145149
JointOffset = Vector
146150
X = -2
147151
Y = 6

‎Base.rte/Actors/Mecha/Medic/Medic.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function Update(self)
3333
for i = 1, #self.healTargets do
3434
local targetFound = false;
3535
local healTarget = self.healTargets[i];
36-
if healTarget and IsActor(healTarget) and (healTarget.Health < healTarget.MaxHealth or healTarget.TotalWoundCount > 0) and healTarget.Vel.Largest < 10 then
36+
if healTarget and IsActor(healTarget) and (healTarget.Health < healTarget.MaxHealth or healTarget.WoundCount > 0) and healTarget.Vel.Largest < 10 then
3737
local trace = SceneMan:ShortestDistance(self.Pos, healTarget.Pos, false);
3838
if (trace.Magnitude - healTarget.Radius) < healRange then
3939
if SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, rte.grassID, 5) < 0 then
@@ -50,7 +50,7 @@ function Update(self)
5050
MovableMan:AddParticle(cross);
5151
end
5252
if healTarget.Health >= healTarget.MaxHealth then
53-
healTarget:RemoveAnyRandomWounds(self.healStrength);
53+
healTarget:RemoveWounds(self.healStrength);
5454
end
5555
end
5656
end
@@ -60,7 +60,7 @@ function Update(self)
6060
end
6161
self.healTargets = {};
6262
for act in MovableMan.Actors do
63-
if act.Team == parent.Team and act.ID ~= parent.ID and (act.Health < act.MaxHealth or act.TotalWoundCount > 0) and act.Vel.Largest < 5 then
63+
if act.Team == parent.Team and act.ID ~= parent.ID and (act.Health < act.MaxHealth or act.WoundCount > 0) and act.Vel.Largest < 5 then
6464
local trace = SceneMan:ShortestDistance(self.Pos, act.Pos, false);
6565
if (trace.Magnitude - act.Radius) < (healRange * 0.9) then
6666
if SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, rte.airID, 3) < 0 then

‎Base.rte/Actors/Mecha/Medic/MedicDrone.ini

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ AddActor = Turret
6161
JointStrength = 3000
6262
JointStiffness = 0.9
6363
BreakWound = AEmitter
64+
CopyOf = Leaking Machinery
65+
ParentBreakWound = AEmitter
6466
CopyOf = Leaking Machinery Heavy
6567
JointOffset = Vector
6668
X = 0
@@ -142,7 +144,9 @@ AddActor = Leg
142144
JointStrength = 165
143145
JointStiffness = 0.5
144146
BreakWound = AEmitter
145-
CopyOf = Wound Bone Break
147+
CopyOf = Leaking Machinery
148+
ParentBreakWound = AEmitter
149+
CopyOf = Leaking Machinery
146150
JointOffset = Vector
147151
X = -2
148152
Y = 6

‎Base.rte/Actors/Shared.ini

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ AddActor = Leg
1313
CopyOf = Null AtomGroup
1414
JointStrength = 10000
1515
JointStiffness = 0.1
16-
MaxLength = 1
16+
ContractedOffset = Vector
17+
X = 0.5
18+
Y = 0
19+
ExtendedOffset = Vector
20+
X = 1
21+
Y = 0
1722
MoveSpeed = 1
1823

1924

@@ -323,6 +328,7 @@ AddEffect = AEmitter
323328
JointStrength = 10000
324329
JointStiffness = 1
325330
DrawAfterParent = 1
331+
DeleteWhenRemovedFromParent = 1
326332
AddEmission = Emission
327333
EmittedParticle = MOPixel
328334
CopyOf = Jetpack Blast 1
@@ -463,6 +469,7 @@ AddEffect = AEmitter
463469
JointStrength = 10000
464470
JointStiffness = 1
465471
DrawAfterParent = 0
472+
DeleteWhenRemovedFromParent = 1
466473
AddEmission = Emission
467474
EmittedParticle = MOPixel
468475
CopyOf = Jetpack Blast 1

‎Base.rte/Actors/Wildlife/Crabs/Crabs.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ AddEffect = Leg
2929
JointStiffness = 0.5
3030
BreakWound = AEmitter
3131
CopyOf = Wound Bone Break
32+
ParentBreakWound = AEmitter
33+
CopyOf = Wound Bone Break
3234
JointOffset = Vector
3335
X = -2
3436
Y = 6

‎Base.rte/Actors/Wildlife/Jumper/Jumper.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ AddActor = Leg
2929
JointStiffness = 0.5
3030
BreakWound = AEmitter
3131
CopyOf = Wound Flesh Body
32+
ParentBreakWound = AEmitter
33+
CopyOf = Wound Flesh Body
3234
JointOffset = Vector
3335
X = -3
3436
Y = 3

0 commit comments

Comments
 (0)