From 20b95fa063ce0348d71342490b7c664891a8770b Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 1 Apr 2018 21:07:52 -0400 Subject: [PATCH] Ammo things added --- core/assets-raw/sprites/ui/icons/icon-egg.png | Bin 0 -> 186 bytes core/assets/version.properties | 4 ++-- .../src/io/anuke/mindustry/content/AmmoTypes.java | 4 ++++ .../src/io/anuke/mindustry/resource/AmmoType.java | 11 +++++++++-- .../world/blocks/types/defense/Turret.java | 10 +++++----- 5 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 core/assets-raw/sprites/ui/icons/icon-egg.png create mode 100644 core/src/io/anuke/mindustry/content/AmmoTypes.java diff --git a/core/assets-raw/sprites/ui/icons/icon-egg.png b/core/assets-raw/sprites/ui/icons/icon-egg.png new file mode 100644 index 0000000000000000000000000000000000000000..9f00eb61cdc84ea518797502569a21a4509cf627 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0y~yVBiB`4mJh`26+$Niwq15oCO|{#S9GG!XV7ZFl&wk z0|NtliKnkC`y&=cAs*$^A~W7FFfc@Vx;TbtoL@WXHrD|I4rkj-|NlRIlPVIn#cOv% zz(=9pqf8#N@)f)cuN~oI`0N|AzE#50@kxDJnRSbJPG*nm3@=rsV|`nG)gE8$WVL;N lnvAD=s?XM%qyK9e*oDP}7H4{=F)%PNc)I$ztaD0e0syT*I<^1+ literal 0 HcmV?d00001 diff --git a/core/assets/version.properties b/core/assets/version.properties index 9b3876f599..116d83bf5f 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sun Apr 01 11:42:10 EDT 2018 +#Sun Apr 01 16:18:18 EDT 2018 version=release -androidBuildCode=809 +androidBuildCode=811 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java new file mode 100644 index 0000000000..d783fe090d --- /dev/null +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -0,0 +1,4 @@ +package io.anuke.mindustry.content; + +public class AmmoTypes { +} diff --git a/core/src/io/anuke/mindustry/resource/AmmoType.java b/core/src/io/anuke/mindustry/resource/AmmoType.java index c5b84084b1..0155894848 100644 --- a/core/src/io/anuke/mindustry/resource/AmmoType.java +++ b/core/src/io/anuke/mindustry/resource/AmmoType.java @@ -2,7 +2,14 @@ package io.anuke.mindustry.resource; import io.anuke.mindustry.entities.bullets.BulletType; -public abstract class AmmoType { +public class AmmoType { + public final Item item; + public final BulletType bullet; + public final int multiplier; - public abstract BulletType getBullet(Item item); + public AmmoType(Item item, BulletType result, int multiplier){ + this.item = item; + this.bullet = result; + this.multiplier = multiplier; + } } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java index 7cb3c48680..a5620dfcac 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java @@ -5,6 +5,7 @@ import io.anuke.mindustry.entities.*; import io.anuke.mindustry.entities.bullets.BulletType; import io.anuke.mindustry.graphics.fx.Fx; import io.anuke.mindustry.graphics.Layer; +import io.anuke.mindustry.resource.AmmoType; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.*; import io.anuke.ucore.core.Effects; @@ -38,9 +39,7 @@ public class Turret extends Block{ protected float shotTransation = 2; protected float shotDelayScale = 0; protected String shootsound = "shoot"; - protected io.anuke.mindustry.entities.bullets.BulletType bullet = BulletType.iron; - protected Item ammo; - protected int ammoMultiplier = 20; + protected AmmoType[] ammoTypes; protected int maxammo = 400; protected float rotatespeed = 0.2f; protected float shootCone = 5f; @@ -67,12 +66,13 @@ public class Turret extends Block{ @Override public void setStats(){ super.setStats(); + /* if(ammo != null) stats.add("ammo", ammo); if(ammo != null) stats.add("ammocapacity", maxammo); - if(ammo != null) stats.add("ammoitem", ammoMultiplier); + if(ammo != null) stats.add("ammoitem", ammoMultiplier);*/ stats.add("range", (int)range); stats.add("inaccuracy", (int)inaccuracy); - stats.add("damageshot", bullet.damage); + //stats.add("damageshot", bullet.damage); stats.add("shotssecond", Strings.toFixed(60f/reload, 1)); stats.add("shots", shots); }