Skip to content

Commit 15c79ac

Browse files
AureusStratusAureusStratus
committed
Unit things2
1 parent 08d8679 commit 15c79ac

2 files changed

Lines changed: 22 additions & 25 deletions

File tree

assets/sprites/blocks/turrets/serpulo/guard.png renamed to assets/sprites/blocks/turrets/serpulo/guardTurret.png

File renamed without changes.

‎src/exogenesis/content/ExoBlocks.java‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Items.lead, new ShrapnelBulletType(){{
149149
}}
150150
);
151151
}};
152-
guard = new PowerTurret("guard"){{
152+
guard = new PowerTurret("guardTurret"){{
153153
requirements(Category.turret, with(Items.copper, 100, Items.lead, 50, Items.silicon, 50, Items.graphite, 60));
154154
range = 160f;
155155

@@ -180,10 +180,10 @@ Items.lead, new ShrapnelBulletType(){{
180180
pierceArmor = true;
181181
pierce = true;
182182
pierceCap = 1;
183-
trailWidth = 2f;
183+
trailWidth = 4f;
184184
trailLength = 6;
185-
width = 9;
186-
height = 19;
185+
width = 6;
186+
height = 15;
187187
shrinkX = shrinkY = 0;
188188
shieldDamageMultiplier = 1.25f;
189189
lifetime = 50;
@@ -237,7 +237,7 @@ Items.lead, new ShrapnelBulletType(){{
237237
coolantMultiplier = 0.5f;
238238
ammoUseEffect = Fx.none;
239239
range = 280f;
240-
inaccuracy = 4f;
240+
inaccuracy = 7f;
241241
recoil = 2f;
242242
shoot = new ShootPattern(){{
243243
shots = 5;
@@ -277,9 +277,7 @@ Items.lead, new ShrapnelBulletType(){{
277277
warden = new PowerTurret("warden"){{
278278
requirements(Category.turret, with(Items.lead, 900, Items.silicon, 300, Items.surgeAlloy, 250, Items.plastanium, 175, Items.thorium, 250));
279279
range = 220f;
280-
281280
shoot.firstShotDelay = 40f;
282-
283281
recoil = 3f;
284282
reload = 130f;
285283
shake = 2f;
@@ -298,7 +296,7 @@ Items.lead, new ShrapnelBulletType(){{
298296

299297
shootType = new ArrowBulletType(3f, 485) {{
300298
chargeEffect = new MultiEffect(Fx.lancerLaserCharge, Fx.lancerLaserChargeBegin);
301-
lightningColor = hitColor = trailColor = Pal.lancerLaser;
299+
backColor = lightningColor = hitColor = trailColor = Pal.lancerLaser;
302300
lightning = 5;
303301
lightningLength = 5;
304302
lightningLengthRand = 7;
@@ -311,10 +309,10 @@ Items.lead, new ShrapnelBulletType(){{
311309
pierceArmor = true;
312310
pierce = true;
313311
pierceCap = 1;
314-
trailWidth = 3f;
312+
trailWidth = 4f;
315313
trailLength = 6;
316-
width = 11;
317-
height = 26;
314+
width = 9;
315+
height = 19;
318316
shrinkX = shrinkY = 0;
319317
shieldDamageMultiplier = 1.25f;
320318
lifetime = 90;
@@ -333,7 +331,7 @@ Items.lead, new ShrapnelBulletType(){{
333331
pierceArmor = true;
334332
pierce = true;
335333
pierceCap = 1;
336-
trailWidth = 2f;
334+
trailWidth = 3.5f;
337335
trailLength = 4;
338336
width = 7;
339337
height = 12;
@@ -369,6 +367,7 @@ Items.lead, new ShrapnelBulletType(){{
369367
length = 180f;
370368
damage = 100f;
371369
hitEffect = ExoFx.hitMeltColor;
370+
hitColor = Pal.heal;
372371
width = 25f;
373372
sideAngle = 15f;
374373
sideWidth = 0f;
@@ -385,7 +384,7 @@ Items.lead, new ShrapnelBulletType(){{
385384
maxAmmo = 100;
386385
recoil = 5f;
387386

388-
shoot = new ShootSpread(5, 10f);
387+
shoot = new ShootSpread(5, 20f);
389388

390389
shootCone = 45;
391390
size = 5;
@@ -406,7 +405,7 @@ Items.titanium, new ShrapnelBulletType(){{
406405
serrations = 5;
407406
width = 30f;
408407
reloadMultiplier = 1.3f;
409-
smokeEffect = Fx.smokeCloud;
408+
smokeEffect = Fx.none;
410409
hitColor = Pal.lancerLaser;
411410
shootEffect = new MultiEffect(ExoShootFx.weldSpark, Fx.massiveExplosion);
412411
}},
@@ -417,7 +416,7 @@ Items.thorium, new ShrapnelBulletType(){{
417416
ammoMultiplier = 6f;
418417
serrations = 5;
419418
width = 30f;
420-
smokeEffect = Fx.smokeCloud;
419+
smokeEffect = Fx.none;
421420
toColor = hitColor = Pal.thoriumPink;
422421
shootEffect = new MultiEffect(ExoShootFx.weldSpark, Fx.massiveExplosion);
423422
}},
@@ -426,12 +425,12 @@ Items.plastanium, new ShrapnelBulletType(){{
426425
damage = 145f;
427426
rangeChange = 30;
428427
pierceCap = 3;
429-
reloadMultiplier = 2f;
428+
reloadMultiplier = 4f;
430429
ammoMultiplier = 3f;
431430
serrations = 5;
432431
width = 30f;
433432
toColor = hitColor = Pal.plastanium;
434-
smokeEffect = Fx.smokeCloud;
433+
smokeEffect = Fx.none;
435434
shootEffect = new MultiEffect(ExoShootFx.weldSpark, Fx.plasticExplosion);
436435
}},
437436
Items.surgeAlloy, new ShrapnelBulletType(){{
@@ -446,7 +445,7 @@ Items.surgeAlloy, new ShrapnelBulletType(){{
446445
ammoMultiplier = 7f;
447446
serrations = 5;
448447
width = 30f;
449-
smokeEffect = Fx.smokeCloud;
448+
smokeEffect = Fx.none;
450449
toColor = hitColor = lightningColor = Pal.surge;
451450
shootEffect = new MultiEffect(ExoShootFx.weldSpark, Fx.massiveExplosion);
452451
}}
@@ -566,7 +565,7 @@ Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
566565
scaledHealth = 145;
567566
limitRange();
568567
}};
569-
supercritical = new LaserTurret("supercritical"){{
568+
supercritical = new ContinuousTurret("supercritical"){{
570569
requirements(Category.turret, with(Items.copper, 1200, Items.lead, 550, Items.graphite, 300, Items.surgeAlloy, 525, ExoItems.voltriumAlloy, 300, Items.silicon, 525));
571570
shootEffect = Fx.shootBigSmoke2;
572571
shootCone = 10f;
@@ -575,8 +574,6 @@ Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
575574
shake = 2f;
576575
range = 300f;
577576
reload = 110f;
578-
firingMoveFract = 0.5f;
579-
shootDuration = 330f;
580577
shootSound = Sounds.laserbig;
581578
loopSound = Sounds.beam;
582579
loopSoundVolume = 2f;
@@ -590,7 +587,7 @@ Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
590587
y = 15;
591588
effect = ExoFx.randLifeSparkExo;
592589
randomEffectRot = 60f;
593-
effectChance = 0.8f;
590+
effectChance = 0.08f;
594591
}},
595592
new EffectSpawnPart() {{
596593
useProgress = true;
@@ -654,15 +651,15 @@ Items.metaglass, new FlakBulletType(4f, 6){{
654651
drawer = new DrawTurret(){{
655652
parts.addAll(
656653
new RegionPart("-barrel-side"){{
657-
progress = PartProgress.warmup.delay(0.9f);
658-
moves.add(new PartMove(PartProgress.smoothReload, 0f, -4f, 0f));
654+
progress = PartProgress.warmup.delay(0.15f);
655+
moves.add(new PartMove(PartProgress.recoil, 0f, -4f, 0f));
659656
moveX = 2.5f;
660657
under = true;
661658
mirror = true;
662659
}},
663660
new RegionPart("-barrel-top"){{
664661
progress = PartProgress.warmup;
665-
moves.add(new PartMove(PartProgress.smoothReload, 0f, -4f, 0f));
662+
moves.add(new PartMove(PartProgress.recoil, 0f, -4f, 0f));
666663
moveY = -4.5f;
667664
mirror = false;
668665
}}

0 commit comments

Comments
 (0)