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

Commit e1e4d69

Browse files
garethyrgarethyr
committed
Merge branch 'development'
2 parents bdfcf19 + ce0970d commit e1e4d69

File tree

68 files changed

+141
-426
lines changed

Some content is hidden

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

68 files changed

+141
-426
lines changed

‎Data/Base.rte/AI/HumanBehaviors.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2174,7 +2174,7 @@ function HumanBehaviors.GetProjectileData(Owner)
21742174
PrjDat.vel = 100;
21752175
PrjDat.rng = math.huge;
21762176
PrjDat.pen = math.huge;
2177-
PrjData.blast = 0;
2177+
PrjDat.blast = 0;
21782178
else
21792179
-- find muzzle velocity
21802180
PrjDat.vel = Weapon:GetAIFireVel();

‎Data/Base.rte/Devices/Shared/Scripts/TrajectoryGuide.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ end
3434

3535
function Update(self)
3636
local actor = self:GetRootParent();
37-
if MovableMan:IsActor(actor) and ToActor(actor):IsPlayerControlled() and not self:IsReloading() then
37+
if IsActor(actor) and MovableMan:ValidMO(actor) and ToActor(actor):IsPlayerControlled() and not self:IsReloading() then
3838
local actor = ToActor(actor);
3939
local controller = actor:GetController();
4040
if not self.isThrownDevice and (self:DoneReloading() or self.FiredFrame) and self.Magazine and self.Magazine.RoundCount ~= 0 then
@@ -58,7 +58,7 @@ function Update(self)
5858
--The following offset is as found in the source code (TODO: utilize EndThrowOffset properly instead)
5959
guideParPos = actor.Pos + actor.Vel * rte.PxTravelledPerFrame + Vector((actor.FGArm.ParentOffset.X + actor.FGArm.MaxLength) * actor.FlipFactor, actor.FGArm.ParentOffset.Y - actor.FGArm.MaxLength * 0.5):RadRotate(actor:GetAimAngle(false) * actor.FlipFactor);
6060
guideParVel = Vector(minVel + (maxVel - minVel) * throwProgress, 0):RadRotate(actor:GetAimAngle(true));
61-
else
61+
elseif not self.isThrownDevice then
6262
guideParPos = self.MuzzlePos;
6363
guideParVel = Vector(self.projectileVel, 0):RadRotate(actor:GetAimAngle(true));
6464
end

‎Data/Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayer.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,9 @@ AddAmmo = Magazine
107107
AtomGroup = AtomGroup
108108
AutoGenerate = 1
109109
Material = Material
110-
CopyOf = Bullet Metal
110+
CopyOf = Bullet Casing
111111
Resolution = 2
112112
Depth = 0
113-
DeepGroup = AtomGroup
114-
AutoGenerate = 1
115-
Material = Material
116-
CopyOf = Bullet Metal
117-
Resolution = 3
118-
Depth = 1
119113
DeepCheck = 0
120114
JointStrength = 200
121115
JointStiffness = 1

‎Data/Base.rte/Devices/Tools/Constructor/Constructor.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,9 @@ AddAmmo = Magazine
307307
AtomGroup = AtomGroup
308308
AutoGenerate = 1
309309
Material = Material
310-
CopyOf = Bullet Metal
310+
CopyOf = Bullet Casing
311311
Resolution = 2
312312
Depth = 0
313-
DeepGroup = AtomGroup
314-
AutoGenerate = 1
315-
Material = Material
316-
CopyOf = Bullet Metal
317-
Resolution = 3
318-
Depth = 1
319313
DeepCheck = 0
320314
JointStrength = 200
321315
JointStiffness = 1

