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

Commit 8c6ab8a

Browse files
fourZKfourZK
committed
Review changes / Gacyr
1 parent 4e7f8da commit 8c6ab8a

File tree

19 files changed

+59
-62
lines changed

19 files changed

+59
-62
lines changed

‎Base.rte/AI/HumanBehaviors.lua

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,12 +2128,14 @@ end
21282128

21292129
-- get the projectile properties from the magazine
21302130
function HumanBehaviors.GetProjectileData(Owner)
2131-
local Weapon = ToHDFirearm(Owner.EquippedItem)
2132-
local Round, Projectile, PrjDat
2133-
if Weapon.Magazine then
2134-
Round = Weapon.Magazine.NextRound
2135-
Projectile = Round.NextParticle
2136-
PrjDat = {MagazineName=Weapon.Magazine.PresetName}
2131+
local Weapon, Round, Projectile, PrjDat
2132+
if Owner.EquippedItem and IsHDFirearm(Owner.EquippedItem) then
2133+
Weapon = ToHDFirearm(Owner.EquippedItem)
2134+
if Weapon.Magazine then
2135+
Round = Weapon.Magazine.NextRound
2136+
Projectile = Round.NextParticle
2137+
PrjDat = {MagazineName=Weapon.Magazine.PresetName}
2138+
end
21372139
end
21382140
if Round == nil or Round.IsEmpty then -- set default values if there is no particle
21392141
PrjDat.g = 0

‎Base.rte/Actors/Shared.ini

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ AddEffect = AEmitter
477477
AddEmission = Emission
478478
EmittedParticle = MOSParticle
479479
CopyOf = Main Thruster Blast Ball 1
480-
BurstSize = 2
480+
BurstSize = 3
481481
LifeVariation = 0.15
482482
Spread = 0
483483
MaxVelocity = 10
@@ -486,7 +486,7 @@ AddEffect = AEmitter
486486
EmittedParticle = MOSParticle
487487
CopyOf = Side Thruster Blast Ball 1
488488
PresetName = Jetpack Blast Ball 2
489-
Mass = 3
489+
Mass = 4
490490
LifeTime = 250
491491
AirResistance = 0.1
492492
AirThreshold = 1
@@ -495,7 +495,9 @@ AddEffect = AEmitter
495495
Spread = 0.1
496496
MaxVelocity = 20
497497
MinVelocity = 10
498-
BurstSpacing = 2000
498+
BurstSpacing = 1000
499+
MinThrottleRange = 1
500+
MaxThrottleRange = 1
499501
BurstSound = SoundContainer
500502
AttenuationStartDistance = 130
501503
AddSound = ContentFile

‎Base.rte/Craft/Dropships/DropshipMK1.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ AddEffect = AEmitter
872872
CopyOf = Jet Flame A
873873
FlashOnlyOnBurst = 0
874874
GibImpulseLimit = 4200
875-
GibWoundLimit = 30
875+
GibWoundLimit = 35
876876
GibWithParentChance = 0.2
877877
GibSound = SoundContainer
878878
CopyOf = Craft Engine Gib
@@ -1115,7 +1115,7 @@ AddEffect = AEmitter
11151115
CopyOf = Jet Flame A
11161116
FlashOnlyOnBurst = 0
11171117
GibImpulseLimit = 4200
1118-
GibWoundLimit = 30
1118+
GibWoundLimit = 35
11191119
GibWithParentChance = 0.2
11201120
GibSound = SoundContainer
11211121
CopyOf = Craft Engine Gib
@@ -1547,7 +1547,7 @@ AddActor = ACDropShip
15471547
CanLand = 0
15481548
GibImpulseLimit = 24000
15491549
GibBlastStrength = 50
1550-
GibWoundLimit = 75
1550+
GibWoundLimit = 80
15511551
GibSound = SoundContainer
15521552
CopyOf = Craft Body Gib
15531553
AddGib = Gib

