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

Many bugfixes / Dagger unit buffed / Build times increased

Browse Source
This commit is contained in:
Anuken
2018-08-07 11:17:32 -04:00
parent e6c4c66199
commit dcb840f290
10 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -65,6 +65,8 @@ text.none=<none>
text.close=Close text.close=Close
text.quit=Quit text.quit=Quit
text.maps=Maps text.maps=Maps
text.continue=Continue
text.nextmission=Next Mission
text.maps.none=[LIGHT_GRAY]No maps found! text.maps.none=[LIGHT_GRAY]No maps found!
text.about.button=About text.about.button=About
text.name=Name: text.name=Name:

4
core/src/io/anuke/mindustry/content/UnitTypes.java
View File

@@ -29,7 +29,7 @@ public class UnitTypes implements ContentList{
drag = 0.4f; drag = 0.4f;
range = 40f; range = 40f;
weapon = Weapons.chainBlaster; weapon = Weapons.chainBlaster;
health = 70; health = 90;
}}; }};
titan = new UnitType("titan", Titan.class, Titan::new){{ titan = new UnitType("titan", Titan.class, Titan::new){{
@@ -38,7 +38,7 @@ public class UnitTypes implements ContentList{
drag = 0.4f; drag = 0.4f;
range = 10f; range = 10f;
weapon = Weapons.chainBlaster; weapon = Weapons.chainBlaster;
health = 260; health = 280;
}}; }};
interceptor = new UnitType("interceptor", Interceptor.class, Interceptor::new){{ interceptor = new UnitType("interceptor", Interceptor.class, Interceptor::new){{

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

@@ -35,7 +35,7 @@ public class Weapons implements ContentList{
chainBlaster = new Weapon("chain-blaster"){{ chainBlaster = new Weapon("chain-blaster"){{
length = 1.5f; length = 1.5f;
reload = 30f; reload = 28f;
roundrobin = true; roundrobin = true;
ejectEffect = ShootFx.shellEjectSmall; ejectEffect = ShootFx.shellEjectSmall;
setAmmo(AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletTungsten, AmmoTypes.bulletSilicon, AmmoTypes.bulletThorium); setAmmo(AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletTungsten, AmmoTypes.bulletSilicon, AmmoTypes.bulletThorium);

12
core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java
View File

@@ -16,7 +16,7 @@ public class UnitBlocks extends BlockList implements ContentList{
public void load(){ public void load(){
dronePad = new UnitPad("drone-pad"){{ dronePad = new UnitPad("drone-pad"){{
type = UnitTypes.drone; type = UnitTypes.drone;
produceTime = 4000; produceTime = 4300;
size = 2; size = 2;
consumes.power(0.08f); consumes.power(0.08f);
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)}); consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)});
@@ -32,7 +32,7 @@ public class UnitBlocks extends BlockList implements ContentList{
interceptorPad = new UnitPad("interceptor-pad"){{ interceptorPad = new UnitPad("interceptor-pad"){{
type = UnitTypes.interceptor; type = UnitTypes.interceptor;
produceTime = 1700; produceTime = 1900;
size = 2; size = 2;
consumes.power(0.1f); consumes.power(0.1f);
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)}); consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)});
@@ -40,7 +40,7 @@ public class UnitBlocks extends BlockList implements ContentList{
monsoonPad = new UnitPad("monsoon-pad"){{ monsoonPad = new UnitPad("monsoon-pad"){{
type = UnitTypes.monsoon; type = UnitTypes.monsoon;
produceTime = 3300; produceTime = 3600;
size = 3; size = 3;
consumes.power(0.2f); consumes.power(0.2f);
shadow = "shadow-round-3"; shadow = "shadow-round-3";
@@ -49,15 +49,15 @@ public class UnitBlocks extends BlockList implements ContentList{
daggerPad = new UnitPad("dagger-pad"){{ daggerPad = new UnitPad("dagger-pad"){{
type = UnitTypes.dagger; type = UnitTypes.dagger;
produceTime = 700; produceTime = 1800;
size = 2; size = 2;
consumes.power(0.05f); consumes.power(0.05f);
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 5), new ItemStack(Items.tungsten, 10)}); consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.tungsten, 15)});
}}; }};
titanPad = new UnitPad("titan-pad"){{ titanPad = new UnitPad("titan-pad"){{
type = UnitTypes.titan; type = UnitTypes.titan;
produceTime = 2300; produceTime = 3700;
size = 3; size = 3;
consumes.power(0.15f); consumes.power(0.15f);
shadow = "shadow-round-3"; shadow = "shadow-round-3";

2
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -607,7 +607,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
movement.setZero(); movement.setZero();
} }
velocity.add(movement); velocity.add(movement.scl(Timers.delta()));
if(velocity.len() <= 0.2f){ if(velocity.len() <= 0.2f){
rotation += Mathf.sin(Timers.time() + id * 99, 10f, 1f); rotation += Mathf.sin(Timers.time() + id * 99, 10f, 1f);

2
core/src/io/anuke/mindustry/game/Difficulty.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.game;
import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Bundles;
public enum Difficulty{ public enum Difficulty{
easy(2f, 1.5f), easy(1.2f, 1.5f),
normal(1f, 1f), normal(1f, 1f),
hard(0.5f, 0.75f), hard(0.5f, 0.75f),
insane(0.25f, 0.5f); insane(0.25f, 0.5f);

5
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -565,9 +565,8 @@ public class MobileInput extends InputHandler implements GestureListener{
//add to selection queue if it's a valid BREAK position //add to selection queue if it's a valid BREAK position
cursor = cursor.target(); cursor = cursor.target();
selection.add(new PlaceRequest(cursor.worldx(), cursor.worldy())); selection.add(new PlaceRequest(cursor.worldx(), cursor.worldy()));
}else if(!tileTapped(cursor.target()) && !canTapPlayer(worldx, worldy)){ }else if(!tileTapped(cursor.target()) && !canTapPlayer(worldx, worldy) && !tryBeginMine(cursor)){
tryBeginMine(cursor); //else, try and carry units
}else{ //else, try and carry units
if(player.getCarry() != null){ if(player.getCarry() != null){
player.dropCarry(); //drop off unit player.dropCarry(); //drop off unit
}else{ }else{

9
core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java
View File

@@ -15,9 +15,14 @@ public class MissionDialog extends FloatingDialog{
buttons().clear(); buttons().clear();
content().clear(); content().clear();
addCloseButton(); buttons().addButton("$text.nextmission", () -> {
hide();
Vars.ui.paused.runExitSave();
Vars.ui.sectors.show();
}).size(190f, 64f);
buttons().addButton("$text.continue", this::hide).size(190f, 64f);
buttons().addButton("$text.quit", () -> Vars.ui.paused.runExitSave()).size(190f, 64f);
content().add(Bundles.format("text.mission.complete.body", sector.x, sector.y)).pad(10); content().add(Bundles.format("text.mission.complete.body", sector.x, sector.y)).pad(10);
show(); show();
} }

2
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -43,7 +43,7 @@ public class PausedDialog extends FloatingDialog{
if(!Net.active()) state.set(State.paused); if(!Net.active()) state.set(State.paused);
}); });
content().table(t -> missionTable = t); content().table(t -> missionTable = t).colspan(mobile ? 3 : 1);
content().row(); content().row();
if(!mobile){ if(!mobile){

2
core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java
View File

@@ -38,7 +38,7 @@ import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
public class UnitPad extends Block{ public class UnitPad extends Block{
protected float gracePeriodMultiplier = 20f; protected float gracePeriodMultiplier = 16f;
protected float speedupTime = 60f * 60f * 16; protected float speedupTime = 60f * 60f * 16;
protected UnitType type; protected UnitType type;