Skip to content

Commit c744ea9

Browse files
AureusStratusAureusStratus
committed
Unit things2
1 parent 8e77208 commit c744ea9

2 files changed

Lines changed: 33 additions & 27 deletions

File tree

‎assets/bundles/bundle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ unit.exogenesis-triton.description =
6969
unit.exogenesis-notodoris.name = Notodoris
7070
unit.exogenesis-notodoris.description =
7171
unit.exogenesis-notodoris.details =
72-
unit.exogenesis-thor.name = [#ffb98b]thor[]
72+
unit.exogenesis-thor.name = [#98ffa9]thor[]
7373
unit.exogenesis-thor.description = The carrier Titan
7474
unit.exogenesis-thor.details =
7575

@@ -78,7 +78,7 @@ unit.exogenesis-neutron.description =
7878
unit.exogenesis-ursa.name = Ursa
7979
unit.exogenesis-ursa.description =
8080
unit.exogenesis-ursa.details =
81-
unit.exogenesis-ullr.name = [#ffb98b]Ullr[]
81+
unit.exogenesis-ullr.name = [#98ffa9]Ullr[]
8282
unit.exogenesis-ullr.description = The superlaser Titan
8383
unit.exogenesis-ullr.details =
8484

@@ -87,7 +87,7 @@ unit.exogenesis-guardian.description =
8787
unit.exogenesis-pantagruel.name = Pantagruel
8888
unit.exogenesis-pantagruel.description =
8989
unit.exogenesis-pantagruel.details =
90-
unit.exogenesis-helios.name = [#ffb98b]Sol[]
90+
unit.exogenesis-helios.name = [#98ffa9]Sol[]
9191
unit.exogenesis-helios.description = The Orbital Laser Titan
9292
unit.exogenesis-helios.details =
9393

‎src/exogenesis/content/ExoVanillaUnitTypes.java‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5064,7 +5064,7 @@ public void draw(Bullet b){
50645064
ejectEffect = Fx.casing4;
50655065
shootSound = Sounds.laser;
50665066

5067-
bullet = new BasicBulletType(14.5f, 105){{
5067+
bullet = new BasicBulletType(14.5f, 75){{
50685068
width = height = 20;
50695069
sprite = "exogenesis-plasma";
50705070
hitSound = Sounds.explosionbig;
@@ -5087,7 +5087,7 @@ public void draw(Bullet b){
50875087
pierceBuilding = true;
50885088
trailRotation = true;
50895089
lifetime = 22f;
5090-
splashDamage = 55;
5090+
splashDamage = 25;
50915091
splashDamageRadius = 20;
50925092
shrinkY = shrinkX = 0;
50935093
lightning = 7;
@@ -5096,7 +5096,7 @@ public void draw(Bullet b){
50965096
lightningDamage = 11;
50975097
shootEffect = ExoFx.coloredHitLarge;
50985098
fragBullets = 4;
5099-
fragLifeMin = 0f;
5099+
fragLifeMin = 1f;
51005100
fragSpread = 90;
51015101
fragRandomSpread = 0f;
51025102

@@ -5108,7 +5108,7 @@ public void draw(Bullet b){
51085108
pierceBuilding = true;
51095109
pierceCap = 3;
51105110
intervalBullets = 5;
5111-
bulletInterval = 15;
5111+
bulletInterval = 1;
51125112
intervalBullet = new LightningBulletType(){{
51135113
lightningColor = hitColor = Pal.heal;
51145114
damage = 6f;
@@ -5743,7 +5743,7 @@ public void draw(Bullet b){
57435743
lockLegBase = true;
57445744
legContinuousMove = true;
57455745

5746-
legCount = 6;
5746+
legCount = 8;
57475747
legLength = 30f;
57485748
legForwardScl = 2.1f;
57495749
legMoveSpace = 1.05f;
@@ -5755,7 +5755,7 @@ public void draw(Bullet b){
57555755
legStraightLength = 0.9f;
57565756
legMaxLength = 1.2f;
57575757
speed = 0.7f;
5758-
hitSize = 28f;
5758+
hitSize = 38f;
57595759
health = 3450;
57605760
range = 60f;
57615761
parts.addAll(
@@ -5770,20 +5770,21 @@ public void draw(Bullet b){
57705770
useProgress = true;
57715771
progress = PartProgress.charge.curve(Interp.circleIn);
57725772
width = height = 23;
5773+
effectColor = Pal.sap;
57735774
y = 0f;
57745775
effect = Fx.smokeCloud;
57755776
randomEffectRot = 360f;
5776-
effectChance = 0.25f;
5777+
effectChance = 0.55f;
57775778
}},
57785779
new EffectSpawnPart() {{
57795780
useProgress = true;
57805781
progress = PartProgress.charge.curve(Interp.circleIn);
57815782
width = height = 23;
57825783
y = 0f;
5783-
effectColor = Pal.heal;
5784+
effectColor = Pal.sap;
57845785
effect = ExoFx.singleSpark;
57855786
randomEffectRot = 360f;
5786-
effectChance = 0.25f;
5787+
effectChance = 0.55f;
57875788
}},
57885789
new EffectSpawnPart() {{
57895790
useProgress = true;
@@ -6449,7 +6450,7 @@ public void draw(Bullet b){
64496450
bullet = new ContinuousFlameBulletType() {{
64506451
damage = width = 4f;
64516452
layer = Layer.effect;
6452-
drawFlare = collides = collidesGround = collidesAir = collidesGround = false;
6453+
drawFlare = collides = collidesAir = collidesGround = false;
64536454
length = 8;
64546455
divisions = 20;
64556456
colors = new Color[]{Color.valueOf("ec745855"), Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white};
@@ -6645,44 +6646,48 @@ public void draw(Bullet b){
66456646
mirror = false;
66466647
moveRot = 360;
66476648
under = true;
6648-
progress = PartProgress.time.loop(330f);
6649+
heatColor = Pal.heal;
6650+
progress = PartProgress.time.loop(430f);
66496651
outlineLayerOffset = 0.02f;
66506652
layer = Layer.flyingUnit -0.04f;
66516653
}},
66526654
new RegionPart("-body2"){{
66536655
mirror = false;
66546656
moveRot = -360;
66556657
under = true;
6656-
progress = PartProgress.time.loop(280f);
6658+
heatColor = Pal.heal;
6659+
progress = PartProgress.time.loop(380f);
66576660
outlineLayerOffset = 0.02f;
66586661
layer = Layer.flyingUnit -0.03f;
66596662
}},
66606663
new RegionPart("-body2"){{
66616664
mirror = false;
66626665
moveRot = 360;
66636666
under = true;
6664-
progress = PartProgress.time.loop(280f);
6667+
heatColor = Pal.heal;
6668+
progress = PartProgress.time.loop(380f);
66656669
outlineLayerOffset = 0.02f;
66666670
layer = Layer.flyingUnit -0.03f;
66676671
}},
66686672
new RegionPart("-entena"){{
66696673
mirror = false;
66706674
moveRot = 360;
66716675
under = true;
6672-
color = Pal.heal;
6676+
color = heatColor = Pal.heal;
66736677
colorTo = Color.valueOf("000000");
66746678
heatProgress = PartProgress.time.add(-0.2f).add(p -> Mathf.sin(5f, 0.8f)).loop(200);
66756679
outlineLayerOffset = 0.01f;
66766680
layer = Layer.flyingUnit -0.02f;
6677-
progress = PartProgress.time.loop(320f);
6681+
progress = PartProgress.time.loop(420f);
66786682
}},
66796683
new RegionPart("-rotator"){{
66806684
mirror = false;
66816685
moveRot = -360;
66826686
under = true;
6687+
heatColor = Pal.heal;
66836688
outlineLayerOffset = 0.01f;
66846689
layer = Layer.flyingUnit -0.02f;
6685-
progress = PartProgress.time.loop(250f);
6690+
progress = PartProgress.time.loop(350f);
66866691
}}
66876692

66886693
);
@@ -6725,7 +6730,7 @@ public void draw(Bullet b){
67256730
hitColor = trailColor = Pal.heal;
67266731
color = Pal.heal;
67276732
laserSize = 3;
6728-
lifetime = 45;
6733+
lifetime = 75;
67296734
maxRange = 200f;
67306735
splashDamageRadius = 60;
67316736
splashDamage = 10;
@@ -6768,13 +6773,6 @@ public void draw(Bullet b){
67686773
colorTo = Pal.gray.a(0.4f);
67696774
}},
67706775
ExoFx.randLifeSparkCone,
6771-
new Effect(30, e -> {
6772-
Draw.z(Layer.effect);
6773-
Draw.color(Pal.heal, e.fout());
6774-
Tmp.v2.trns(e.rotation, e.fin() * 10f);
6775-
Lines.ellipse(Tmp.v2.x + e.x, Tmp.v2.y + e.y, 0.3f * e.fin() + 0.1f, 35, 35, e.rotation);
6776-
Lines.stroke(2f * e.fout());
6777-
}),
67786776
//other
67796777
new ParticleEffect(){{
67806778
particles = 3;
@@ -6800,6 +6798,14 @@ public void draw(Bullet b){
68006798
bulletInterval = 15;
68016799
intervalBullet = new LightningBulletType(){{
68026800
lightningColor = hitColor = Pal.heal;
6801+
fragBullets = 1;
6802+
6803+
fragBullet = new LightningBulletType(){{
6804+
lightningColor = hitColor = Pal.heal;
6805+
damage = 10f;
6806+
lightningLength = 7;
6807+
lightningLengthRand = 25;
6808+
}};
68036809
damage = 14f;
68046810
lightningLength = 7;
68056811
lightningLengthRand = 17;

0 commit comments

Comments
 (0)