From 9ba3a3c63b05a42ef698bbdcaabcc95fb18567de Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Mon, 26 Feb 2018 22:20:52 +0100
Subject: [PATCH] Alt stinger rocket texture, ammo canister fix, CIWS typo
 fixed

---
 assets/hbm/lang/de_DE.lang                      |   2 +-
 assets/hbm/lang/en_US.lang                      |   2 +-
 assets/hbm/textures/models/ModelSRocket.png     | Bin 487 -> 482 bytes
 assets/hbm/textures/models/ModelSVTRocket.png   | Bin 0 -> 584 bytes
 .../entity/projectile/EntityRocketHoming.java   |   5 ++++-
 com/hbm/items/weapon/GunStinger.java            |   9 ++++++++-
 com/hbm/items/weapon/ItemClip.java              |   2 ++
 com/hbm/render/entity/RenderSRocket.java        |  16 ++++++++++++----
 8 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 assets/hbm/textures/models/ModelSVTRocket.png

diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index 5c1a4e79c..acf6e0d61 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -197,7 +197,7 @@ tile.turret_rocket.name=Raketengeschütz
 tile.turret_flamer.name=Flammenwerfergeschütz
 tile.turret_tau.name=Tauonengeschütz
 tile.turret_spitfire.name=Geschütz für das ich noch keinen Namen habe [WIP]
-tile.turret_cwis.name=Phalanx Mk-15 CWIS
+tile.turret_cwis.name=Phalanx Mk-15 CIWS
 tile.machine_radar.name=Raketenradar
 container.radar=Raketenradar
 
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index 4579ac7b6..f9674fbe4 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -208,7 +208,7 @@ tile.turret_rocket.name=Rocket Turret
 tile.turret_flamer.name=Flamethrower Turret
 tile.turret_tau.name=Tauon Turret
 tile.turret_spitfire.name=Turret I have no name for right now [WIP]
-tile.turret_cwis.name=Phalanx Mk-15 CWIS
+tile.turret_cwis.name=Phalanx Mk-15 CIWS
 tile.machine_radar.name=Missile Radar
 container.radar=Missile Radar
 
