Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sublimate nerf

Browse Source
This commit is contained in:
Anuken
2022-04-26 17:26:25 -04:00
parent 1b884c1a5c
commit 1ee8687d94
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/content/Blocks.java
View File

@@ -3792,27 +3792,27 @@ public class Blocks{
}}; }};
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
liquidConsumed = 4f / 60f; liquidConsumed = 8f / 60f;
float r = range = 130f; float r = range = 130f;
//TODO balance, set up, where is liquid/sec displayed? status effects maybe? //TODO balance, set up, where is liquid/sec displayed? status effects maybe?
ammo( ammo(
Liquids.ozone, new ContinuousFlameBulletType(){{ Liquids.ozone, new ContinuousFlameBulletType(){{
damage = 90f; damage = 70f;
length = r; length = r;
knockback = 1f; knockback = 1f;
pierceCap = 3; pierceCap = 2;
buildingDamageMultiplier = 0.3f; buildingDamageMultiplier = 0.3f;
colors = new Color[]{Color.valueOf("eb7abe").a(0.55f), Color.valueOf("e189f5").a(0.7f), Color.valueOf("907ef7").a(0.8f), Color.valueOf("91a4ff"), Color.white}; colors = new Color[]{Color.valueOf("eb7abe").a(0.55f), Color.valueOf("e189f5").a(0.7f), Color.valueOf("907ef7").a(0.8f), Color.valueOf("91a4ff"), Color.white};
}}, }},
Liquids.cyanogen, new ContinuousFlameBulletType(){{ Liquids.cyanogen, new ContinuousFlameBulletType(){{
damage = 200f; damage = 160f;
rangeChange = 70f; rangeChange = 70f;
length = r + rangeChange; length = r + rangeChange;
knockback = 2f; knockback = 2f;
pierceCap = 4; pierceCap = 3;
buildingDamageMultiplier = 0.3f; buildingDamageMultiplier = 0.3f;
colors = new Color[]{Color.valueOf("465ab8").a(0.55f), Color.valueOf("66a6d2").a(0.7f), Color.valueOf("89e8b6").a(0.8f), Color.valueOf("cafcbe"), Color.white}; colors = new Color[]{Color.valueOf("465ab8").a(0.55f), Color.valueOf("66a6d2").a(0.7f), Color.valueOf("89e8b6").a(0.8f), Color.valueOf("cafcbe"), Color.white};

2
core/src/mindustry/mod/ContentParser.java
View File

@@ -94,8 +94,6 @@ public class ContentParser{
if(data.isString()){ if(data.isString()){
StatusEffect result = locate(ContentType.status, data.asString()); StatusEffect result = locate(ContentType.status, data.asString());
if(result != null) return result; if(result != null) return result;
result = (StatusEffect)fieldOpt(StatusEffects.class, data);
if(result != null) return result;
throw new IllegalArgumentException("Unknown status effect: '" + data.asString() + "'"); throw new IllegalArgumentException("Unknown status effect: '" + data.asString() + "'");
} }
StatusEffect effect = new StatusEffect(currentMod.name + "-" + data.getString("name")); StatusEffect effect = new StatusEffect(currentMod.name + "-" + data.getString("name"));