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

Misc requirement tweaks

Browse Source
This commit is contained in:
Anuken
2022-10-23 10:30:34 -04:00
parent 2ba4a3991b
commit c8fb0659d4
2 changed files with 7 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

@@ -2436,20 +2436,21 @@ public class Blocks{
requirements(Category.power, with(Items.beryllium, 8)); requirements(Category.power, with(Items.beryllium, 8));
consumesPower = outputsPower = true; consumesPower = outputsPower = true;
health = 90; health = 90;
consumePowerBuffered(1000f);
range = 10; range = 10;
fogRadius = 1; fogRadius = 1;
researchCost = with(Items.beryllium, 5); researchCost = with(Items.beryllium, 5);
consumePowerBuffered(1000f);
}}; }};
//TODO requirements
beamTower = new BeamNode("beam-tower"){{ beamTower = new BeamNode("beam-tower"){{
requirements(Category.power, with(Items.beryllium, 30, Items.oxide, 20, Items.silicon, 10)); requirements(Category.power, with(Items.beryllium, 30, Items.oxide, 10, Items.silicon, 10));
size = 3; size = 3;
consumesPower = outputsPower = true; consumesPower = outputsPower = true;
consumePowerBuffered(40000f);
range = 23; range = 23;
scaledHealth = 90; scaledHealth = 90;
consumePowerBuffered(40000f);
}}; }};
beamLink = new LongPowerNode("beam-link"){{ beamLink = new LongPowerNode("beam-link"){{
@@ -2754,7 +2755,6 @@ public class Blocks{
consumeLiquid(Liquids.water, 0.15f); consumeLiquid(Liquids.water, 0.15f);
}}; }};
//TODO output heat?
ventCondenser = new AttributeCrafter("vent-condenser"){{ ventCondenser = new AttributeCrafter("vent-condenser"){{
requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 60)); requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 60));
attribute = Attribute.steam; attribute = Attribute.steam;

4
core/src/mindustry/game/FogControl.java
View File

@@ -101,7 +101,7 @@ public final class FogControl implements CustomChunk{
} }
public boolean isDiscovered(Team team, int x, int y){ public boolean isDiscovered(Team team, int x, int y){
if(!state.rules.staticFog || team.isAI()) return true; if(!state.rules.staticFog || team == null || team.isAI()) return true;
var data = getDiscovered(team); var data = getDiscovered(team);
if(data == null) return false; if(data == null) return false;
@@ -114,7 +114,7 @@ public final class FogControl implements CustomChunk{
} }
public boolean isVisibleTile(Team team, int x, int y){ public boolean isVisibleTile(Team team, int x, int y){
if(!state.rules.fog || team.isAI()) return true; if(!state.rules.fog|| team == null || team.isAI()) return true;
var data = data(team); var data = data(team);
if(data == null) return false; if(data == null) return false;