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

Added new turret sprites

Browse Source
This commit is contained in:
Anuken
2018-03-05 14:10:52 -05:00
parent 292dbf101b
commit 25063ed1f0
9 changed files with 358 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ public class Bullet extends BulletEntity{
@Override
public boolean collides(SolidEntity other){
return true;
return (other instanceof Player) == (owner instanceof Enemy);
}
@Override

2
core/src/io/anuke/mindustry/resource/Recipes.java
View File

@@ -44,6 +44,8 @@ public class Recipes {
new Recipe(weapon, WeaponBlocks.magmaturret, stack(Item.steel, 80), stack(Item.titanium, 70), stack(Item.dirium, 60)),
new Recipe(weapon, WeaponBlocks.chainturret, stack(Item.steel, 50), stack(Item.titanium, 25), stack(Item.dirium, 40)),
new Recipe(weapon, WeaponBlocks.titanturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)),
new Recipe(weapon, WeaponBlocks.missileturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)),
new Recipe(weapon, WeaponBlocks.fornaxcannon, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)),
new Recipe(crafting, ProductionBlocks.smelter, stack(Item.stone, 40), stack(Item.iron, 40)),
new Recipe(crafting, ProductionBlocks.crucible, stack(Item.titanium, 50), stack(Item.steel, 50)),

33
core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
View File

@@ -198,5 +198,38 @@ public class WeaponBlocks{
shootEffect = Fx.titanshot;
shootShake = 3f;
}
},
fornaxcannon = new PowerTurret("fornaxcannon") {
{
shootsound = "blast";
range = 120f;
reload = 23f;
bullet = BulletType.titanshell;
ammo = Item.uranium;
health = 800;
ammoMultiplier = 4;
size = 3;
rotatespeed = 0.07f;
shootCone = 9f;
shootEffect = Fx.titanshot;
shootShake = 3f;
}
},
missileturret = new PowerTurret("missileturret") {
{
shootsound = "blast";
range = 120f;
reload = 23f;
bullet = BulletType.titanshell;
ammo = Item.uranium;
health = 800;
ammoMultiplier = 4;
size = 2;
rotatespeed = 0.07f;
shootCone = 9f;
shootEffect = Fx.titanshot;
shootShake = 3f;
}
};
}