Skip to content

Commit be7a3f6

Browse files
committed
Unit things2
1 parent 528e4e9 commit be7a3f6

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

src/exogenesis/content/ExoBlocks.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ Items.titanium, new ShrapnelBulletType(){{
404404
hitLarge = true;
405405
ammoMultiplier = 5f;
406406
serrationWidth = 7;
407+
serrationSpacing = 4;
407408
serrations = 8;
408409
width = 30f;
409410
reloadMultiplier = 1.3f;
@@ -417,6 +418,7 @@ Items.thorium, new ShrapnelBulletType(){{
417418
pierceArmor = true;
418419
ammoMultiplier = 6f;
419420
serrationWidth = 7;
421+
serrationSpacing = 4;
420422
serrations = 8;
421423
width = 30f;
422424
smokeEffect = Fx.none;
@@ -433,25 +435,30 @@ Items.plastanium, new ShrapnelBulletType(){{
433435
serrationWidth = 7;
434436
serrations = 8;
435437
width = 30f;
438+
fromColor = Pal.plastaniumFront;
436439
toColor = hitColor = Pal.plastaniumBack;
437440
smokeEffect = Fx.none;
438441
shootEffect = new MultiEffect(ExoShootFx.weldSpark);
439442
}},
440443
Items.surgeAlloy, new ShrapnelBulletType(){{
441444
length = brange;
442445
lightning = 2;
443-
lightningLength = 8;
444-
lightningLengthRand = 12;
446+
lightningLength = 10;
447+
lightningLengthRand = 14;
448+
lightningCone = 50;
445449
lightningDamage = 40;
446450
status = StatusEffects.shocked;
447451
statusDuration = 50;
448452
damage = 205f;
449453
ammoMultiplier = 7f;
450454
serrationWidth = 7;
455+
serrationSpacing = 4;
451456
serrations = 8;
452-
width = 30f;
457+
width = 35f;
458+
serrationLenScl = 15f;
453459
smokeEffect = Fx.none;
454-
toColor = hitColor = lightningColor = Pal.surge;
460+
fromColor = Pal.surgeAmmoFront;
461+
toColor = hitColor = lightningColor = Pal.surgeAmmoBack;
455462
shootEffect = new MultiEffect(ExoShootFx.weldSpark);
456463
}}
457464
);
@@ -614,7 +621,7 @@ Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
614621
buildingDamageMultiplier = 0.3f;
615622
colors = new Color[]{ExoPal.cronusRed.cpy().a(0.4f), ExoPal.cronusRed, Color.white, Color.white};
616623
oscScl = 0.3f;
617-
width = 4.5f;
624+
width = 8.5f;
618625
drawFlare = false;
619626
hitColor = ExoPal.cronusRed;
620627
pierceCap = 3;
@@ -675,7 +682,7 @@ Items.metaglass, new FlakBulletType(4f, 6){{
675682
);
676683
}};
677684
shootWarmupSpeed = 0.04f;
678-
minWarmup = 100;
685+
minWarmup = 20;
679686
reload = 200f;
680687
range = 200f;
681688
size = 8;

0 commit comments

Comments
 (0)