Merge branch 'put_organ_under_toolkind_instrument' into 'master'

put Organ under Toolkind Instrument

See merge request veloren/veloren!3580

assets/common/items/npc_weapons/unique/organ.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Organ Aura",
     description: "Motivational Tune",
     kind: Tool((
-        kind: Organ,
+        kind: Instrument,
         hands: Two,
         stats: (
             equip_time_secs: 0.0,

assets/voxygen/audio/sfx.ron

@@ -450,7 +450,7 @@
             ],
             threshold: 0.2,
         ),
-        Attack(BasicAura, Organ): (
+        Attack(BasicAura, Instrument): (
             files: [
                 "voxygen.audio.sfx.abilities.barrel_organ",
             ],

assets/voxygen/i18n/en/common.ftl

@@ -70,7 +70,6 @@ common-weapons-staff_simple = Simple Staff
 common-weapons-axe_simple = Simple Axe
 common-weapons-bow_simple = Simple Bow
 common-weapons-unique = Unique
-common-weapons-organ = Organ
 common-tool-debug = Debug
 common-tool-farming = Farming Tool
 common-tool-pick = Pickaxe

common/src/bin/csv_export/main.rs

@@ -176,7 +176,6 @@ fn get_tool_kind(kind: &ToolKind) -> String {
         ToolKind::Pick => "Pick".to_string(),
         ToolKind::Instrument => "Instrument".to_string(),
         ToolKind::Natural => "Natural".to_string(),
-        ToolKind::Organ => "Organ".to_string(),
         ToolKind::Empty => "Empty".to_string(),
     }
 }

common/src/comp/inventory/item/tool.rs

@@ -34,7 +34,6 @@ pub enum ToolKind {
     /// Intended for invisible weapons (e.g. a creature using its claws or
     /// biting)
     Natural,
-    Organ,
     /// This is an placeholder item, it is used by non-humanoid npcs to attack
     /// Music Instruments
     Instrument,
@@ -59,7 +58,6 @@ impl ToolKind {
             ToolKind::Debug => "debug",
             ToolKind::Farming => "farming",
             ToolKind::Pick => "pickaxe",
-            ToolKind::Organ => "organ",
             ToolKind::Instrument => "instrument",
             ToolKind::Empty => "empty",
         }

server/src/persistence/json_models.rs

@@ -86,8 +86,7 @@ pub fn skill_group_to_db_string(skill_group: comp::skillset::SkillGroupKind) ->
         | Weapon(ToolKind::Farming)
         | Weapon(ToolKind::Instrument)
         | Weapon(ToolKind::Empty)
-        | Weapon(ToolKind::Natural)
-        | Weapon(ToolKind::Organ) => panic!(
+        | Weapon(ToolKind::Natural) => panic!(
             "Tried to add unsupported skill group to database: {:?}",
             skill_group
         ),
@@ -207,7 +206,6 @@ fn tool_kind_to_string(tool: Option<comp::item::tool::ToolKind>) -> String {
         Some(Debug) => "Debug",
         Some(Natural) => "Natural",
         Some(Instrument) => "Instrument",
-        Some(Organ) => "Organ",
         Some(Empty) => "Empty",
         None => "None",
     })
@@ -227,11 +225,9 @@ fn tool_kind_from_string(tool: String) -> Option<comp::item::tool::ToolKind> {
         "Spear" => Some(Spear),
         "Blowgun" => Some(Blowgun),
         "Pick" => Some(Pick),
-
         "Farming" => Some(Farming),
         "Debug" => Some(Debug),
         "Natural" => Some(Natural),
-        "Organ" => Some(Organ),
         "Empty" => Some(Empty),
         "None" => None,
         unknown => {

voxygen/src/hud/diary.rs

@@ -2836,7 +2836,6 @@ fn unlock_skill_strings(group: SkillGroupKind) -> SkillStrings<'static> {
             | ToolKind::Instrument
             | ToolKind::Pick
             | ToolKind::Natural
-            | ToolKind::Organ
             | ToolKind::Empty,
         ) => {
             tracing::warn!("Requesting title for unlocking unexpected skill group");

voxygen/src/hud/util.rs

@@ -250,7 +250,6 @@ fn tool_kind<'a>(tool: &Tool, i18n: &'a Localization) -> Cow<'a, str> {
         ToolKind::Shield => i18n.get_msg("common-weapons-shield"),
         ToolKind::Spear => i18n.get_msg("common-weapons-spear"),
         ToolKind::Blowgun => i18n.get_msg("common-weapons-blowgun"),
-        ToolKind::Organ => i18n.get_msg("common-weapons-organ"),
         ToolKind::Natural => i18n.get_msg("common-weapons-natural"),
         ToolKind::Debug => i18n.get_msg("common-tool-debug"),
         ToolKind::Farming => i18n.get_msg("common-tool-farming"),