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 789fba817..e0ac5d238 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 @@ -638,6 +638,15 @@ public class Orchestras { if(type == AnimType.RELOAD_CYCLE) { if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunReload", 1F, 1F); } + if(type == AnimType.INSPECT) { + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCockOpen", 1F, 1F); + if(timer == 18) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCockClose", 1F, 1F); + } + if(type == AnimType.JAMMED) { + if(timer == 18) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.foley.gunWhack", 1F, 1F); + if(timer == 25) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.foley.gunWhack", 1F, 1F); + if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCockClose", 1F, 1F); + } }; public static BiConsumer ORCHESTRA_PANERSCHRECK = (stack, ctx) -> { diff --git a/src/main/resources/assets/hbm/sounds.json b/src/main/resources/assets/hbm/sounds.json index 57ad2685d..f8acc5aaa 100644 --- a/src/main/resources/assets/hbm/sounds.json +++ b/src/main/resources/assets/hbm/sounds.json @@ -254,10 +254,14 @@ "weapon.reload.revolverSpin": {"category": "player", "sounds": ["weapon/reload/revolverSpin"]}, "weapon.reload.rifleCock": {"category": "player", "sounds": ["weapon/reload/rifleCock"]}, "weapon.reload.shotgunCock": {"category": "player", "sounds": ["weapon/reload/shotgunCock"]}, + "weapon.reload.shotgunCockOpen": {"category": "player", "sounds": ["weapon/reload/shotgunCockOpen"]}, + "weapon.reload.shotgunCockClose": {"category": "player", "sounds": ["weapon/reload/shotgunCockClose"]}, "weapon.reload.shotgunReload": {"category": "player", "sounds": ["weapon/reload/shotgunReload1", "weapon/reload/shotgunReload2", "weapon/reload/shotgunReload3"]}, "weapon.reload.tubeFwoomp": {"category": "player", "sounds": ["weapon/reload/tubeFwoomp"]}, "weapon.reload.impact": {"category": "player", "sounds": ["weapon/reload/impact1", "weapon/reload/impact2", "weapon/reload/impact3"]}, "weapon.reload.fatmanFull": {"category": "player", "sounds": ["weapon/reload/fatmanFull"]}, + + "weapon.foley.gunWhack": {"category": "player", "sounds": ["weapon/foley/gunWhack", "weapon/foley/gunWhack2"]}, "turret.chekhov_fire": {"category": "block", "sounds": [{"name": "turret/chekhov_fire", "stream": false}]}, "turret.jeremy_fire": {"category": "block", "sounds": ["turret/jeremy_fire1", "turret/jeremy_fire2", "turret/jeremy_fire3", "turret/jeremy_fire4", "turret/jeremy_fire5"]}, diff --git a/src/main/resources/assets/hbm/sounds/weapon/foley/gunWhack.ogg b/src/main/resources/assets/hbm/sounds/weapon/foley/gunWhack.ogg new file mode 100644 index 000000000..2f88f3fb8 Binary files /dev/null and b/src/main/resources/assets/hbm/sounds/weapon/foley/gunWhack.ogg differ diff --git a/src/main/resources/assets/hbm/sounds/weapon/foley/gunWhack2.ogg b/src/main/resources/assets/hbm/sounds/weapon/foley/gunWhack2.ogg new file mode 100644 index 000000000..de102e4c3 Binary files /dev/null and b/src/main/resources/assets/hbm/sounds/weapon/foley/gunWhack2.ogg differ diff --git a/src/main/resources/assets/hbm/sounds/weapon/reload/shotgunCockClose.ogg b/src/main/resources/assets/hbm/sounds/weapon/reload/shotgunCockClose.ogg new file mode 100644 index 000000000..c04bd3a02 Binary files /dev/null and b/src/main/resources/assets/hbm/sounds/weapon/reload/shotgunCockClose.ogg differ diff --git a/src/main/resources/assets/hbm/sounds/weapon/reload/shotgunCockOpen.ogg b/src/main/resources/assets/hbm/sounds/weapon/reload/shotgunCockOpen.ogg new file mode 100644 index 000000000..0de904013 Binary files /dev/null and b/src/main/resources/assets/hbm/sounds/weapon/reload/shotgunCockOpen.ogg differ