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

Merge branch 'master' of https://github.com/Anuken/Mindustry into resource-rework

Browse Source
This commit is contained in:
Anuken
2018-08-18 13:10:22 -04:00
parent e9d03c179c 0f173bcc5a
commit a60ce3c54c
63 changed files with 1674 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/io/anuke/mindustry/content/Recipes.java
View File

@@ -142,7 +142,6 @@ public class Recipes implements ContentList{
new Recipe(units, UnitBlocks.monsoonPad, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)).setMode(GameMode.noWaves);
new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 30));
new Recipe(units, UnitBlocks.resupplyPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 30));
new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.carbide, 100), new ItemStack(Items.silicon, 200)).setMode(GameMode.noWaves);
//LIQUIDS

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

@@ -19,7 +19,7 @@ public class Weapons implements ContentList{
reload = 15f;
roundrobin = true;
ejectEffect = ShootFx.shellEjectSmall;
setAmmo(AmmoTypes.bulletLead);
ammo = AmmoTypes.bulletLead;
}};
missiles = new Weapon("missiles"){{
@@ -30,7 +30,7 @@ public class Weapons implements ContentList{
roundrobin = false;
roundrobin = true;
ejectEffect = Fx.none;
setAmmo(AmmoTypes.weaponMissile);
ammo = AmmoTypes.weaponMissile;
}};
chainBlaster = new Weapon("chain-blaster"){{
@@ -38,7 +38,7 @@ public class Weapons implements ContentList{
reload = 28f;
roundrobin = true;
ejectEffect = ShootFx.shellEjectSmall;
setAmmo(AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletTungsten, AmmoTypes.bulletSilicon, AmmoTypes.bulletThorium);
ammo = AmmoTypes.bulletLead;
}};
shockgun = new Weapon("shockgun"){{
@@ -50,7 +50,7 @@ public class Weapons implements ContentList{
recoil = 2f;
velocityRnd = 0.7f;
ejectEffect = ShootFx.shellEjectSmall;
setAmmo(AmmoTypes.shotgunTungsten);
ammo = AmmoTypes.shotgunTungsten;
}};
flakgun = new Weapon("flakgun"){{
@@ -62,7 +62,7 @@ public class Weapons implements ContentList{
recoil = 3f;
velocityRnd = 0.1f;
ejectEffect = ShootFx.shellEjectMedium;
setAmmo(AmmoTypes.shellCarbide);
ammo = AmmoTypes.shellCarbide;
}};
flamethrower = new Weapon("flamethrower"){{
@@ -71,7 +71,7 @@ public class Weapons implements ContentList{
roundrobin = true;
recoil = 1f;
ejectEffect = Fx.none;
setAmmo(AmmoTypes.flamerThermite);
ammo = AmmoTypes.flamerThermite;
}};
sapper = new Weapon("sapper"){{
@@ -79,7 +79,7 @@ public class Weapons implements ContentList{
reload = 12f;
roundrobin = true;
ejectEffect = ShootFx.shellEjectSmall;
setAmmo(AmmoTypes.bulletCarbide);
ammo = AmmoTypes.bulletCarbide;
}};
swarmer = new Weapon("swarmer"){{
@@ -87,7 +87,7 @@ public class Weapons implements ContentList{
reload = 10f;
roundrobin = true;
ejectEffect = ShootFx.shellEjectSmall;
setAmmo(AmmoTypes.bulletPyratite);
ammo = AmmoTypes.bulletPyratite;
}};
bomber = new Weapon("bomber"){{
@@ -98,7 +98,7 @@ public class Weapons implements ContentList{
ejectEffect = Fx.none;
velocityRnd = 1f;
inaccuracy = 40f;
setAmmo(AmmoTypes.bombExplosive, AmmoTypes.bombIncendiary, AmmoTypes.bombOil);
ammo = AmmoTypes.bombExplosive;
}};
}

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

@@ -106,7 +106,7 @@ public class Blocks extends BlockList implements ContentList{
stone = new Floor("stone"){{
hasOres = true;
drops = new ItemStack(Items.stone, 1);
blends = block -> block != this && !(block instanceof Ore);
blends = block -> block != this && !(block instanceof OreBlock);
minimapColor = Color.valueOf("323232");
playerUnmineable = true;
}};

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

@@ -8,7 +8,7 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.units.*;
public class UnitBlocks extends BlockList implements ContentList{
public static Block resupplyPoint, repairPoint, dronePad,
public static Block repairPoint, dronePad,
fabricatorPad, interceptorPad, monsoonPad, daggerPad, titanPad,
dropPoint, reconstructor, overdriveProjector, shieldProjector, commandCenter;
@@ -64,11 +64,6 @@ public class UnitBlocks extends BlockList implements ContentList{
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)});
}};
resupplyPoint = new ResupplyPoint("resupply-point"){{
shadow = "shadow-round-1";
itemCapacity = 30;
}};
dropPoint = new DropPoint("drop-point"){{
shadow = "shadow-round-1";
itemCapacity = 40;