Skip to content

Commit 196a46a

Browse files
committed
Vanstar unit stuff
1 parent 562a119 commit 196a46a

1 file changed

Lines changed: 20 additions & 12 deletions

File tree

src/exogenesis/content/ExoVanillaUnitTypes.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public static void load() {
113113

114114
);
115115
weapons.add(new Weapon("exogenesis-mt-mrk2-bedrock-breaker-weaponBody"){{
116-
shootSound = ExoSounds.heavyRound;
116+
shootSound = ExoSounds.jupiterShoot;
117117
mirror = false;
118118
shootCone = 30f;
119119
rotateSpeed = 0.5f;
@@ -122,7 +122,7 @@ public static void load() {
122122
x = 0f;
123123
y = 0;
124124
recoils = 2;
125-
recoil = 7f;
125+
recoil = 0f;
126126
reload = 25f;
127127
shake = 3f;
128128
velocityRnd = 0.1f;
@@ -136,7 +136,7 @@ public static void load() {
136136
cooldownTime = 50;
137137
heatProgress = PartProgress.recoil;
138138
progress = PartProgress.recoil;
139-
moveY = -4f;
139+
moveY = -6f;
140140
}},
141141
new RegionPart("-barrels-2") {{
142142
mirror = false;
@@ -145,7 +145,7 @@ public static void load() {
145145
cooldownTime = 50;
146146
heatProgress = PartProgress.recoil;
147147
progress = PartProgress.recoil;
148-
moveY = -4f;
148+
moveY = -6f;
149149
}}
150150
);
151151
shoot = new ShootBarrel() {{
@@ -2912,6 +2912,7 @@ public void draw(Bullet b){
29122912
shootEffect = new MultiEffect(ExoFx.squareShoot, ExoFx.squareHitsmall);
29132913
smokeEffect = Fx.colorSpark;
29142914
range = 85;
2915+
arc = 0.05f;
29152916
targetRange = 10;
29162917
damage = 40;
29172918
distanceDamageFalloff = 2;
@@ -3357,6 +3358,7 @@ public void draw(Bullet b){
33573358
health = 850;
33583359
armor = 6f;
33593360
itemCapacity = 0;
3361+
canDrown = false;
33603362
squareShape = true;
33613363
omniMovement = false;
33623364
rotateMoveFirst = true;
@@ -3436,6 +3438,7 @@ public void draw(Bullet b){
34363438
health = 2100;
34373439
armor = 8f;
34383440
itemCapacity = 0;
3441+
canDrown = false;
34393442
rotateMoveFirst = true;
34403443
hovering = true;
34413444
singleTarget = true;
@@ -3495,13 +3498,13 @@ public void draw(Bullet b){
34953498
unitDamageScl = 1.5f;
34963499
radius = 0;
34973500
speed = 9;
3498-
damage = 27;
3501+
damage = 20;
34993502
drag = 0.06f;
35003503
lifetime = 55f;
35013504
trailWidth = 4f;
35023505
trailLength = 5;
35033506
splashDamageRadius = 40;
3504-
splashDamage = 25;
3507+
splashDamage = 10;
35053508
pierce = true;
35063509
pierceCap = 2;
35073510
hitEffect = Fx.blastExplosion;
@@ -3530,6 +3533,7 @@ public void draw(Bullet b){
35303533
health = 5000;
35313534
armor = 11f;
35323535
itemCapacity = 0;
3536+
canDrown = false;
35333537
rotateMoveFirst = true;
35343538
hovering = true;
35353539
singleTarget = true;
@@ -3569,6 +3573,7 @@ public void draw(Bullet b){
35693573
reload = 80f;
35703574
shootY = 16f;
35713575
recoil = 3f;
3576+
layerOffset = 0.0001f;
35723577
rotate = true;
35733578
rotateSpeed = 2.3f;
35743579
mirror = false;
@@ -3645,6 +3650,7 @@ public void draw(Bullet b){
36453650
health = 11000;
36463651
armor = 20f;
36473652
itemCapacity = 0;
3653+
canDrown = false;
36483654
rotateMoveFirst = true;
36493655
hovering = true;
36503656
singleTarget = true;
@@ -3678,7 +3684,7 @@ public void draw(Bullet b){
36783684
weapons.add(new Weapon("exogenesis-thunderstorm-weapon") {{
36793685
shootSound = Sounds.blaster;
36803686
soundPitchMax = 1.3f;
3681-
reload = 22f;
3687+
reload = 18f;
36823688
layerOffset = 0.1f;
36833689
shootY = 0f;
36843690
shake = 2f;
@@ -3730,12 +3736,12 @@ public void draw(Bullet b){
37303736
}};
37313737

37323738
bullet = new ChainLightningBulletType() {{
3733-
lightningColor = ExoPal.erekirYellow;
3739+
lightningColor = hitColor = ExoPal.erekirYellow;
37343740
range = 120;
37353741
width = 8;
3736-
shootEffect = Fx.colorSpark;
3737-
hitEffect = Fx.circleColorSpark;
3738-
arc = 0.15f;
3742+
shootEffect = new MultiEffect(Fx.colorSparkBig, Fx.shootBigColor);
3743+
hitEffect = Fx.hitBulletColor;
3744+
arc = 0.06f;
37393745
targetRange = 20;
37403746
damage = 73;
37413747
distanceDamageFalloff = 4;
@@ -3752,6 +3758,7 @@ public void draw(Bullet b){
37523758
outlineRadius = 5;
37533759
armor = 26f;
37543760
rotateSpeed = 0.8f;
3761+
canDrown = false;
37553762
rotateMoveFirst = true;
37563763
hovering = true;
37573764
faceTarget = false;
@@ -3885,6 +3892,7 @@ public void draw(Bullet b){
38853892
speed = 0.78f;
38863893
hitSize = 90f;
38873894
health = 32000f;
3895+
canDrown = false;
38883896
faceTarget = false;
38893897
fogRadius = 50;
38903898
armor = 45;
@@ -3944,7 +3952,7 @@ public void draw(Bullet b){
39443952
color = ExoPal.erekirYellow;
39453953
}});
39463954
weapons.add(new Weapon("exogenesis-hyperion-weapon") {{
3947-
shootSound = Sounds.mediumCannon;
3955+
shootSound = ExoSounds.cannonFire;
39483956
top = rotate = true;
39493957
mirror = false;
39503958
x = 0;

0 commit comments

Comments
 (0)