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

Beam drill tier fix

Browse Source
This commit is contained in:
Anuken
2022-02-15 12:06:02 -05:00
parent a8ef160051
commit 3babe7686b
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/icons/icons.properties
View File

@@ -540,3 +540,4 @@
63163=carbide-wall|block-carbide-wall-ui 63163=carbide-wall|block-carbide-wall-ui
63162=carbide-wall-large|block-carbide-wall-large-ui 63162=carbide-wall-large|block-carbide-wall-large-ui
63161=prime-control-core|block-prime-control-core-ui 63161=prime-control-core|block-prime-control-core-ui
63160=ore-wall-thorium|block-ore-wall-thorium-ui

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

@@ -2471,7 +2471,7 @@ public class Blocks{
requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 30)); requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 30));
consumes.power(0.15f); consumes.power(0.15f);
drillTime = 160f; drillTime = 160f;
tier = 4; tier = 3;
size = 2; size = 2;
range = 4; range = 4;
researchCostMultiplier = 0.18f; researchCostMultiplier = 0.18f;
@@ -2485,7 +2485,7 @@ public class Blocks{
requirements(Category.production, with(Items.silicon, 100, Items.oxide, 30, Items.beryllium, 100, Items.tungsten, 70)); requirements(Category.production, with(Items.silicon, 100, Items.oxide, 30, Items.beryllium, 100, Items.tungsten, 70));
consumes.power(0.8f); consumes.power(0.8f);
drillTime = 120f; drillTime = 120f;
tier = 5; tier = 4;
size = 3; size = 3;
range = 6; range = 6;
laserWidth = 0.7f; laserWidth = 0.7f;
@@ -3719,7 +3719,7 @@ public class Blocks{
consumes.power(2f); consumes.power(2f);
size = 3; size = 3;
//TODO expand this list //TODO expand this list
filter = Seq.with(Blocks.primeControlCore, Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.reinforcedLiquidContainer); filter = Seq.with(Blocks.primeControlCore, Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.reinforcedLiquidContainer, Blocks.beamNode);
}}; }};
//yes this block is pretty much useless //yes this block is pretty much useless

2
core/src/mindustry/content/Items.java
View File

@@ -100,7 +100,7 @@ public class Items{
}}; }};
beryllium = new Item("beryllium", Color.valueOf("3a8f64")){{ beryllium = new Item("beryllium", Color.valueOf("3a8f64")){{
hardness = 4; hardness = 3;
cost = 1.2f; cost = 1.2f;
healthScaling = 0.6f; healthScaling = 0.6f;
}}; }};

6
core/src/mindustry/content/UnitTypes.java
View File

@@ -256,7 +256,7 @@ public class UnitTypes{
ejectEffect = Fx.casing4; ejectEffect = Fx.casing4;
shootSound = Sounds.bang; shootSound = Sounds.bang;
bullet = new BasicBulletType(13f, 70){{ bullet = new BasicBulletType(13f, 80){{
pierce = true; pierce = true;
pierceCap = 10; pierceCap = 10;
width = 14f; width = 14f;
@@ -266,14 +266,14 @@ public class UnitTypes{
fragVelocityMin = 0.4f; fragVelocityMin = 0.4f;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
splashDamage = 16f; splashDamage = 18f;
splashDamageRadius = 13f; splashDamageRadius = 13f;
fragBullets = 3; fragBullets = 3;
fragLifeMin = 0f; fragLifeMin = 0f;
fragCone = 30f; fragCone = 30f;
fragBullet = new BasicBulletType(9f, 18){{ fragBullet = new BasicBulletType(9f, 20){{
width = 10f; width = 10f;
height = 10f; height = 10f;
pierce = true; pierce = true;

3
core/src/mindustry/game/Teams.java
View File

@@ -72,8 +72,7 @@ public class Teams{
/** Returns team data by type. */ /** Returns team data by type. */
public TeamData get(Team team){ public TeamData get(Team team){
if(map[team.id] == null) map[team.id] = new TeamData(team); return map[team.id] == null ? (map[team.id] = new TeamData(team)) : map[team.id];
return map[team.id];
} }
public Seq<CoreBuild> playerCores(){ public Seq<CoreBuild> playerCores(){

13
core/src/mindustry/world/blocks/logic/MemoryBlock.java
View File

@@ -5,6 +5,8 @@ import mindustry.gen.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
import static mindustry.Vars.*;
public class MemoryBlock extends Block{ public class MemoryBlock extends Block{
public int memoryCapacity = 32; public int memoryCapacity = 32;
@@ -24,6 +26,15 @@ public class MemoryBlock extends Block{
stats.add(Stat.memoryCapacity, memoryCapacity, StatUnit.none); stats.add(Stat.memoryCapacity, memoryCapacity, StatUnit.none);
} }
public boolean accessible(){
return !privileged || state.rules.editor;
}
@Override
public boolean canBreak(Tile tile){
return accessible();
}
public class MemoryBuild extends Building{ public class MemoryBuild extends Building{
public double[] memory = new double[memoryCapacity]; public double[] memory = new double[memoryCapacity];
@@ -40,7 +51,7 @@ public class MemoryBlock extends Block{
@Override @Override
public boolean displayable(){ public boolean displayable(){
return !privileged; return accessible();
} }
@Override @Override