Skip to content

Commit 2909137

Browse files
committed
Unit things2
1 parent af4e3e8 commit 2909137

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

src/exogenesis/content/ExoBlocks.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,8 @@ Items.titanium, new ShrapnelBulletType(){{
403403
damage = 136f;
404404
hitLarge = true;
405405
ammoMultiplier = 5f;
406-
serrationWidth = 7;
407-
serrationSpacing = 4;
406+
serrationWidth = 9;
407+
serrationSpacing = 14;
408408
serrationFadeOffset = 0.2f;
409409
serrations = 8;
410410
width = 30f;
@@ -418,8 +418,8 @@ Items.thorium, new ShrapnelBulletType(){{
418418
damage = 185f;
419419
pierceArmor = true;
420420
ammoMultiplier = 6f;
421-
serrationWidth = 7;
422-
serrationSpacing = 4;
421+
serrationWidth = 9;
422+
serrationSpacing = 14;
423423
serrations = 8;
424424
width = 30f;
425425
smokeEffect = Fx.none;
@@ -433,7 +433,8 @@ Items.plastanium, new ShrapnelBulletType(){{
433433
pierceCap = 3;
434434
reloadMultiplier = 4f;
435435
ammoMultiplier = 3f;
436-
serrationWidth = 7;
436+
serrationWidth = 9;
437+
serrationSpacing = 14;
437438
serrations = 8;
438439
width = 30f;
439440
fromColor = Pal.plastaniumFront;
@@ -452,8 +453,8 @@ Items.surgeAlloy, new ShrapnelBulletType(){{
452453
statusDuration = 50;
453454
damage = 205f;
454455
ammoMultiplier = 7f;
455-
serrationWidth = 7;
456-
serrationSpacing = 4;
456+
serrationWidth = 9;
457+
serrationSpacing = 14;
457458
serrations = 8;
458459
width = 35f;
459460
serrationLenScl = 15f;
@@ -587,6 +588,7 @@ Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
587588
shake = 2f;
588589
range = 300f;
589590
reload = 110f;
591+
shootY = 17;
590592
shootDuration = 400;
591593
firingMoveFract = 0.5f;
592594
shootSound = Sounds.laserbig;
@@ -599,7 +601,7 @@ Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
599601
useProgress = true;
600602
progress = PartProgress.recoil;
601603
effectColor = ExoPal.cronusRed;
602-
y = 15;
604+
y = shootY;
603605
effect = ExoFx.randLifeSparkExo;
604606
randomEffectRot = 60f;
605607
effectChance = 0.08f;
@@ -608,7 +610,7 @@ Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
608610
useProgress = true;
609611
progress = PartProgress.recoil;
610612
effectColor = ExoPal.cronusRed;
611-
y = 15;
613+
y = shootY;
612614
effect = ExoFx.singleSparkLong;
613615
randomEffectRot = 60f;
614616
effectChance = 0.4f;
@@ -620,7 +622,7 @@ Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
620622
length = 320;
621623
knockback = 2f;
622624
buildingDamageMultiplier = 0.3f;
623-
colors = new Color[]{ExoPal.cronusRed.cpy().a(0.4f), ExoPal.cronusRed, Color.white, Color.white};
625+
colors = new Color[]{ExoPal.cronusRed.cpy().a(0.4f), ExoPal.cronusRed, Pal.meltdownHit, Color.white};
624626
oscScl = 0.3f;
625627
width = 8.5f;
626628
drawFlare = false;
@@ -682,8 +684,8 @@ Items.metaglass, new FlakBulletType(4f, 6){{
682684
}}
683685
);
684686
}};
685-
shootWarmupSpeed = 0.04f;
686-
minWarmup = 1;
687+
shootWarmupSpeed = 0.095f;
688+
minWarmup = 0.85f;
687689
reload = 200f;
688690
range = 200f;
689691
size = 8;

0 commit comments

Comments
 (0)