Skip to content

Commit

Permalink
Pal fuckery fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Eschatologue committed Jun 2, 2023
1 parent 3d265a1 commit 9c3e37f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/UAW/audiovisual/UAWFx.java
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ public static Effect dynamicExplosion(float size) {
}

/**
* Based on Fx.dymamicExplosion, Lines is replaced with circleSparks
* Based on Fx.dynamicExplosion
* @param size
* How big is the explosion, can be based on splashDamageRadius, also adjusts life and clip size
*/
Expand Down Expand Up @@ -743,7 +743,7 @@ public static Effect dynamicExplosion(float size, Color frontColor, Color backCo
Drawf.light(e.x, e.y, i.fin() * 14f * 2f * intensity, Color.white, 0.9f * e.fout());
});

color(frontColor, backColor, Color.gray, e.fin());
color(backColor, frontColor, Color.gray, e.fin());
stroke((1.7f * e.fout()) * (1f + (intensity - 1f) / 2f));

Draw.z(Layer.effect + 0.001f);
Expand Down
9 changes: 4 additions & 5 deletions src/UAW/content/UAWUnitTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ public static void load() {
waveLife = 15f;
smokes = 32;
sparks = 15;
waveColor = Pal.missileYellow.lerp(UAWPal.cryoFront, 15);
waveColor = UAWPal.cryoFront;
sparkColor = UAWPal.cryoMiddle;
waveRad = splashDamageRadius;
smokeRad = splashDamageRadius * 0.8f;
Expand Down Expand Up @@ -979,7 +979,7 @@ public static void load() {
keepVelocity = false;

spawnUnit = new CruiseMissileUnitType(name, cruisemissile_medium_phlog) {{
Color baseColor = Pal.missileYellow;
Color baseColor = UAWPal.phlogistonFront;
float missileDamage = 350;
health = missileDamage * 1.5f;
speed = 4f;
Expand All @@ -1000,8 +1000,7 @@ public static void load() {
hitColor = baseColor;
shootEffect = new MultiEffect(
new ExplosionEffect() {{
lifetime = 30f;
waveLife = 30f;
waveLife = 15f;
smokes = 36;
sparks = 18;
waveRad = splashDamageRadius;
Expand Down Expand Up @@ -1225,7 +1224,7 @@ public static void load() {
new RegionPart("-body"),
new RegionPart("-barrel-front") {{
progress = PartProgress.recoil;
moveY = (barrelMoveY-7) * px;
moveY = (barrelMoveY - 7) * px;
}},
new RegionPart("-barrel-back") {{
progress = PartProgress.recoil;
Expand Down

0 comments on commit 9c3e37f

Please sign in to comment.