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

Unignore icons.properties

Browse Source
This commit is contained in:
Anuken
2022-05-10 20:38:05 -04:00
parent 9d65aa014c
commit e15ed4403c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -165,4 +165,3 @@ android/libs/
# ignored due to frequent branch conflicts. # ignored due to frequent branch conflicts.
core/assets/logicids.dat core/assets/logicids.dat
core/assets/icons/icons.properties

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

@@ -1626,7 +1626,7 @@ public class Blocks{
reinforcedSurgeWall = new Wall("reinforced-surge-wall"){{ reinforcedSurgeWall = new Wall("reinforced-surge-wall"){{
requirements(Category.defense, with(Items.surgeAlloy, 6, Items.tungsten, 2)); requirements(Category.defense, with(Items.surgeAlloy, 6, Items.tungsten, 2));
health = 230 * wallHealthMultiplier; health = 250 * wallHealthMultiplier;
lightningChance = 0.05f; lightningChance = 0.05f;
lightningDamage = 30f; lightningDamage = 30f;
armor = 20f; armor = 20f;
@@ -1634,7 +1634,7 @@ public class Blocks{
reinforcedSurgeWallLarge = new Wall("reinforced-surge-wall-large"){{ reinforcedSurgeWallLarge = new Wall("reinforced-surge-wall-large"){{
requirements(Category.defense, ItemStack.mult(reinforcedSurgeWall.requirements, 4)); requirements(Category.defense, ItemStack.mult(reinforcedSurgeWall.requirements, 4));
health = 230 * wallHealthMultiplier * 4; health = 250 * wallHealthMultiplier * 4;
lightningChance = 0.05f; lightningChance = 0.05f;
lightningDamage = 30f; lightningDamage = 30f;
armor = 20f; armor = 20f;
@@ -1643,13 +1643,13 @@ public class Blocks{
carbideWall = new Wall("carbide-wall"){{ carbideWall = new Wall("carbide-wall"){{
requirements(Category.defense, with(Items.thorium, 6, Items.carbide, 6)); requirements(Category.defense, with(Items.thorium, 6, Items.carbide, 6));
health = 240 * wallHealthMultiplier; health = 270 * wallHealthMultiplier;
armor = 16f; armor = 16f;
}}; }};
carbideWallLarge = new Wall("carbide-wall-large"){{ carbideWallLarge = new Wall("carbide-wall-large"){{
requirements(Category.defense, ItemStack.mult(carbideWall.requirements, 4)); requirements(Category.defense, ItemStack.mult(carbideWall.requirements, 4));
health = 240 * wallHealthMultiplier * 4; health = 270 * wallHealthMultiplier * 4;
armor = 16f; armor = 16f;
size = 2; size = 2;
}}; }};