‎Base.rte/Craft/StorageCrate/DropCrate.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function Create(self)
1212
randomDirection = self.Pos.X > (SceneMan.SceneWidth - 99) and -1 or (self.Pos.X < 99 and 1 or randomDirection);
1313
end
1414
self.AngularVel = -randomDirection * math.random(1, 10);
15-
self.Vel = Vector(randomDirection * math.random(1, 20), 40);
15+
self.Vel = Vector(randomDirection * math.random(1, 20), math.min(10 + 10 * 1500/SceneMan.SceneHeight, 100));
1616
end
1717
function Update(self)
1818
--Apply damage to the actors inside based on impulse forces

‎Base.rte/Devices/Special/Medikit/Medikit.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function Update(self)
2323
target.Health = math.min(target.Health + strength, target.MaxHealth);
2424
end
2525
if target.WoundCount > 0 then
26-
target:RemoveWounds(math.ceil(strength * 0.15));
26+
target:RemoveWounds(math.ceil(strength * 0.15), true, false, false);
2727
end
2828
target:FlashWhite(50);
2929
AudioMan:PlaySound("Base.rte/Sounds/GUIs/SlicePicked.flac", self.Pos);

‎Base.rte/Devices/Tools/Constructor/Constructor.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function ConstructorFloodFill(x, y, startnum, maxnum, array, realposition, reals
5454
end
5555

5656
function ConstructorSnapPos(checkPos)
57-
return Vector(math.floor((checkPos.x - 12)/24) * 24 + 12, math.floor((checkPos.y - 12)/24) * 24 + 12);
57+
return Vector(math.floor((checkPos.X - 12)/24) * 24 + 12, math.floor((checkPos.Y - 12)/24) * 24 + 12);
5858
end
5959

6060
function ConstructorTerrainRay(start, trace, skip)

‎Base.rte/Scenes/Grasslands.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ AddScene = Scene
2525
CopyOf = Clouds Layer A
2626
AddBackgroundLayer = SceneLayer
2727
CopyOf = Default Sky Layer
28+
/* To-do: Bunker version?
2829
AddArea = Area
2930
AddBox = Box
3031
Corner = Vector
@@ -184,4 +185,5 @@ AddScene = Scene
184185
Y = 773.801
185186
Width = 58
186187
Height = 41
187-
Name = Light2
188+
Name = Light2
189+
*/

‎Dummy.rte/Actors/Mecha/Dreadnought/Dreadnought.ini

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ AddEffect = MOSRotating
200200

201201
AddDevice = HDFirearm
202202
PresetName = Dreadnought Nailer
203-
Mass = 10
203+
Mass = 8
204204
HitsMOs = 0
205205
GetsHitByMOs = 1
206206
Buyable = 0
@@ -303,7 +303,7 @@ AddDevice = HDFirearm
303303

304304
AddEffect = Attachable
305305
PresetName = Dummy Dreadnought Turret Part A
306-
Mass = 134.81
306+
Mass = 70
307307
HitsMOs = 1
308308
GetsHitByMOs = 1
309309
CollidesWithTerrainWhileAttached = 1
@@ -312,7 +312,7 @@ AddEffect = Attachable
312312
FrameCount = 1
313313
SpriteOffset = Vector
314314
X = -11
315-
Y = -12
315+
Y = -11
316316
AngularVel = 6
317317
EntryWound = AEmitter
318318
CopyOf = Dent Metal Light
@@ -325,15 +325,15 @@ AddEffect = Attachable
325325
Resolution = 4
326326
Depth = 0
327327
DeepCheck = 0
328-
JointStrength = 350
328+
JointStrength = 500
329329
JointStiffness = 0.5
330330
BreakWound = AEmitter
331331
CopyOf = Wound Bone Break
332332
ParentBreakWound = AEmitter
333333
CopyOf = Wound Bone Break
334334
JointOffset = Vector
335335
X = 0
336-
Y = 10
336+
Y = 9
337337
DrawAfterParent = 1
338338
AddGib = Gib
339339
GibParticle = MOSRotating
@@ -439,7 +439,7 @@ AddEffect = Attachable
439439

440440
AddEffect = Attachable
441441
PresetName = Dummy Dreadnought Turret Part B
442-
Mass = 70.01
442+
Mass = 50
443443
HitsMOs = 1
444444
GetsHitByMOs = 1
445445
CollidesWithTerrainWhileAttached = 1
@@ -461,7 +461,7 @@ AddEffect = Attachable
461461
Resolution = 4
462462
Depth = 0
463463
DeepCheck = 0
464-
JointStrength = 350
464+
JointStrength = 600
465465
JointStiffness = 0.5
466466
BreakWound = AEmitter
467467
CopyOf = Wound Bone Break
@@ -533,7 +533,7 @@ AddEffect = Attachable
533533

534534
AddEffect = Attachable
535535
PresetName = Dummy Dreadnought Turret Part C
536-
Mass = 24.72
536+
Mass = 20
537537
HitsMOs = 1
538538
GetsHitByMOs = 1
539539
CollidesWithTerrainWhileAttached = 1
@@ -555,7 +555,7 @@ AddEffect = Attachable
555555
Resolution = 4
556556
Depth = 0
557557
DeepCheck = 0
558-
JointStrength = 350
558+
JointStrength = 400
559559
JointStiffness = 0.5
560560
BreakWound = AEmitter
561561
CopyOf = Wound Bone Break
@@ -631,7 +631,7 @@ AddEffect = Attachable
631631

632632
AddActor = Turret
633633
PresetName = Dummy Dreadnought Turret
634-
Mass = 200
634+
Mass = 120
635635
HitsMOs = 1
636636
GetsHitByMOs = 1
637637
SpriteFile = ContentFile
@@ -658,7 +658,7 @@ AddActor = Turret
658658
Resolution = 4
659659
Depth = 0
660660
DeepCheck = 0
661-
JointStrength = 900
661+
JointStrength = 1000
662662
JointStiffness = 0.9
663663
BreakWound = AEmitter
664664
CopyOf = Leaking Machinery
@@ -888,7 +888,7 @@ AddActor = ACrab
888888
Description = Armored tank on 4 legs. Armed with a machine gun and covered with multiple layers of armor.
889889
AddToGroup = Actors
890890
AddToGroup = Actors - Mecha
891-
Mass = 41.71
891+
Mass = 40
892892
GoldValue = 130
893893
HitsMOs = 1
894894
GetsHitByMOs = 1
@@ -920,7 +920,7 @@ AddActor = ACrab
920920
CopyOf = Device Switch
921921
PassengerSlots = 2
922922
Health = 100
923-
ImpulseDamageThreshold = 2100
923+
ImpulseDamageThreshold = 3200
924924
AimRange = 0.5
925925
AimDistance = 30
926926
Perceptiveness = 0.75
@@ -1078,7 +1078,7 @@ AddActor = ACrab
10781078
Offset = Vector
10791079
X = -2.5
10801080
Y = -1.5
1081-
GibImpulseLimit = 15000
1081+
GibImpulseLimit = 16000
10821082
GibWoundLimit = 10
10831083
GibSound = SoundContainer
10841084
CopyOf = Bone Crack

‎Dummy.rte/Actors/Mecha/Dreadnought/TurretLargeA.png

110 Bytes
Loading

‎Dummy.rte/Devices/Tools/Shielder/ShieldWall.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Update(self)
2525
else
2626
self.Vel = Vector();
2727
end
28-
if self.Age > self.Lifetime - 17 * (1 + self.WoundCount) then
28+
if self.Age > self.Lifetime - 30 * (1 + self.WoundCount) then
2929
self:GibThis();
3030
end
3131
end

0 commit comments

Comments
 (0)