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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-09-05 10:14:53 -04:00
parent 631b0a7761 f447aeff3e
commit bc74208c8c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -768,14 +768,14 @@ public class Blocks implements ContentList{
phaseWall = new Wall("phase-wall"){{ phaseWall = new Wall("phase-wall"){{
requirements(Category.defense, with(Items.phasefabric, 6)); requirements(Category.defense, with(Items.phasefabric, 6));
health = 150 * wallHealthMultiplier; health = 150 * wallHealthMultiplier;
flashWhite = deflect = true; flashHit = deflect = true;
}}; }};
phaseWallLarge = new Wall("phase-wall-large"){{ phaseWallLarge = new Wall("phase-wall-large"){{
requirements(Category.defense, ItemStack.mult(phaseWall.requirements, 4)); requirements(Category.defense, ItemStack.mult(phaseWall.requirements, 4));
health = 150 * 4 * wallHealthMultiplier; health = 150 * 4 * wallHealthMultiplier;
size = 2; size = 2;
flashWhite = deflect = true; flashHit = deflect = true;
}}; }};
surgeWall = new Wall("surge-wall"){{ surgeWall = new Wall("surge-wall"){{

10
core/src/mindustry/world/blocks/defense/Wall.java
View File

@@ -19,9 +19,11 @@ public class Wall extends Block{
public float lightningChance = -0.001f; public float lightningChance = -0.001f;
public float lightningDamage = 20f; public float lightningDamage = 20f;
public int lightningLength = 17; public int lightningLength = 17;
public Color lightningColor = Pal.surge;
public float chanceDeflect = 10f; public float chanceDeflect = 10f;
public boolean flashWhite; public boolean flashHit;
public Color flashColor = Color.white;
public boolean deflect; public boolean deflect;
public Wall(String name){ public Wall(String name){
@@ -68,10 +70,10 @@ public class Wall extends Block{
} }
//draw flashing white overlay if enabled //draw flashing white overlay if enabled
if(flashWhite){ if(flashHit){
if(hit < 0.0001f) return; if(hit < 0.0001f) return;
Draw.color(Color.white); Draw.color(flashColor);
Draw.alpha(hit * 0.5f); Draw.alpha(hit * 0.5f);
Draw.blend(Blending.additive); Draw.blend(Blending.additive);
Fill.rect(x, y, tilesize * size, tilesize * size); Fill.rect(x, y, tilesize * size, tilesize * size);
@@ -91,7 +93,7 @@ public class Wall extends Block{
//create lightning if necessary //create lightning if necessary
if(lightningChance > 0){ if(lightningChance > 0){
if(Mathf.chance(lightningChance)){ if(Mathf.chance(lightningChance)){
Lightning.create(team, Pal.surge, lightningDamage, x, y, bullet.rotation() + 180f, lightningLength); Lightning.create(team, lightningColor, lightningDamage, x, y, bullet.rotation() + 180f, lightningLength);
} }
} }