diff --git a/assets/hbm/textures/models/ModelSRocket.png b/assets/hbm/textures/models/ModelSRocket.png
index 2cd7d1ddf6439a77c3342b581230adde80ed5674..b9c07e2d2690486ae4fe66749da469ae673398b3 100644
GIT binary patch
delta 456
zcmV;(0XP2V1L6aaB!2{RLP=Bz2nYy#2xN!=00EgvL_t(oh3%EQPQx%1hJVx8Aa&}5
z#7lsf8CW}c=?;r0BNoKWWn;%vma=#0)EDRr^a)rho}slHnSmaYMsCuJT7jBRihS(f
z7ai;T4#OO!l)t+<LpGbBk(>ZPi1TAaQH!lRzj|Q+Af@!JR(}ikx2MRmDH@IApLz2*
zKNj{cXt8yd*KZ5}+U>R<3<eAvkWe6m2npnqjg2kSV(S2aa}Lh=&h{5Vl;v1TqLlL6
zY_KZh@fZ)!pJ+Cl==b{!07k<nUsiE>EjDK~eDXB*`gq~rKfaKr=~|VLIOjqqn@y0-
zCJX(1o2RJ7)_)Psx$s$Q7thP4zx{b!Y!}XrXcXsjSryjlbUXm`dcEk)Rq0x54*<rP
zpev=ka}JzyIOovqb~p0pK1ix=txC@)PLQScVXbXR$dAjY(qmX_!^Le<miuJu(j*I5
zYaxUP9;d{~1{AORNbQ;<DW#WE`ehTUbYl!N#xNlSs6iD%gkN8pri|jhXo-Y#UOJ&l
yC#<#5TKi%J(1ZAI&{}&c>zbMaq_#lKVet)Oc?F9ObS1|C0000<MNUMnLSTYuG}%r7

delta 461
zcmV;;0W$vL1Lp&fB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id
z000id0mpBsWB>pGPf0{UR9HvtRxu93FbvGkx^(H(r4Q&pr!H)aurc&aNDK@}NJvQh
z$Mixi3{7yGDnp@_qC_!g<<4gdW4f=ZD!QGvbUkkDF3<AL7k_i%%*qf}p667SrOkag
ztnDt(^3E4?;moeh->xjnh<OC>bzRf_ytl-$%d@=m#auWRpePE8B5)@F1P&&Shk<+)
z0Zh|AtRV=1Dy3;^-Czvar8#bh^JETi87%~?31E~8bpn7i$R|nC+4U)a))GTnL*@XN
z(E^}4SU#W@XMgudJj7&SgB~@S#RLGV^R0)pI4u6O^y`Bt+*(1loWLgl+9&Xq1d|-Y
z#{2d0vvPo|f@1{W7LXNZ0c0ESIiNyuA)3XtIKK`;G;J?PK_CSBgNH0)aoGf9*M^)H
zmw%+V_h;pRPt9CYJwVqPL)4)+V{U_<{_g@TEilL?%SMlWMu7)89@wTKhIQuv0000<
zMNUMnLSTXb001F$MObuAZ)9a`090jTXl`XMQ*>!=XJv9PO>bmnY*SKiV{2t})r-jr
DoNUGb

diff --git a/assets/hbm/textures/models/ModelSVTRocket.png b/assets/hbm/textures/models/ModelSVTRocket.png
new file mode 100644
index 0000000000000000000000000000000000000000..104db8a7e7da3c1bd6778085df43c6bb0e10c5ba
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn00004b3#c}2nYxW
zd<bNS00061Nkl<ZScUDBL2DC16vuzF>{Q65Hf+f$O|npPtm0_|=jPQ?@ZiM{;6cBE
zpF=!&^5Q`h{0Mt+4^5yRw}sG6j>b?y1v`-Okj}bmwj?GHD$Vcm-pqgA3z_}D5nP~@
zvTr}VWJpRt10c&?{P1%RdH#+kH%~d?RzWMPYlzzdAPhrWtyXz;_<|9As_Xz{xr^_=
zKjema&GW5e4yhNkvbwusUjWqWbvqag1PkE1L`q3O6CjKEJfKP7f$weN5fIRrI$u`j
zdQbW{F0@AO+@HN|52V<{W1A{FQ|HU-T>nM!l~Q(@2J_PGc4>NdXti4OdOZP<+9R8H
z&i%?qg32x@Y-Fz5<(M~T=a`L098^9R9GBW73z_5W<9knu<M^MP;2UGI#gJ2mq`7rk
zjN?7z_#0z}(^^TL!x)1x25T+F-%A<M&(<!_$1z{{YPa|`E}k!|%lDoa(QdabK$0Y-
zH#d)7tJR32DAScv))<475@QUVPG_O{Tm}BDTbrdPNg|RYDeSqCTE%EBi|^*~GG^&z
zILo{IDzmgTwbm9Uf7Dstt%1Uxl(O`Z`eDzkdw)jsc_5yxY-B_jh88aW(zA4j*4jo<
zB=Q#m5XZ4lN?Dj(K>n?`3iz|;bly2O#-O#fe>=cEi2n^*YwNz^nl;yu^$4uFUi=2#
Ws|+2)0O*bY0000<MNUMnLSTY;xfON*

literal 0
HcmV?d00001

diff --git a/com/hbm/entity/projectile/EntityRocketHoming.java b/com/hbm/entity/projectile/EntityRocketHoming.java
index dc55d659b..1effdb184 100644
--- a/com/hbm/entity/projectile/EntityRocketHoming.java
+++ b/com/hbm/entity/projectile/EntityRocketHoming.java
@@ -582,7 +582,10 @@ public class EntityRocketHoming extends Entity implements IProjectile
         
         lockonTicks++;
         if(lockonTicks == 5 && !hasBeeped) {
-        	worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 1F);
+        	if(this.getIsCritical())
+        		worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 0.75F);
+        	else
+        		worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 1F);
         	hasBeeped = true;
         }
         
diff --git a/com/hbm/items/weapon/GunStinger.java b/com/hbm/items/weapon/GunStinger.java
index 24a140a81..bc7d75d3e 100644
--- a/com/hbm/items/weapon/GunStinger.java
+++ b/com/hbm/items/weapon/GunStinger.java
@@ -61,7 +61,11 @@ public class GunStinger extends Item {
 			}
 
 			p_77615_1_.damageItem(1, p_77615_3_);
-			p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.rpgShoot", 1.0F, 0.25F);
+			
+			if(this == ModItems.gun_stinger)
+				p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.rpgShoot", 1.0F, 1.0F);
+			if(this == ModItems.gun_skystinger)
+				p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.rpgShoot", 1.0F, 0.5F);
 
 			p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_stinger_ammo);
 
@@ -86,12 +90,15 @@ public class GunStinger extends Item {
 						entityarrow1.motionX += p_77615_2_.rand.nextGaussian() * 0.2;
 						entityarrow1.motionY += p_77615_2_.rand.nextGaussian() * 0.2;
 						entityarrow1.motionZ += p_77615_2_.rand.nextGaussian() * 0.2;
+						entityarrow.setIsCritical(true);
+						entityarrow1.setIsCritical(true);
 						p_77615_2_.spawnEntityInWorld(entityarrow);
 						p_77615_2_.spawnEntityInWorld(entityarrow1);
 					} else {
 						EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 2.0F);
 						entityarrow.homingMod = 8;
 						entityarrow.homingRadius *= 50;
+						entityarrow.setIsCritical(true);
 						p_77615_2_.spawnEntityInWorld(entityarrow);
 					}
 				}
diff --git a/com/hbm/items/weapon/ItemClip.java b/com/hbm/items/weapon/ItemClip.java
index 299555745..0307a67a5 100644
--- a/com/hbm/items/weapon/ItemClip.java
+++ b/com/hbm/items/weapon/ItemClip.java
@@ -282,6 +282,8 @@ public class ItemClip extends Item {
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3));
 			if(player.inventory.hasItem(ModItems.gun_stinger))
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2));
+			if(player.inventory.hasItem(ModItems.gun_skystinger))
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2));
 			if(player.inventory.hasItem(ModItems.gun_fatman))
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_fatman_ammo, 2));
 			if(player.inventory.hasItem(ModItems.gun_mirv))
