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

tungsten

Browse Source
This commit is contained in:
Anuken
2021-11-02 14:49:05 -04:00
parent 00f03d793f
commit 38f7d2dcd0
8 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/items/item-tungsten.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 382 B

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

@@ -416,3 +416,4 @@
63292=spark|unit-spark-ui 63292=spark|unit-spark-ui
63291=beam-tower|block-beam-tower-ui 63291=beam-tower|block-beam-tower-ui
63290=build-tower|block-build-tower-ui 63290=build-tower|block-build-tower-ui
63289=tungsten|item-tungsten-ui

BIN
core/assets/logicids.dat
View File

Binary file not shown.

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

@@ -1161,7 +1161,7 @@ public class Blocks implements ContentList{
buildTower = new BuildTurret("build-tower"){{ buildTower = new BuildTurret("build-tower"){{
requirements(Category.effect, with(Items.graphite, 40, Items.beryllium, 50)); requirements(Category.effect, with(Items.graphite, 40, Items.beryllium, 50));
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
consumes.power(1.5f); consumes.power(3f);
range = 120f; range = 120f;
size = 3; size = 3;
health = 80; health = 80;

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

@@ -8,7 +8,7 @@ public class Items implements ContentList{
public static Item public static Item
scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium, scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium,
phaseFabric, surgeAlloy, sporePod, sand, blastCompound, pyratite, metaglass, phaseFabric, surgeAlloy, sporePod, sand, blastCompound, pyratite, metaglass,
beryllium, fissileMatter, dormantCyst; beryllium, fissileMatter, dormantCyst, tungsten;
@Override @Override
public void load(){ public void load(){
@@ -99,12 +99,15 @@ public class Items implements ContentList{
}}; }};
fissileMatter = new Item("fissile-matter", Color.valueOf("536631")){{ fissileMatter = new Item("fissile-matter", Color.valueOf("536631")){{
hardness = 4;
radioactivity = 1.5f; radioactivity = 1.5f;
}}; }};
dormantCyst = new Item("dormant-cyst", Color.valueOf("df824d")){{ dormantCyst = new Item("dormant-cyst", Color.valueOf("df824d")){{
flammability = 0.1f; flammability = 0.1f;
}}; }};
tungsten = new Item("tungsten", Color.valueOf("768a9a")){{
hardness = 5;
}};
} }
} }

12
core/src/mindustry/entities/units/BuildPlan.java
View File

@@ -78,13 +78,13 @@ public class BuildPlan implements Position{
/** Transforms the internal position of this config using the specified function, and return the result. */ /** Transforms the internal position of this config using the specified function, and return the result. */
public static Object pointConfig(Block block, Object config, Cons<Point2> cons){ public static Object pointConfig(Block block, Object config, Cons<Point2> cons){
if(config instanceof Point2){ if(config instanceof Point2 point){
config = ((Point2)config).cpy(); config = point.cpy();
cons.get((Point2)config); cons.get(point);
}else if(config instanceof Point2[]){ }else if(config instanceof Point2[] points){
Point2[] result = new Point2[((Point2[])config).length]; Point2[] result = new Point2[points.length];
int i = 0; int i = 0;
for(Point2 p : (Point2[])config){ for(Point2 p : points){
result[i] = p.cpy(); result[i] = p.cpy();
cons.get(result[i++]); cons.get(result[i++]);
} }

2
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
View File

@@ -197,7 +197,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
} }
//not allowed //not allowed
state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal, Items.lead); state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal, Items.lead, Items.blastCompound, Items.pyratite, Items.sporePod, Items.metaglass);
//it is very hot //it is very hot
state.rules.attributes.set(Attribute.heat, 0.8f); state.rules.attributes.set(Attribute.heat, 0.8f);

4
core/src/mindustry/world/blocks/defense/BuildTurret.java
View File

@@ -26,7 +26,7 @@ public class BuildTurret extends BaseTurret{
public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion; public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
public float buildSpeed = 1f; public float buildSpeed = 1f;
public float buildBeamOffset = 4.1f; public float buildBeamOffset = 5f;
//created in init() //created in init()
public @Nullable UnitType unitType; public @Nullable UnitType unitType;
public float elevation = -1f; public float elevation = -1f;
@@ -53,9 +53,9 @@ public class BuildTurret extends BaseTurret{
commandLimit = 0; commandLimit = 0;
rotateSpeed = BuildTurret.this.rotateSpeed; rotateSpeed = BuildTurret.this.rotateSpeed;
buildBeamOffset = BuildTurret.this.buildBeamOffset; buildBeamOffset = BuildTurret.this.buildBeamOffset;
constructor = BlockUnitUnit::create;
buildRange = BuildTurret.this.range; buildRange = BuildTurret.this.range;
buildSpeed = BuildTurret.this.buildSpeed; buildSpeed = BuildTurret.this.buildSpeed;
constructor = BlockUnitUnit::create;
}}; }};
} }