mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Unfinished block / Bugfixes

Browse Source
This commit is contained in:
Anuken 2019-01-23 23:43:31 -05:00
parent 9dd6a77c76
commit 9a444da343
9 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/units/crawler-base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 93 B

BIN
core/assets-raw/sprites/units/crawler-leg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 B

BIN
core/assets-raw/sprites/units/crawler.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 169 B

17
core/src/io/anuke/mindustry/content/Blocks.java
View File

@ -36,7 +36,7 @@ public class Blocks implements ContentList{
grass, shrub, rock, icerock, blackrock, rocks, pine, grass, shrub, rock, icerock, blackrock, rocks, pine,
//crafting //crafting
siliconSmelter, plastaniumCompressor, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer, siliconSmelter, graphitePress, plastaniumCompressor, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
melter, separator, centrifuge, biomatterCompressor, pulverizer, incinerator, melter, separator, centrifuge, biomatterCompressor, pulverizer, incinerator,
//sandbox //sandbox
@ -234,6 +234,21 @@ public class Blocks implements ContentList{
consumes.power(0.05f); consumes.power(0.05f);
}}; }};
graphitePress = new PowerSmelter("graphite-press"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 200, Items.lead, 50));
health = 90;
craftEffect = Fx.smeltsmoke;
result = Items.graphite;
craftTime = 50f;
size = 2;
hasLiquids = false;
flameColor = Color.valueOf("ffef99");
consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.sand, 2));
consumes.power(0.05f);
}};
plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{ plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{
requirements(Category.crafting, ItemStack.with(Items.silicon, 160, Items.lead, 230, Items.graphite, 120, Items.titanium, 160)); requirements(Category.crafting, ItemStack.with(Items.silicon, 160, Items.lead, 230, Items.graphite, 120, Items.titanium, 160));
hasItems = true; hasItems = true;

2
core/src/io/anuke/mindustry/content/Bullets.java
View File

@ -645,7 +645,7 @@ public class Bullets implements ContentList{
explode = new BombBulletType(2f, 3f, "clear"){{ explode = new BombBulletType(2f, 3f, "clear"){{
hitEffect = Fx.pulverize; hitEffect = Fx.pulverize;
lifetime = 20f; lifetime = 23f;
speed = 1f; speed = 1f;
splashDamageRadius = 60f; splashDamageRadius = 60f;
splashDamage = 30f; splashDamage = 30f;

2
core/src/io/anuke/mindustry/content/Zones.java
View File

@ -58,7 +58,7 @@ public class Zones implements ContentList{
}}; }};
}}; }};
craters = new Zone("craters", new MapGenerator("craters", 1){{ distortion = 1.44f; }}){{ //TODO implement craters = new Zone("craters", new MapGenerator("craters", 1){{ distortion = 1.44f; }}){{
alwaysUnlocked = true; alwaysUnlocked = true;
deployCost = ItemStack.with(Items.copper, 300); deployCost = ItemStack.with(Items.copper, 300);

2
core/src/io/anuke/mindustry/core/UI.java
View File

@ -238,7 +238,7 @@ public class UI implements ApplicationListener{
Table table = new Table(); Table table = new Table();
table.setFillParent(true); table.setFillParent(true);
table.actions(Actions.fadeOut(7f, Interpolation.fade), Actions.removeActor()); table.actions(Actions.fadeOut(7f, Interpolation.fade), Actions.removeActor());
table.top().add(info).padTop(40); table.top().add(info).padTop(10);
Core.scene.add(table); Core.scene.add(table);
} }

1
core/src/io/anuke/mindustry/core/World.java
View File

@ -237,6 +237,7 @@ public class World implements ApplicationListener{
} }
} }
state.rules.zone = zone.id; state.rules.zone = zone.id;
state.set(State.playing);
control.saves.zoneSave(); control.saves.zoneSave();
logic.play(); logic.play();
}); });

4
core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
View File

@ -95,8 +95,8 @@ public class MapGenerator extends Generator{
int rad = 10, frad = 12; int rad = 10, frad = 12;
for(int x = rad; x <= rad; x++){ for(int x = -rad; x <= rad; x++){
for(int y = rad; y <= rad; y++){ for(int y = -rad; y <= rad; y++){
int wx = x + point.x, wy = y + point.y; int wx = x + point.x, wy = y + point.y;
double dst = Mathf.dst(x, y); double dst = Mathf.dst(x, y);
if(dst < frad && Structs.inBounds(wx, wy, tiles) && (dst <= rad || Mathf.chance(0.5))){ if(dst < frad && Structs.inBounds(wx, wy, tiles) && (dst <= rad || Mathf.chance(0.5))){