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

Removed Upgrade class / Buffed units / Bugfixes

Browse Source
This commit is contained in:
Anuken
2018-08-24 09:39:02 -04:00
parent ee835f6514
commit 5e8686db77
15 changed files with 96 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@ import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.graphics.Shaders;
import io.anuke.mindustry.type.ContentList;
import io.anuke.mindustry.type.Mech;
import io.anuke.mindustry.type.Upgrade;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Effects;
@@ -45,6 +44,7 @@ public class Mechs implements ContentList{
boostSpeed = 0.85f;
weapon = Weapons.blaster;
maxSpeed = 4f;
altChargeAlpha = 0.03f;
}
@Override
@@ -250,6 +250,6 @@ public class Mechs implements ContentList{
@Override
public Array<? extends Content> getAll(){
return Upgrade.all();
return Mech.all();
}
}

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

@@ -20,7 +20,7 @@ public class UnitTypes implements ContentList{
ammoCapacity = 0;
range = 50f;
healSpeed = 0.05f;
health = 45;
health = 60;
}};
dagger = new UnitType("dagger", Dagger.class, Dagger::new){{
@@ -29,7 +29,7 @@ public class UnitTypes implements ContentList{
drag = 0.4f;
range = 40f;
weapon = Weapons.chainBlaster;
health = 90;
health = 180;
}};
titan = new UnitType("titan", Titan.class, Titan::new){{
@@ -37,8 +37,8 @@ public class UnitTypes implements ContentList{
speed = 0.18f;
drag = 0.4f;
range = 10f;
weapon = Weapons.chainBlaster;
health = 280;
weapon = Weapons.flamethrower;
health = 500;
}};
interceptor = new UnitType("interceptor", Interceptor.class, Interceptor::new){{
@@ -47,10 +47,11 @@ public class UnitTypes implements ContentList{
drag = 0.01f;
weapon = Weapons.chainBlaster;
isFlying = true;
health = 70;
}};
monsoon = new UnitType("monsoon", Monsoon.class, Monsoon::new){{
health = 230;
health = 250;
speed = 0.2f;
maxVelocity = 1.4f;
drag = 0.01f;
@@ -67,8 +68,7 @@ public class UnitTypes implements ContentList{
ammoCapacity = 0;
range = 70f;
itemCapacity = 70;
health = 120;
health = 45;
health = 220;
buildPower = 0.9f;
minePower = 1.1f;
healSpeed = 0.09f;

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

@@ -5,7 +5,6 @@ import io.anuke.mindustry.content.fx.Fx;
import io.anuke.mindustry.content.fx.ShootFx;
import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.type.ContentList;
import io.anuke.mindustry.type.Upgrade;
import io.anuke.mindustry.type.Weapon;
public class Weapons implements ContentList{
@@ -117,6 +116,6 @@ public class Weapons implements ContentList{
@Override
public Array<? extends Content> getAll(){
return Upgrade.all();
return Weapon.all();
}
}

4
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(){
dronePad = new UnitPad("drone-pad"){{
type = UnitTypes.drone;
produceTime = 4300;
produceTime = 5500;
size = 2;
consumes.power(0.08f);
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)});
@@ -24,7 +24,7 @@ public class UnitBlocks extends BlockList implements ContentList{
fabricatorPad = new UnitPad("fabricator-pad"){{
type = UnitTypes.fabricator;
produceTime = 5000;
produceTime = 7000;
size = 2;
consumes.power(0.2f);
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)});