Skip to content

Commit 6c841b2

Browse files
committed
Serpulo/Erekir updates
1 parent fc953cf commit 6c841b2

1 file changed

Lines changed: 14 additions & 8 deletions

File tree

src/exogenesis/content/ExoVanillaUnitTypes.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import arc.util.Time;
1313
import arc.util.Tmp;
1414

15+
import exogenesis.content.effects.ExoHitFx;
1516
import exogenesis.content.effects.ExoShootFx;
1617
import exogenesis.entities.part.EffectSpawnPart;
1718
import exogenesis.graphics.ExoPal;
@@ -5221,7 +5222,7 @@ public void draw(Bullet b){
52215222
bullet = new BasicBulletType(10.5f, 75){{
52225223
width = height = 20;
52235224
sprite = "exogenesis-plasma";
5224-
hitSound = Sounds.explosionObviate;
5225+
hitSound = Sounds.shockBullet;
52255226
frontColor = Color.white;
52265227
backColor = hitColor = trailColor = Pal.heal;
52275228
smokeEffect = new MultiEffect(ExoFx.randLifeSparkExo, Fx.circleColorSpark, ExoShootFx.neutronShoot);
@@ -5238,6 +5239,9 @@ public void draw(Bullet b){
52385239
Lines.ellipse(Tmp.v1.x + e.x, Tmp.v1.y + e.y, 3.8f * e.fin() + 0.1f, 10, 18, e.rotation);
52395240
Lines.stroke(6f * e.fout());
52405241
});
5242+
trailRotation = true;
5243+
trailInterval = 2f;
5244+
hitEffect = new MultiEffect(ExoHitFx.smallerExplosionFragExo, ExoHitFx.smallerLightSmallExo);
52415245
pierceCap = 7;
52425246
pierceBuilding = true;
52435247
laserAbsorb = true;
@@ -7237,7 +7241,7 @@ public void draw(Bullet b){
72377241
rotateSpeed = 1f;
72387242
faceTarget = false;
72397243
weapons.add(new Weapon("exogenesis-orca-weapon") {{
7240-
reload = 80f;
7244+
reload = 20f;
72417245
mirror = false;
72427246
rotate = true;
72437247
rotateSpeed = 2.5f;
@@ -7258,11 +7262,12 @@ public void draw(Bullet b){
72587262
-4.5f, 6.25f, 0f,
72597263
-9f, 6.25f, 0f,
72607264
};
7261-
}},
7265+
}}/*,
72627266
new ShootPattern(){{
72637267
shots = 2;
72647268
shotDelay = 6;
72657269
}}
7270+
*/
72667271
);
72677272
shootSound = Sounds.shootMissilePlasma;
72687273
recoil = 1;
@@ -7409,7 +7414,7 @@ public void draw(Bullet b){
74097414
}};
74107415
}});
74117416
weapons.add(new Weapon("exogenesis-orca-weapon") {{
7412-
reload = 80f;
7417+
reload = 20f;
74137418
mirror = false;
74147419
rotate = true;
74157420
rotateSpeed = 2.5f;
@@ -7421,10 +7426,6 @@ public void draw(Bullet b){
74217426
recoils = 5;
74227427
shootY = 6.25f;
74237428
shoot = new ShootMulti(
7424-
new ShootPattern(){{
7425-
shots = 6;
7426-
shotDelay = 6;
7427-
}},
74287429
new ShootBarrel() {{
74297430
shots = 1;
74307431
barrels = new float[]{
@@ -7434,7 +7435,12 @@ public void draw(Bullet b){
74347435
-4.5f, 6.25f, 0f,
74357436
-9f, 6.25f, 0f,
74367437
};
7438+
}}/*,
7439+
new ShootPattern(){{
7440+
shots = 2;
7441+
shotDelay = 6;
74377442
}}
7443+
*/
74387444
);
74397445
shootSound = Sounds.shootMissilePlasma;
74407446
recoil = 1;

0 commit comments

Comments
 (0)