‎Data/Base.rte/Devices/Tools/Digger/Digger.ini

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,9 @@ AddAmmo = Magazine
201201
AtomGroup = AtomGroup
202202
AutoGenerate = 1
203203
Material = Material
204-
CopyOf = Bullet Metal
204+
CopyOf = Bullet Casing
205205
Resolution = 2
206206
Depth = 0
207-
DeepGroup = AtomGroup
208-
AutoGenerate = 1
209-
Material = Material
210-
CopyOf = Bullet Metal
211-
Resolution = 3
212-
Depth = 1
213207
DeepCheck = 0
214208
JointStrength = 200
215209
JointStiffness = 1
@@ -244,15 +238,9 @@ AddAmmo = Magazine
244238
AtomGroup = AtomGroup
245239
AutoGenerate = 1
246240
Material = Material
247-
CopyOf = Bullet Metal
241+
CopyOf = Bullet Casing
248242
Resolution = 2
249243
Depth = 0
250-
DeepGroup = AtomGroup
251-
AutoGenerate = 1
252-
Material = Material
253-
CopyOf = Bullet Metal
254-
Resolution = 3
255-
Depth = 1
256244
DeepCheck = 0
257245
JointStrength = 200
258246
JointStiffness = 1
@@ -287,15 +275,9 @@ AddAmmo = Magazine
287275
AtomGroup = AtomGroup
288276
AutoGenerate = 1
289277
Material = Material
290-
CopyOf = Bullet Metal
278+
CopyOf = Bullet Casing
291279
Resolution = 2
292280
Depth = 0
293-
DeepGroup = AtomGroup
294-
AutoGenerate = 1
295-
Material = Material
296-
CopyOf = Bullet Metal
297-
Resolution = 3
298-
Depth = 1
299281
DeepCheck = 0
300282
JointStrength = 200
301283
JointStiffness = 1

‎Data/Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,9 @@ AddAmmo = Magazine
138138
AtomGroup = AtomGroup
139139
AutoGenerate = 1
140140
Material = Material
141-
CopyOf = Bullet Metal
141+
CopyOf = Military Stuff
142142
Resolution = 2
143143
Depth = 0
144-
DeepGroup = AtomGroup
145-
AutoGenerate = 1
146-
Material = Material
147-
CopyOf = Bullet Metal
148-
Resolution = 3
149-
Depth = 1
150144
DeepCheck = 0
151145
JointStrength = 200
152146
JointStiffness = 1

‎Data/Base.rte/Devices/Tools/Repeller/Repeller.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,9 @@ AddAmmo = Magazine
5050
AtomGroup = AtomGroup
5151
AutoGenerate = 1
5252
Material = Material
53-
CopyOf = Bullet Metal
53+
CopyOf = Bullet Casing
5454
Resolution = 2
5555
Depth = 0
56-
DeepGroup = AtomGroup
57-
AutoGenerate = 1
58-
Material = Material
59-
CopyOf = Bullet Metal
60-
Resolution = 3
61-
Depth = 1
6256
DeepCheck = 0
6357
JointStrength = 200
6458
JointStiffness = 1

‎Data/Base.rte/Devices/Weapons/OldStock/BattleRifle/BattleRifle.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,9 @@ AddAmmo = Magazine
2121
AtomGroup = AtomGroup
2222
AutoGenerate = 1
2323
Material = Material
24-
CopyOf = Bullet Metal
24+
CopyOf = Bullet Casing
2525
Resolution = 2
2626
Depth = 0
27-
DeepGroup = AtomGroup
28-
AutoGenerate = 1
29-
Material = Material
30-
CopyOf = Bullet Metal
31-
Resolution = 3
32-
Depth = 1
3327
DeepCheck = 0
3428
JointStrength = 200
3529
JointStiffness = 1

‎Data/Base.rte/Devices/Weapons/OldStock/BlasterPistol/BlasterPistol.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ AddAmmo = Magazine
6969
AtomGroup = AtomGroup
7070
AutoGenerate = 1
7171
Material = Material
72-
CopyOf = Military Stuff
72+
CopyOf = Bullet Casing
7373
Resolution = 2
7474
Depth = 0
7575
DeepCheck = 0

‎Data/Base.rte/Devices/Weapons/OldStock/Pistol/Pistol.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,9 @@ AddAmmo = Magazine
2121
AtomGroup = AtomGroup
2222
AutoGenerate = 1
2323
Material = Material
24-
CopyOf = Military Stuff
24+
CopyOf = Bullet Casing
2525
Resolution = 2
2626
Depth = 0
27-
DeepGroup = AtomGroup
28-
AutoGenerate = 1
29-
Material = Material
30-
CopyOf = Military Stuff
31-
Resolution = 3
32-
Depth = 1
3327
DeepCheck = 0
3428
JointStrength = 200
3529
JointStiffness = 1

0 commit comments

Comments
 (0)