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 dddfbeda4..2d987404c 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 @@ -950,8 +950,26 @@ public class Orchestras { if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); } if(type == AnimType.RELOAD) { + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 4) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.75F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); + if(timer == 55) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.5F, 1F); + if(timer == 65) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 74) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); + if(timer == 88) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.75F); + if(timer == 100) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 55) ctx.config.getReceivers(stack)[0].getMagazine(stack).reloadAction(stack, ctx.inventory); } + + if(type == AnimType.INSPECT) { + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:player.gulp", 1F, 1F); + if(timer == 25) entity.worldObj.playSoundAtEntity(entity, "hbm:player.gulp", 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:player.gulp", 1F, 1F); + if(timer == 35) entity.worldObj.playSoundAtEntity(entity, "hbm:player.gulp", 1F, 1F); + if(timer == 50) entity.worldObj.playSoundAtEntity(entity, "hbm:player.groan", 1F, 1F); + } }; public static BiConsumer ORCHESTRA_QUADRO = (stack, ctx) -> { diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSexy.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSexy.java index acd889ab4..35e772158 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSexy.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSexy.java @@ -172,6 +172,13 @@ public class ItemRenderSexy extends ItemRenderWeaponBase { GL11.glPopMatrix(); GL11.glShadeModel(GL11.GL_FLAT); + + GL11.glPushMatrix(); + GL11.glTranslated(0, 0, 8); + GL11.glRotated(90, 0, 1, 0); + GL11.glRotated(90 * gun.shotRand, 1, 0, 0); + this.renderMuzzleFlash(gun.lastShot[0], 150, 7.5); + GL11.glPopMatrix(); } @Override diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderWeaponBase.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderWeaponBase.java index cc7ba4b30..3abb3a71c 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderWeaponBase.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderWeaponBase.java @@ -344,6 +344,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer { if(System.currentTimeMillis() - lastShot < flash) { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GL11.glDepthMask(false); GL11.glPushMatrix(); double fire = (System.currentTimeMillis() - lastShot) / (double) flash; @@ -379,6 +380,7 @@ public abstract class ItemRenderWeaponBase implements IItemRenderer { tess.draw(); GL11.glPopMatrix(); + GL11.glDepthMask(true); GL11.glDisable(GL11.GL_BLEND); } } diff --git a/src/main/resources/assets/hbm/models/weapons/sexy.obj b/src/main/resources/assets/hbm/models/weapons/sexy.obj index 114be9b3d..53da0cde9 100644 --- a/src/main/resources/assets/hbm/models/weapons/sexy.obj +++ b/src/main/resources/assets/hbm/models/weapons/sexy.obj @@ -139,8 +139,8 @@ vt 0.933357 0.212107 vt 0.966667 0.000061 vt 0.995513 0.020249 vt 0.937820 0.020249 -vt 0.999976 0.040436 -vt 0.983321 0.071080 +vt 0.933357 0.040436 +vt 0.950012 0.071080 vt 0.966667 0.065671 vt 0.075000 0.136364 vt 0.066667 0.121212 @@ -206,17 +206,17 @@ vt 0.999976 0.131281 vt 0.995513 0.151468 vt 0.983321 0.005470 vt 0.950012 0.005470 -vt 0.937820 0.085859 -vt 0.933357 0.106046 -vt 0.933357 0.040436 -vt 0.937820 0.020249 -vt 0.950012 0.005470 -vt 0.966667 0.000061 -vt 0.983321 0.005470 -vt 0.995513 0.020249 -vt 0.999976 0.106046 vt 0.995513 0.085859 -vt 0.950012 0.071080 +vt 0.999976 0.106046 +vt 0.999976 0.040436 +vt 0.995513 0.020249 +vt 0.983321 0.005470 +vt 0.966667 0.000061 +vt 0.950012 0.005470 +vt 0.937820 0.020249 +vt 0.933357 0.106046 +vt 0.937820 0.085859 +vt 0.983321 0.071080 vt 0.066667 0.181818 vt 0.039454 0.130050 vt 0.044792 0.123580 @@ -2777,9 +2777,9 @@ vt 0.612500 0.313131 vt 0.983257 0.793649 vt 0.999848 0.828481 vt 0.933485 0.828481 -vt 0.933485 0.828481 -vt 0.950076 0.793649 -vt 0.999848 0.828481 +vt 0.933485 0.702218 +vt 0.950076 0.667387 +vt 0.999848 0.702218 vt 0.933384 0.595929 vt 0.950025 0.560991 vt 0.999949 0.595929 @@ -2787,8 +2787,8 @@ vt 0.999949 0.424312 vt 0.983308 0.454931 vt 0.966667 0.449526 vt 0.966667 0.383970 -vt 0.995490 0.404141 vt 0.937843 0.404141 +vt 0.995490 0.404141 vt 0.658333 0.181938 vt 0.666568 0.191919 vt 0.658333 0.201900 @@ -3055,17 +3055,17 @@ vt 0.950076 0.793649 vt 0.966667 0.788261 vt 0.995403 0.808371 vt 0.983257 0.908559 -vt 0.995403 0.893838 -vt 0.983257 0.908559 -vt 0.937931 0.893838 -vt 0.966667 0.913948 -vt 0.950076 0.908559 -vt 0.933485 0.873728 -vt 0.999848 0.873728 -vt 0.937931 0.808371 -vt 0.966667 0.788261 -vt 0.983257 0.793649 -vt 0.995403 0.808371 +vt 0.995403 0.767575 +vt 0.983257 0.782297 +vt 0.937931 0.767575 +vt 0.966667 0.787685 +vt 0.950076 0.782297 +vt 0.933485 0.747465 +vt 0.999848 0.747465 +vt 0.937931 0.682108 +vt 0.966667 0.661998 +vt 0.983257 0.667387 +vt 0.995403 0.682108 vt 0.995490 0.641313 vt 0.983308 0.656080 vt 0.937843 0.641313 @@ -3088,19 +3088,19 @@ vt 0.933384 0.489868 vt 0.933384 0.424312 vt 0.937843 0.469697 vt 0.950025 0.454931 -vt 0.983308 0.550019 -vt 0.966667 0.555424 vt 0.950025 0.550019 -vt 0.937843 0.535253 -vt 0.933384 0.515082 -vt 0.933384 0.489868 -vt 0.933384 0.424312 +vt 0.966667 0.555424 +vt 0.983308 0.550019 +vt 0.995490 0.535253 +vt 0.999949 0.515082 vt 0.999949 0.489868 vt 0.999949 0.424312 -vt 0.999949 0.515082 -vt 0.995490 0.535253 -vt 0.983308 0.389375 +vt 0.933384 0.489868 +vt 0.933384 0.424312 +vt 0.933384 0.515082 +vt 0.937843 0.535253 vt 0.950025 0.389375 +vt 0.983308 0.389375 vt 0.652511 0.198977 vt 0.650099 0.191919 vt 0.652511 0.184862 diff --git a/src/main/resources/assets/hbm/textures/models/weapons/sexy_real_no_fake.png b/src/main/resources/assets/hbm/textures/models/weapons/sexy_real_no_fake.png index fa565a3a0..5855c616b 100644 Binary files a/src/main/resources/assets/hbm/textures/models/weapons/sexy_real_no_fake.png and b/src/main/resources/assets/hbm/textures/models/weapons/sexy_real_no_fake.png differ