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

Implemented rework for both smelter and crucible

Browse Source
This commit is contained in:
Anuken
2018-01-05 19:11:36 -05:00
parent cef85e8f36
commit cda1115e9d
9 changed files with 265 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/io/anuke/mindustry/graphics/Fx.java
View File

@@ -163,6 +163,16 @@ public class Fx{
Draw.reset();
});
}),
fuelburn = new Effect(23, e -> {
Angles.randLenVectors(e.id, 5, e.ifract()*9f, (x, y)->{
float len = e.fract()*4f;
Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.ifract());
//Draw.alpha(e.fract());
Draw.rect("circle", e.x + x, e.y + y, len, len);
Draw.reset();
});
}),
laserspark = new Effect(14, e -> {
Angles.randLenVectors(e.id, 8, 1f + e.ifract()*11f, (x, y)->{
@@ -306,7 +316,7 @@ public class Fx{
smelt = new Effect(10, e -> {
Draw.thickness(1f);
Draw.color(Color.YELLOW, Color.RED, e.ifract());
Draw.spikes(e.x, e.y, e.ifract() * 5f, 2, 8);
Draw.spikes(e.x, e.y, e.ifract() * 5f, 1f, 8);
Draw.reset();
}),

7
core/src/io/anuke/mindustry/io/BundleGen.java
View File

@@ -14,8 +14,11 @@ import io.anuke.mindustry.world.Map;
import io.anuke.ucore.core.Inputs.DeviceType;
import io.anuke.ucore.core.KeyBinds;
import io.anuke.ucore.core.KeyBinds.Keybind;
import io.anuke.ucore.scene.ui.SettingsDialog.SettingsTable.Setting;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Mathf;
/**Used for generating a bundle from existing strings in the game.*/
public class BundleGen {
private static FileHandle file;
@@ -25,12 +28,12 @@ public class BundleGen {
file.writeString("", false);
write("about.text=" + join(Vars.aboutText));
write("discord.text=Join the mindustry discord!\n[orange]");
/*
Mathf.each(table -> {
for(Setting setting : table.getSettings()){
write("setting." + setting.name + ".name=" + setting.title);
}
}, Vars.ui.getPrefs().game, Vars.ui.getPrefs().graphics, Vars.ui.getPrefs().sound);*/
}, Vars.ui.settings.game, Vars.ui.settings.graphics, Vars.ui.settings.sound);
for(Map map : Vars.world.maps().list()){
write("map." + map.name + ".name=" + map.name);

8
core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
View File

@@ -23,7 +23,8 @@ public class ProductionBlocks{
smelter = new Crafter("smelter"){
{
health = 70;
requirements = new Item[]{Item.coal, Item.iron};
inputs = new Item[]{Item.iron};
fuel = Item.coal;
result = Item.steel;
}
},
@@ -31,8 +32,11 @@ public class ProductionBlocks{
crucible = new Crafter("crucible"){
{
health = 90;
requirements = new Item[]{Item.titanium, Item.steel};
inputs = new Item[]{Item.titanium, Item.steel};
fuel = Item.coal;
result = Item.dirium;
burnDuration = 80f;
craftTime = 40f;
}
},

4
core/src/io/anuke/mindustry/world/blocks/types/defense/ShieldBlock.java
View File

@@ -17,9 +17,9 @@ import io.anuke.ucore.util.Strings;
public class ShieldBlock extends PowerBlock{
public float shieldRadius = 40f;
public float powerDrain = 0.005f;
public float powerPerDamage = 0.1f;
public float powerPerDamage = 0.07f;
public float maxRadius = 40f;
public float radiusScale = 240f;
public float radiusScale = 300f;
public ShieldBlock(String name) {
super(name);

111
core/src/io/anuke/mindustry/world/blocks/types/production/Crafter.java
View File

@@ -1,24 +1,35 @@
package io.anuke.mindustry.world.blocks.types.production;
import java.util.Arrays;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Effects.Effect;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Strings;
import java.util.Arrays;
public class Crafter extends Block{
protected final int timerDump = timers++;
protected final int timerCraft = timers++;
protected Item[] requirements;
protected Item[] inputs;
protected Item fuel;
protected Item result;
int capacity = 20;
protected float craftTime = 30f; //time to craft one item, so max 2 items per second by default
protected float burnDuration = 60f; //by default, the fuel will burn 60 frames, so that's 2 items/fuel at most
protected Effect craftEffect = Fx.smelt, burnEffect = Fx.fuelburn;
protected int capacity = 30;
public Crafter(String name) {
super(name);
@@ -29,53 +40,105 @@ public class Crafter extends Block{
@Override
public void getStats(Array<String> list){
super.getStats(list);
list.add("[craftinfo]Input: " + Arrays.toString(requirements));
list.add("[craftinfo]Input: " + Arrays.toString(inputs));
list.add("[craftinfo]Fuel: " + fuel);
list.add("[craftinfo]Output: " + result);
list.add("[craftinfo]Capacity per input type: " + capacity);
list.add("[craftinfo]Fuel Duration: " + Strings.toFixed(burnDuration/60f, 1));
list.add("[craftinfo]Max output/second: " + Strings.toFixed(60f/craftTime, 1));
list.add("[craftinfo]Input Capacity: " + capacity);
list.add("[craftinfo]Output Capacity: " + capacity);
}
@Override
public void update(Tile tile){
CrafterEntity entity = tile.entity();
if(tile.entity.timer.get(timerDump, 5) && tile.entity.hasItem(result)){
if(entity.timer.get(timerDump, 5) && entity.hasItem(result)){
tryDump(tile, -1, result);
}
for(Item item : requirements){
if(!tile.entity.hasItem(item)){
//add fuel
if(entity.getItem(fuel) > 0 && entity.burnTime <= 0f){
entity.removeItem(fuel, 1);
entity.burnTime += burnDuration;
Effects.effect(burnEffect, entity.x + Mathf.range(2f), entity.y + Mathf.range(2f));
}
//decrement burntime
if(entity.burnTime > 0){
entity.burnTime -= Timers.delta();
}
//make sure it has all the items
for(Item item : inputs){
if(!entity.hasItem(item)){
return;
}
}
// crafter full - it has to be emptied before it can craft again.
if(tile.entity.getItem(result) >= capacity){
if(entity.getItem(result) >= capacity //output full
|| entity.burnTime <= 0 //not burning
|| !entity.timer.get(timerCraft, craftTime)){ //not yet time
return;
}
for(Item item : requirements){
tile.entity.removeItem(item, 1);
for(Item item : inputs){
entity.removeItem(item, 1);
}
offloadNear(tile, result);
Effects.effect(Fx.smelt, tile.entity);
Effects.effect(craftEffect, entity);
}
@Override
public boolean acceptItem(Item item, Tile dest, Tile source){
for(Item req : requirements){
if(item == req){
return dest.entity.getItem(item) < capacity;
}
int amount = 0;
boolean isInput = false;
for(Item req : inputs){
if(req == item) isInput = true;
amount += dest.entity.getItem(req);
}
return false;
return (isInput && amount < capacity) || (item == fuel && dest.entity.getItem(fuel) < capacity);
}
@Override
public void draw(Tile tile){
super.draw(tile);
CrafterEntity entity = tile.entity();
//draw glowing center
if(entity.burnTime > 0){
Draw.color(1f, 1f, 1f, Mathf.absin(Timers.time(), 9f, 0.4f) + Mathf.random(0.05f));
Draw.rect("smelter-middle", tile.worldx(), tile.worldy());
Draw.color();
}
}
@Override
public void drawSelect(Tile tile){
// each req item has its input buffer + 1 buffer for output.
int totalCapacity = (requirements.length + 1) * capacity;
float fract = ((float)tile.entity.totalItems())/totalCapacity;
//all required items are put into one big capacity buffer
int totalCapacity = capacity;
int amount = 0;
for(Item item : inputs){
amount += tile.entity.getItem(item);
}
float fract = ((float)amount)/totalCapacity;
Vars.renderer.drawBar(Color.GREEN, tile.worldx(), tile.worldy() + 6, fract);
}
@Override
public TileEntity getEntity() {
return new CrafterEntity();
}
public class CrafterEntity extends TileEntity{
public float burnTime;
}
}