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

resolve conflicts

Browse Source
This commit is contained in:
Leonwang4234
2020-10-20 15:57:48 -07:00
parent df37ce3cef
commit 54fd2e03b4
4 changed files with 9 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/blocks/defense/Wall.java
+3 -3
View File
@@ -43,10 +43,10 @@ public class Wall extends Block{
public void setStats(){
super.setStats();
if(chanceDeflect > 0f) stats.add(BlockStat.baseDeflectChance, chanceDeflect, StatUnit.none);
if(chanceDeflect > 0f) stats.add(Stat.baseDeflectChance, chanceDeflect, StatUnit.none);
if(lightningChance > 0f){
stats.add(BlockStat.lightningChance, lightningChance * 100f, StatUnit.percent);
stats.add(BlockStat.lightningDamage, lightningDamage, StatUnit.none);
stats.add(Stat.lightningChance, lightningChance * 100f, StatUnit.percent);
stats.add(Stat.lightningDamage, lightningDamage, StatUnit.none);
}
}