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

Half-implemented titan turret

Browse Source
This commit is contained in:
Anuken
2017-11-10 23:48:23 -05:00
parent 4ffbeacb07
commit ac5351fd14
12 changed files with 218 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/Vars.java
View File

@@ -53,6 +53,6 @@ public class Vars{
"",
"Credits:",
"- SFX made with [YELLOW]bfxr.com[]",
"- Music made by [GREEN]RoccoW[]",
"- Music made by [GREEN]RoccoW[] / found on [lime]FreeMusicArchive.org[]",
};
}

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

@@ -42,7 +42,7 @@ public enum Recipe{
teslaturret(weapon, WeaponBlocks.teslaturret, stack(Item.steel, 10), stack(Item.titanium, 15), stack(Item.dirium, 15)),
plasmaturret(weapon, WeaponBlocks.plasmaturret, stack(Item.steel, 10), stack(Item.titanium, 10), stack(Item.dirium, 15)),
chainturret(weapon, WeaponBlocks.chainturret, stack(Item.steel, 10), stack(Item.titanium, 10), stack(Item.dirium, 15)),
rocketturret(weapon, WeaponBlocks.plasmaturret, stack(Item.steel, 10), stack(Item.titanium, 10), stack(Item.dirium, 15)),
titanturret(weapon, WeaponBlocks.titanturret, stack(Item.steel, 10), stack(Item.titanium, 10), stack(Item.dirium, 15)),
smelter(crafting, ProductionBlocks.smelter, stack(Item.stone, 40), stack(Item.iron, 40)),
crucible(crafting, ProductionBlocks.crucible, stack(Item.titanium, 40), stack(Item.steel, 40)),

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

@@ -171,9 +171,24 @@ public class WeaponBlocks{
reload = 40f;
bullet = BulletType.shell;
ammo = Item.coal;
health = 360;
health = 430;
ammoMultiplier = 10;
width = height = 2;
}
},
titanturret = new Turret("titancannon"){
{
inaccuracy = 7f;
formalName = "titan cannon";
range = 120f;
reload = 40f;
bullet = BulletType.shell;
ammo = Item.coal;
health = 800;
ammoMultiplier = 10;
width = height = 3;
rotatespeed = 0.08f;
}
};
}

2
core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java
View File

@@ -198,7 +198,7 @@ public class Turret extends Block{
float inac = Mathf.range(inaccuracy);
Angles.translation(entity.rotation + inac, 4f);
Angles.translation(entity.rotation + inac, width * Vars.tilesize / 2f);
Bullet out = new Bullet(bullet, tile.entity,
tile.worldx() + Angles.x(), tile.worldy() + Angles.y(), entity.rotation + inac).add();