Skip to content

Commit 839765f

Browse files
committed
dagger line resistances
1 parent 7fe8465 commit 839765f

3 files changed

Lines changed: 40 additions & 10 deletions

File tree

src/exogenesis/content/ExoBlocks.java

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ Items.lead, new ShrapnelBulletType(){{
189189
status = StatusEffects.shocked;
190190
statusDuration = 50;
191191
frontColor = Color.white;
192+
addDamageMultiplier(
193+
energy, 1f
194+
);
192195
pierceArmor = true;
193196
pierce = true;
194197
pierceCap = 1;
@@ -309,6 +312,11 @@ Items.lead, new ShrapnelBulletType(){{
309312
shootType = new ArrowBulletType(3f, 485) {{
310313
chargeEffect = new MultiEffect(Fx.lancerLaserCharge, Fx.lancerLaserChargeBegin);
311314
backColor = lightningColor = hitColor = trailColor = Pal.lancerLaser;
315+
addDamageMultiplier(
316+
energy, 1f,
317+
kinetic, 0.5
318+
319+
);
312320
lightning = 5;
313321
lightningLength = 5;
314322
lightningLengthRand = 7;
@@ -410,10 +418,13 @@ Items.lead, new ShrapnelBulletType(){{
410418
float brange = range + 10f;
411419

412420
ammo(
413-
Items.titanium, new ShrapnelBulletType(){{
421+
Items.titanium, new ExoShrapnelBulletType(){{
414422
length = brange;
415423
damage = 136f;
416424
hitLarge = true;
425+
addDamageMultiplier(
426+
pierce, 1f
427+
);
417428
ammoMultiplier = 5f;
418429
serrationWidth = 9;
419430
serrationSpacing = 14;
@@ -425,10 +436,14 @@ Items.titanium, new ShrapnelBulletType(){{
425436
hitColor = Pal.lancerLaser;
426437
shootEffect = new MultiEffect(ExoShootFx.weldSpark);
427438
}},
428-
Items.thorium, new ShrapnelBulletType(){{
439+
Items.thorium, new ExoShrapnelBulletType(){{
429440
length = brange;
430441
damage = 185f;
431442
pierceArmor = true;
443+
addDamageMultiplier(
444+
pierce, 1f,
445+
radiation, 0.5
446+
);
432447
ammoMultiplier = 6f;
433448
serrationWidth = 9;
434449
serrationSpacing = 14;
@@ -439,10 +454,14 @@ Items.thorium, new ShrapnelBulletType(){{
439454
toColor = hitColor = Pal.thoriumPink;
440455
shootEffect = new MultiEffect(ExoShootFx.weldSpark);
441456
}},
442-
Items.plastanium, new ShrapnelBulletType(){{
457+
Items.plastanium, new ExoShrapnelBulletType(){{
443458
rangeOverride = 100;
444459
length = 120;
445460
damage = 145f;
461+
addDamageMultiplier(
462+
pierce, 1f,
463+
explosive, 0.5
464+
);
446465
pierceCap = 3;
447466
reloadMultiplier = 4f;
448467
ammoMultiplier = 3f;
@@ -456,13 +475,17 @@ Items.plastanium, new ShrapnelBulletType(){{
456475
smokeEffect = Fx.none;
457476
shootEffect = new MultiEffect(ExoShootFx.weldSpark);
458477
}},
459-
Items.surgeAlloy, new ShrapnelBulletType(){{
478+
Items.surgeAlloy, new ExoShrapnelBulletType(){{
460479
length = brange;
461480
lightning = 2;
462481
lightningLength = 10;
463482
lightningLengthRand = 14;
464483
lightningCone = 50;
465484
lightningDamage = 40;
485+
addDamageMultiplier(
486+
pierce, 1f,
487+
energy, 0.5
488+
);
466489
status = StatusEffects.shocked;
467490
statusDuration = 50;
468491
damage = 205f;
@@ -478,11 +501,15 @@ Items.surgeAlloy, new ShrapnelBulletType(){{
478501
toColor = hitColor = lightningColor = Pal.surgeAmmoBack;
479502
shootEffect = new MultiEffect(ExoShootFx.weldSpark);
480503
}},
481-
ExoItems.quantumCrytsal, new ShrapnelBulletType(){{
504+
ExoItems.quantumCrytsal, new ExoShrapnelBulletType(){{
482505
length = brange;
483506
status = StatusEffects.slow;
484507
statusDuration = 50;
485508
damage = 155f;
509+
addDamageMultiplier(
510+
pierce, 1f,
511+
graviton, 0.5
512+
);
486513
ammoMultiplier = 7f;
487514
serrationWidth = 12;
488515
serrationSpacing = 14;
@@ -510,9 +537,11 @@ ExoItems.quantumCrytsal, new ShrapnelBulletType(){{
510537
recoils = 2;
511538
consumePower(20f);
512539

513-
shootType = new DualBulletType(70, 25){{
514-
damage = 95;
515-
speed = 8.5f;
540+
shootType = new ExoBasicBulletType(8.5f, 95){{
541+
addDamageMultiplier(
542+
kinetic, 1f,
543+
energy, 0.25
544+
);
516545
width = 14;
517546
height = 22;
518547
shrinkY = 0.3f;

src/exogenesis/content/ExoDamageTypes.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ public static void load(){
1313
thermal = new DamageType("thermal");
1414
cryogenic = new DamageType("cryogenic");
1515
radiation = new DamageType("radiation");
16+
graviton = new DamageType("graviton");
1617
}
1718
}

src/exogenesis/type/bullet/ArrowBulletType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import arc.graphics.g2d.*;
44
import arc.math.*;
55
import arc.util.*;
6-
import mindustry.entities.bullet.BasicBulletType;
6+
import exogenesis.type.bullet.vanilla.ExoBasicBulletType;
77
import mindustry.gen.*;
88

9-
public class ArrowBulletType extends BasicBulletType {
9+
public class ArrowBulletType extends ExoBasicBulletType {
1010
public ArrowBulletType(float speed, float damage){
1111
super(speed, damage);
1212
trailLength = 35;

0 commit comments

Comments
 (0)