diff --git a/com/hbm/render/entity/RenderSRocket.java b/com/hbm/render/entity/RenderSRocket.java
index 46e8f2fde..a15b045c9 100644
--- a/com/hbm/render/entity/RenderSRocket.java
+++ b/com/hbm/render/entity/RenderSRocket.java
@@ -3,6 +3,7 @@ package com.hbm.render.entity;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.entity.projectile.EntityBullet;
+import com.hbm.entity.projectile.EntityRocketHoming;
 import com.hbm.lib.RefStrings;
 import com.hbm.render.model.ModelBullet;
 import com.hbm.render.model.ModelSRocket;
@@ -19,8 +20,7 @@ public class RenderSRocket extends Render {
 		missile = new ModelSRocket();
 	}
 
-	@Override
-	public void doRender(Entity rocket, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
+	public void doRender(EntityRocketHoming rocket, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
 			float p_76986_9_) {
 		GL11.glPushMatrix();
 		GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_);
@@ -30,11 +30,19 @@ public class RenderSRocket extends Render {
 				0.0F, 0.0F, 1.0F);
 		GL11.glScalef(1.5F, 1.5F, 1.5F);
 
-			
-		bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSRocket.png"));
+		if(rocket.getIsCritical())
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSVTRocket.png"));
+		else
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSRocket.png"));
 		missile.renderAll(0.0625F);
 		GL11.glPopMatrix();
 	}
+	
+	@Override
+	public void doRender(Entity rocket, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
+			float p_76986_9_) {
+		doRender((EntityRocketHoming)rocket, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+	}
 
 	@Override
 	protected ResourceLocation getEntityTexture(Entity p_110775_1_) {