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

Fixed cores being placeable on nothing

Browse Source
This commit is contained in:
Anuken
2020-09-27 23:00:38 -04:00
parent 482ec4b43c
commit 078a68a07d
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,6 +209,9 @@ public class Blocks implements ContentList{
isLiquid = true; isLiquid = true;
cacheLayer = CacheLayer.slag; cacheLayer = CacheLayer.slag;
attributes.set(Attribute.heat, 0.85f); attributes.set(Attribute.heat, 0.85f);
lightRadius = 65f;
lightColor = Color.orange.cpy().a(0.4f);
}}; }};
stone = new Floor("stone"); stone = new Floor("stone");
@@ -243,7 +246,7 @@ public class Blocks implements ContentList{
blendGroup = basalt; blendGroup = basalt;
emitLight = true; emitLight = true;
lightRadius = 60f; lightRadius = 50f;
lightColor = Color.orange.cpy().a(0.3f); lightColor = Color.orange.cpy().a(0.3f);
}}; }};

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

@@ -419,7 +419,7 @@ public class UnitTypes implements ContentList{
continuous = true; continuous = true;
cooldownTime = 200f; cooldownTime = 200f;
bullet = new ContinuousLaserBulletType(17){{ bullet = new ContinuousLaserBulletType(20){{
length = 150f; length = 150f;
hitEffect = Fx.hitMeltHeal; hitEffect = Fx.hitMeltHeal;
drawSize = 420f; drawSize = 420f;
@@ -430,7 +430,7 @@ public class UnitTypes implements ContentList{
shootEffect = Fx.greenLaserChargeSmall; shootEffect = Fx.greenLaserChargeSmall;
incendChance = 0.02f; incendChance = 0.05f;
incendSpread = 5f; incendSpread = 5f;
incendAmount = 1; incendAmount = 1;
@@ -489,7 +489,7 @@ public class UnitTypes implements ContentList{
bullet = new LaserBulletType(){{ bullet = new LaserBulletType(){{
length = 500f; length = 500f;
damage = 520f; damage = 550f;
width = 75f; width = 75f;
lifetime = 65f; lifetime = 65f;

2
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -101,7 +101,7 @@ public class CoreBlock extends StorageBlock{
CoreBuild core = team.core(); CoreBuild core = team.core();
//must have all requirements //must have all requirements
if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements))) return false; if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements))) return false;
return canReplace(tile.block()); return tile.block() instanceof CoreBlock && size > tile.block().size;
} }
@Override @Override