diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java index 96f2cfc58..3ddbfe467 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java @@ -875,5 +875,14 @@ public class Orchestras { if(entity.worldObj.isRemote) return; AnimType type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex); int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); + + if(type == AnimType.CYCLE) { + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 0.25F, 1.25F); + } + if(type == AnimType.CYCLE_DRY) { + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.8F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.9F); + + } }; } diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java index e79ddf070..f529cb6d0 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java @@ -137,7 +137,10 @@ public class XFactory556mm { case EQUIP: return new BusAnimation() .addBus("EQUIP", new BusAnimationSequence().addPos(45, 0, 0, 0).addPos(0, 0, 0, 500, IType.SIN_FULL)); case CYCLE: return new BusAnimation() - .addBus("RECOIL", new BusAnimationSequence().addPos(0, 0, ItemGunBaseNT.getIsAiming(stack) ? -0.125 : -0.375, 25, IType.SIN_DOWN).addPos(0, 0, 0, 75, IType.SIN_FULL)); + .addBus("RECOIL", new BusAnimationSequence().addPos(0, 0, ItemGunBaseNT.getIsAiming(stack) ? -0.125 : -0.375, 25, IType.SIN_DOWN).addPos(0, 0, 0, 75, IType.SIN_FULL)) + .addBus("SAFETY", new BusAnimationSequence().addPos(0.25, 0, 0, 0).addPos(0.25, 0, 0, 2000).addPos(0, 0, 0, 50)); + case CYCLE_DRY: return new BusAnimation() + .addBus("BOLT", new BusAnimationSequence().addPos(0, 0, 0, 250).addPos(0, 0, -2, 150).addPos(0, 0, 0, 100, IType.SIN_UP)); } return null; diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSTG77.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSTG77.java index 3cd68d480..dfdccdcf7 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSTG77.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSTG77.java @@ -39,6 +39,7 @@ public class ItemRenderSTG77 extends ItemRenderWeaponBase { double[] bolt = HbmAnimations.getRelevantTransformation("BOLT"); double[] handle = HbmAnimations.getRelevantTransformation("HANDLE"); double[] bullet = HbmAnimations.getRelevantTransformation("BULLET"); + double[] safety = HbmAnimations.getRelevantTransformation("SAFETY"); GL11.glTranslated(0, -1, -4); GL11.glRotated(equip[0], 1, 0, 0); @@ -54,7 +55,12 @@ public class ItemRenderSTG77 extends ItemRenderWeaponBase { ResourceManager.stg77.renderPart("Magazine"); GL11.glPushMatrix(); - GL11.glTranslated(0.25, 0, 0); + GL11.glTranslated(0, 0, bolt[2]); + ResourceManager.stg77.renderPart("Handle"); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslated(safety[0], 0, 0); ResourceManager.stg77.renderPart("Safety"); GL11.glPopMatrix(); @@ -81,9 +87,9 @@ public class ItemRenderSTG77 extends ItemRenderWeaponBase { @Override public void setupThirdPerson(ItemStack stack) { super.setupThirdPerson(stack); - double scale = 1D; + double scale = 1.5D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated(0, 2, 4); + GL11.glTranslated(0, 1, 2); } @@ -108,6 +114,7 @@ public class ItemRenderSTG77 extends ItemRenderWeaponBase { ResourceManager.stg77.renderPart("Lever"); ResourceManager.stg77.renderPart("Magazine"); ResourceManager.stg77.renderPart("Safety"); + ResourceManager.stg77.renderPart("Handle"); GL11.glShadeModel(GL11.GL_FLAT); } } diff --git a/src/main/resources/assets/hbm/textures/models/weapons/stg77.png b/src/main/resources/assets/hbm/textures/models/weapons/stg77.png index 94e40ccf5..2d4345e11 100644 Binary files a/src/main/resources/assets/hbm/textures/models/weapons/stg77.png and b/src/main/resources/assets/hbm/textures/models/weapons/stg77.png differ