Skip to content

Commit ba89f8d

Browse files
committed
dagger line resistances
1 parent 44436d5 commit ba89f8d

1 file changed

Lines changed: 18 additions & 10 deletions

File tree

src/exogenesis/content/ExoBlocks.java

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,12 @@ Items.lead, new ShrapnelBulletType(){{
383383

384384
consumePower(18f);
385385

386-
shootType = new LaserBulletType(){{
386+
shootType = new ExoLaserBulletType(){{
387387
length = 180f;
388388
damage = 100f;
389+
addDamageMultiplier(
390+
ExoDamageTypes.energy, 1f
391+
);
389392
hitEffect = ExoFx.hitMeltColor;
390393
hitColor = Pal.heal;
391394
width = 25f;
@@ -441,8 +444,9 @@ Items.thorium, new ExoShrapnelBulletType(){{
441444
damage = 185f;
442445
pierceArmor = true;
443446
addDamageMultiplier(
444-
ExoDamageTypes.pierce, 1f,
445-
ExoDamageTypes.radiation, 0.5
447+
ExoDamageTypes.radiation, 0.5f,
448+
ExoDamageTypes.pierce, 1f
449+
446450
);
447451
ammoMultiplier = 6f;
448452
serrationWidth = 9;
@@ -459,8 +463,9 @@ Items.plastanium, new ExoShrapnelBulletType(){{
459463
length = 120;
460464
damage = 145f;
461465
addDamageMultiplier(
462-
ExoDamageTypes.pierce, 1f,
463-
ExoDamageTypes.explosive, 0.5
466+
ExoDamageTypes.explosive, 0.5f,
467+
ExoDamageTypes.pierce, 1f
468+
464469
);
465470
pierceCap = 3;
466471
reloadMultiplier = 4f;
@@ -483,8 +488,10 @@ Items.surgeAlloy, new ExoShrapnelBulletType(){{
483488
lightningCone = 50;
484489
lightningDamage = 40;
485490
addDamageMultiplier(
486-
ExoDamageTypes.pierce, 1f,
487-
ExoDamageTypes.energy, 0.5
491+
ExoDamageTypes.energy, 0.5f,
492+
ExoDamageTypes.pierce, 1f
493+
494+
488495
);
489496
status = StatusEffects.shocked;
490497
statusDuration = 50;
@@ -507,8 +514,9 @@ ExoItems.quantumCrytsal, new ExoShrapnelBulletType(){{
507514
statusDuration = 50;
508515
damage = 155f;
509516
addDamageMultiplier(
510-
ExoDamageTypes.pierce, 1f,
511-
ExoDamageTypes.graviton, 0.5
517+
ExoDamageTypes.graviton, 0.5f,
518+
ExoDamageTypes.pierce, 1f
519+
512520
);
513521
ammoMultiplier = 7f;
514522
serrationWidth = 12;
@@ -540,7 +548,7 @@ ExoItems.quantumCrytsal, new ExoShrapnelBulletType(){{
540548
shootType = new ExoBasicBulletType(8.5f, 95){{
541549
addDamageMultiplier(
542550
ExoDamageTypes.kinetic, 1f,
543-
ExoDamageTypes.energy, 0.25
551+
ExoDamageTypes.energy, 0.25f
544552
);
545553
width = 14;
546554
height = 22;

0 commit comments

Comments
 (0)