From a310d0338a692dc211b598220ef859e0e50eb1b2 Mon Sep 17 00:00:00 2001 From: stujones11 Date: Wed, 3 Jan 2018 20:21:00 +0000 Subject: [PATCH] Move common sounds to main shooter mod --- {shooter_guns => shooter}/sounds/shooter_pistol.ogg | Bin {shooter_guns => shooter}/sounds/shooter_rifle.ogg | Bin .../sounds/shooter_rocket_fire.ogg | Bin .../sounds/shooter_shotgun.ogg | Bin shooter_hook/depends.txt | 1 - shooter_turret/depends.txt | 1 - shooter_turret/init.lua | 2 +- 7 files changed, 1 insertion(+), 3 deletions(-) rename {shooter_guns => shooter}/sounds/shooter_pistol.ogg (100%) rename {shooter_guns => shooter}/sounds/shooter_rifle.ogg (100%) rename {shooter_rocket => shooter}/sounds/shooter_rocket_fire.ogg (100%) rename {shooter_guns => shooter}/sounds/shooter_shotgun.ogg (100%) diff --git a/shooter_guns/sounds/shooter_pistol.ogg b/shooter/sounds/shooter_pistol.ogg similarity index 100% rename from shooter_guns/sounds/shooter_pistol.ogg rename to shooter/sounds/shooter_pistol.ogg diff --git a/shooter_guns/sounds/shooter_rifle.ogg b/shooter/sounds/shooter_rifle.ogg similarity index 100% rename from shooter_guns/sounds/shooter_rifle.ogg rename to shooter/sounds/shooter_rifle.ogg diff --git a/shooter_rocket/sounds/shooter_rocket_fire.ogg b/shooter/sounds/shooter_rocket_fire.ogg similarity index 100% rename from shooter_rocket/sounds/shooter_rocket_fire.ogg rename to shooter/sounds/shooter_rocket_fire.ogg diff --git a/shooter_guns/sounds/shooter_shotgun.ogg b/shooter/sounds/shooter_shotgun.ogg similarity index 100% rename from shooter_guns/sounds/shooter_shotgun.ogg rename to shooter/sounds/shooter_shotgun.ogg diff --git a/shooter_hook/depends.txt b/shooter_hook/depends.txt index 41d166d..91ee42b 100644 --- a/shooter_hook/depends.txt +++ b/shooter_hook/depends.txt @@ -1,2 +1 @@ shooter -shooter_guns diff --git a/shooter_turret/depends.txt b/shooter_turret/depends.txt index 41d166d..91ee42b 100644 --- a/shooter_turret/depends.txt +++ b/shooter_turret/depends.txt @@ -1,2 +1 @@ shooter -shooter_guns diff --git a/shooter_turret/init.lua b/shooter_turret/init.lua index 6a629fe..67aef8d 100644 --- a/shooter_turret/init.lua +++ b/shooter_turret/init.lua @@ -147,7 +147,7 @@ minetest.register_entity("shooter_turret:turret_entity", { minetest.sound_play("shooter_click", {object=self.object}) return end - minetest.sound_play("guns_shotgun", {object=self.object}) + minetest.sound_play("shooter_shotgun", {object=self.object}) if not minetest.setting_getbool("creative_mode") then inv:remove_item("main", "tnt:tnt") end