diff --git a/assets/common/items/debug/admin_stick.ron b/assets/common/items/debug/admin_stick.ron index 428a9f96a3..1de1fc44e0 100644 --- a/assets/common/items/debug/admin_stick.ron +++ b/assets/common/items/debug/admin_stick.ron @@ -3,7 +3,7 @@ ItemDef( description: "You can hear him giggle whenever\nyou hit the ground a bit too hard...", kind: Tool(( kind: Debug, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.0, diff --git a/assets/common/items/debug/admin_sword.ron b/assets/common/items/debug/admin_sword.ron index 7c89995ec6..9a351c3ec8 100644 --- a/assets/common/items/debug/admin_sword.ron +++ b/assets/common/items/debug/admin_sword.ron @@ -3,7 +3,7 @@ ItemDef( description: "Shouldn't this be a hammer?", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 999.9, diff --git a/assets/common/items/debug/velorite_bow_debug.ron b/assets/common/items/debug/velorite_bow_debug.ron index d16fea1d65..6c974d0a58 100644 --- a/assets/common/items/debug/velorite_bow_debug.ron +++ b/assets/common/items/debug/velorite_bow_debug.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with Velorite power.", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 999.9, diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron index f0dd5e4607..e86cbb3943 100644 --- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron +++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron index 2cc97673c7..3fe35644b9 100644 --- a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron +++ b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.6, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron index bd23647bac..7aa6f28922 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Spear, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 0.7, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron index 9d6f02cad9..ab6bcfb9f9 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 0.7, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron b/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron index 7c5e2c6868..384afc75bf 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron b/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron index 54b3f22bad..fe67248e22 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.6, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron b/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron index cd086178cb..0cbfe524b8 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Spear, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.6, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron index 05dde879db..3b1853d3f8 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Spear, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 2.0, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron index e51db5461f..079bf17a70 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 2.0, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron index 8b8187b3c6..8ccf069de1 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.2, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron index ccdf070cd6..a52f95e5aa 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.2, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron index 8d0f268473..032a9153db 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Tool(( kind: Spear, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.2, diff --git a/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron index a21c91e260..1af302e457 100644 --- a/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron +++ b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with Velorite power.", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index a29a32b41c..b04fbc8698 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron index 367c4d5d94..c0c8639b7a 100644 --- a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron @@ -3,7 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.6, diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index d769c40adb..9bc89bab57 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron index 0e75a422bd..4e6a0449ce 100644 --- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron +++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.001, power: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index 412e9d811e..8a3e665b70 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron index c09de44568..7f34dc8525 100644 --- a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index eae1c62325..132fce2162 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index 717a4da2d0..526814da08 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron index ff565733d3..4b82f3d1ec 100644 --- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron index 6ed3acd344..d118f5c1f3 100644 --- a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron @@ -3,7 +3,7 @@ ItemDef( description: "The fire gives off no heat.", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.6, diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index e8c5bbfb6a..1566487a00 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 7c4f5ba16e..af3de7c87e 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 9b6003e2f2..95da49a6b4 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron index 5a2a866429..36d3ca77e0 100644 --- a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron @@ -3,7 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.6, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index 8283c0f92a..b48fae89f5 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index 75606b821e..cd9d5ee55e 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -3,7 +3,7 @@ ItemDef( description: "Placeholder", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/asp.ron b/assets/common/items/npc_weapons/unique/asp.ron index 6a8630c61e..59a54a6a25 100644 --- a/assets/common/items/npc_weapons/unique/asp.ron +++ b/assets/common/items/npc_weapons/unique/asp.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/basilisk.ron b/assets/common/items/npc_weapons/unique/basilisk.ron index 7242fe6c9a..b98bf21d24 100644 --- a/assets/common/items/npc_weapons/unique/basilisk.ron +++ b/assets/common/items/npc_weapons/unique/basilisk.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index ac2cf503b1..66425be841 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -3,7 +3,7 @@ ItemDef( description: "Was attached to a beast.", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/birdlargebasic.ron b/assets/common/items/npc_weapons/unique/birdlargebasic.ron index bcea09e2ab..a428390f71 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebasic.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebasic.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron index 09c3b2409e..69017ca5bf 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/birdlargefire.ron b/assets/common/items/npc_weapons/unique/birdlargefire.ron index e553300c0b..616b2244e0 100644 --- a/assets/common/items/npc_weapons/unique/birdlargefire.ron +++ b/assets/common/items/npc_weapons/unique/birdlargefire.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron index 7d80dd1564..e8f8a22ac4 100644 --- a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron @@ -3,7 +3,7 @@ ItemDef( description: "Yeet.", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.001, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron index 1f4193f2e0..287d75530e 100644 --- a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron +++ b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron @@ -3,7 +3,7 @@ ItemDef( description: "Rotating turret weapon", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/husk.ron b/assets/common/items/npc_weapons/unique/husk.ron index 8422e8a31e..55daaec656 100644 --- a/assets/common/items/npc_weapons/unique/husk.ron +++ b/assets/common/items/npc_weapons/unique/husk.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/husk_brute.ron b/assets/common/items/npc_weapons/unique/husk_brute.ron index 19cc4a43ac..37dc4c5a33 100644 --- a/assets/common/items/npc_weapons/unique/husk_brute.ron +++ b/assets/common/items/npc_weapons/unique/husk_brute.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/maneater.ron b/assets/common/items/npc_weapons/unique/maneater.ron index 6980223ace..1367069281 100644 --- a/assets/common/items/npc_weapons/unique/maneater.ron +++ b/assets/common/items/npc_weapons/unique/maneater.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index 4252476464..816da16e29 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron index 4ad1b672d1..af3ddadabe 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index da56ac0b0b..712e648bcd 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index 3cb1286745..1fa4997463 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index aad9d719c1..0769bbb212 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index ef43a88ece..6a815992f2 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron index db9c4e4553..9893344eaf 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 0.5, diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index fde0d957ec..6aebe8fcd0 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index a43e5aed17..8c5148ebe7 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index a1abd09380..ef2a80c35d 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index adf915c4e3..93a537c064 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index 928acd0580..bef750c092 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron index 5fe154cdae..caec3350b6 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -3,7 +3,7 @@ ItemDef( description: "Was attached to a mighty stone golem.", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.001, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index 61cda71cd9..8caf9b4ca7 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index 31d66c6bc1..3a5b3488b7 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/theropodcharge.ron b/assets/common/items/npc_weapons/unique/theropodcharge.ron index d4617bd00a..d083b16d32 100644 --- a/assets/common/items/npc_weapons/unique/theropodcharge.ron +++ b/assets/common/items/npc_weapons/unique/theropodcharge.ron @@ -3,7 +3,7 @@ ItemDef( description: "testing123", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron index 192518a6b5..276cbdf389 100644 --- a/assets/common/items/npc_weapons/unique/tidal_claws.ron +++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron @@ -3,7 +3,7 @@ ItemDef( description: "Snip snap", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.0, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/tidal_totem.ron b/assets/common/items/npc_weapons/unique/tidal_totem.ron index d86bde56d7..336c94abda 100644 --- a/assets/common/items/npc_weapons/unique/tidal_totem.ron +++ b/assets/common/items/npc_weapons/unique/tidal_totem.ron @@ -3,7 +3,7 @@ ItemDef( description: "Yeet", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/tornado.ron b/assets/common/items/npc_weapons/unique/tornado.ron index 4fd1d5e106..85c8130238 100644 --- a/assets/common/items/npc_weapons/unique/tornado.ron +++ b/assets/common/items/npc_weapons/unique/tornado.ron @@ -3,7 +3,7 @@ ItemDef( description: "Tornado weapon", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron index 15cafd26ef..5ca0a2b4b2 100644 --- a/assets/common/items/npc_weapons/unique/turret.ron +++ b/assets/common/items/npc_weapons/unique/turret.ron @@ -3,7 +3,7 @@ ItemDef( description: "Turret weapon", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.01, power: 1.0, diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron index def4c8a519..c213120dd7 100644 --- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron +++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron @@ -3,7 +3,7 @@ ItemDef( description: "spook.", kind: Tool(( kind: Natural, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/tool/craftsman_hammer.ron b/assets/common/items/tool/craftsman_hammer.ron index a4cd1e1c46..73c07a6a98 100644 --- a/assets/common/items/tool/craftsman_hammer.ron +++ b/assets/common/items/tool/craftsman_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "Used to craft various items.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.25, power: 0.2, diff --git a/assets/common/items/tool/pickaxe_steel.ron b/assets/common/items/tool/pickaxe_steel.ron index ae2da427c4..87170dbeb8 100644 --- a/assets/common/items/tool/pickaxe_steel.ron +++ b/assets/common/items/tool/pickaxe_steel.ron @@ -3,7 +3,7 @@ ItemDef( description: "Strike the earth!", kind: Tool(( kind: Pick, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.25, power: 0.75, diff --git a/assets/common/items/tool/pickaxe_stone.ron b/assets/common/items/tool/pickaxe_stone.ron index ff3909dbcc..9a8da91cca 100644 --- a/assets/common/items/tool/pickaxe_stone.ron +++ b/assets/common/items/tool/pickaxe_stone.ron @@ -3,7 +3,7 @@ ItemDef( description: "Strike the earth!", kind: Tool(( kind: Pick, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.25, power: 0.75, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index 1234647ddf..7d9190a83d 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.8, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index b02ecea234..289235e53d 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.8, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index 4e421d9c20..c49dda4682 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.8, diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index a505f9cfea..2291b86a4b 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "A fine quality metal alloy axe.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index 0cfdd2a4f3..e525ce75b1 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "While the metal alloy is relatively simple, this unique circular axe has a unique appearance.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron index f80088227a..a9d46f8e57 100644 --- a/assets/common/items/weapons/axe/bronze_axe-2.ron +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Stained with the blood of its wielder's enemies.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron index 0a07bfa70f..d2b2855437 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The lustrous bluish gray axe provides a certain stylish class to the weapon.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/weapons/axe/cobalt_axe-1.ron b/assets/common/items/weapons/axe/cobalt_axe-1.ron index 51aba83388..f8e9ad1499 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-1.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index 3336223d82..4d3a53bbf1 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heavy iron hammered into rough blades, a simple tool for killing.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index 7c52660016..3f7bca8633 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heavy iron axe, likely created for ritual execution.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index 5589f7b05d..4dbcf4949e 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "The iron axe head is split into two distinct curves, giving it a unique appearance.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index d7c2ab079e..886040c675 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Tried and true iron armaments, mass produced for killing.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index 95ac87ed05..6cf395861c 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "This axe has a heavy iron head used to cleave nearly anything.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index 003bc9a00e..a383f6bad3 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "While heavy, this iron forged axe is quite easy to swing, at least for those with the muscle backing it.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index d0b1ef7683..d6510dbece 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -3,7 +3,7 @@ ItemDef( description: "A simple dual bitted iron forged axe.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index f7a93d6f41..c7ad758b89 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -3,7 +3,7 @@ ItemDef( description: "Double bitted axe head, decorated iron construction.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index 655651286c..d3067155dd 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -3,7 +3,7 @@ ItemDef( description: "Several sharp axe heads forged with points to mimic animal fangs.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index fb3fb24efe..10d2367da3 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -3,7 +3,7 @@ ItemDef( description: "Strikes from this axe look like wolf bites in flesh.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index 6825fd53e4..65b0814886 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Etched axe head decorated with malachite on the blades to provide magical properties.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 2.0, diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index 03824da752..ef4901705a 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "A rough cut axe created by orcs to cleave beasts in two.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.6, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index 92e161ab75..efb92ea3eb 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -3,7 +3,7 @@ ItemDef( description: "Said to be able to cleave the heavens.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 2.5, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 12d9d8950d..32cd115a39 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -3,7 +3,7 @@ ItemDef( description: "Every dent tells the story of a chopped tree.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.5, diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index 0eb2e0891a..fb79801fc0 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Well crafted metal alloy axe that slices more cleanly than its iron counterparts.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index 2a15d0e9f2..0990ee49ec 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Double bitted, well polished, and spiked axe head.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index 62c21dcd2a..62b12b440e 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A simple metal alloy axe.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index 880675e6b7..a16c2048d6 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "The blade of this steel axe is forged in a manner to resemble a crescent moon.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index fc49882b94..1475f14336 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "The blade of this axe resembles a full moon.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index 1f1919c632..23e79445c5 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "Druidic rituals formed this axe in the dark of night. Made to look like the wings of an owl swooping in on a kill.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index 9ff3d5c053..ec712b8c91 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -3,7 +3,7 @@ ItemDef( description: "This axe is designed to mimic the playing card suit, swiftly slicing through the air.", kind: Tool(( kind: Axe, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron index 62ce97cc27..f96a951cb1 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.5, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron index 5ffa81170b..2ede5a6cc2 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 2.0, diff --git a/assets/common/items/weapons/axe_1h/bronze-0.ron b/assets/common/items/weapons/axe_1h/bronze-0.ron index 5f4433e39b..754ee508d5 100644 --- a/assets/common/items/weapons/axe_1h/bronze-0.ron +++ b/assets/common/items/weapons/axe_1h/bronze-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from bronze.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/axe_1h/bronze-1.ron b/assets/common/items/weapons/axe_1h/bronze-1.ron index 755e3fedda..7499c85b46 100644 --- a/assets/common/items/weapons/axe_1h/bronze-1.ron +++ b/assets/common/items/weapons/axe_1h/bronze-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from bronze.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.1, diff --git a/assets/common/items/weapons/axe_1h/cobalt-0.ron b/assets/common/items/weapons/axe_1h/cobalt-0.ron index 3d001aaf77..6dca5a51b7 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-0.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from cobalt.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/weapons/axe_1h/cobalt-1.ron b/assets/common/items/weapons/axe_1h/cobalt-1.ron index db938fb386..dba8a91b69 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-1.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from cobalt.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.75, diff --git a/assets/common/items/weapons/axe_1h/iron-0.ron b/assets/common/items/weapons/axe_1h/iron-0.ron index b07ac72c00..32aa8b0297 100644 --- a/assets/common/items/weapons/axe_1h/iron-0.ron +++ b/assets/common/items/weapons/axe_1h/iron-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.1, diff --git a/assets/common/items/weapons/axe_1h/iron-1.ron b/assets/common/items/weapons/axe_1h/iron-1.ron index 011e6b54f5..b11cc79428 100644 --- a/assets/common/items/weapons/axe_1h/iron-1.ron +++ b/assets/common/items/weapons/axe_1h/iron-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.3, diff --git a/assets/common/items/weapons/axe_1h/iron-2.ron b/assets/common/items/weapons/axe_1h/iron-2.ron index 9fa9d1f752..4c267b0539 100644 --- a/assets/common/items/weapons/axe_1h/iron-2.ron +++ b/assets/common/items/weapons/axe_1h/iron-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/axe_1h/iron-3.ron b/assets/common/items/weapons/axe_1h/iron-3.ron index da27762047..72de132bbf 100644 --- a/assets/common/items/weapons/axe_1h/iron-3.ron +++ b/assets/common/items/weapons/axe_1h/iron-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/axe_1h/orichalcum-0.ron b/assets/common/items/weapons/axe_1h/orichalcum-0.ron index 8b4503db85..1610028dba 100644 --- a/assets/common/items/weapons/axe_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/axe_1h/orichalcum-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with orichalcum.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 2.0, diff --git a/assets/common/items/weapons/axe_1h/steel-0.ron b/assets/common/items/weapons/axe_1h/steel-0.ron index 350a966725..6ba649423c 100644 --- a/assets/common/items/weapons/axe_1h/steel-0.ron +++ b/assets/common/items/weapons/axe_1h/steel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from steel.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.5, diff --git a/assets/common/items/weapons/axe_1h/steel-1.ron b/assets/common/items/weapons/axe_1h/steel-1.ron index d18b887ff1..823396d7b9 100644 --- a/assets/common/items/weapons/axe_1h/steel-1.ron +++ b/assets/common/items/weapons/axe_1h/steel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from steel.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/axe_1h/steel-2.ron b/assets/common/items/weapons/axe_1h/steel-2.ron index fcd49d5071..b52c52941a 100644 --- a/assets/common/items/weapons/axe_1h/steel-2.ron +++ b/assets/common/items/weapons/axe_1h/steel-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from steel.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.3, diff --git a/assets/common/items/weapons/axe_1h/stone-0.ron b/assets/common/items/weapons/axe_1h/stone-0.ron index 7b3f2b16d0..ea92b71b38 100644 --- a/assets/common/items/weapons/axe_1h/stone-0.ron +++ b/assets/common/items/weapons/axe_1h/stone-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chiseled from stone.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.8, diff --git a/assets/common/items/weapons/axe_1h/stone-1.ron b/assets/common/items/weapons/axe_1h/stone-1.ron index 165a790979..7fbb11467d 100644 --- a/assets/common/items/weapons/axe_1h/stone-1.ron +++ b/assets/common/items/weapons/axe_1h/stone-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chiseled from stone.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.7, diff --git a/assets/common/items/weapons/axe_1h/wood-0.ron b/assets/common/items/weapons/axe_1h/wood-0.ron index 4c1a4dd631..eee760412d 100644 --- a/assets/common/items/weapons/axe_1h/wood-0.ron +++ b/assets/common/items/weapons/axe_1h/wood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Carved from wood.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.8, diff --git a/assets/common/items/weapons/axe_1h/wood-1.ron b/assets/common/items/weapons/axe_1h/wood-1.ron index e952cfea88..725bc38f16 100644 --- a/assets/common/items/weapons/axe_1h/wood-1.ron +++ b/assets/common/items/weapons/axe_1h/wood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Carved from wood.", kind: Tool(( kind: Axe, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.5, diff --git a/assets/common/items/weapons/bow/bone-0.ron b/assets/common/items/weapons/bow/bone-0.ron index a098e98393..9317951554 100644 --- a/assets/common/items/weapons/bow/bone-0.ron +++ b/assets/common/items/weapons/bow/bone-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "There are over a dozen small fangs attached to the bow limbs", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.9, diff --git a/assets/common/items/weapons/bow/bone-1.ron b/assets/common/items/weapons/bow/bone-1.ron index c427d2aaa8..c6302d183e 100644 --- a/assets/common/items/weapons/bow/bone-1.ron +++ b/assets/common/items/weapons/bow/bone-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The horns aren't from any creature you know", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/bow/bone-2.ron b/assets/common/items/weapons/bow/bone-2.ron index f149dac143..8a7ce7d7a4 100644 --- a/assets/common/items/weapons/bow/bone-2.ron +++ b/assets/common/items/weapons/bow/bone-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A ceremonial weapon", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/bow/bone-3.ron b/assets/common/items/weapons/bow/bone-3.ron index 344575fa27..e7df5681a9 100644 --- a/assets/common/items/weapons/bow/bone-3.ron +++ b/assets/common/items/weapons/bow/bone-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made with bones", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.1, diff --git a/assets/common/items/weapons/bow/eldwood-0.ron b/assets/common/items/weapons/bow/eldwood-0.ron index 57209f7f42..f2129febb0 100644 --- a/assets/common/items/weapons/bow/eldwood-0.ron +++ b/assets/common/items/weapons/bow/eldwood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The wood feels old, yet still alive", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.8, diff --git a/assets/common/items/weapons/bow/eldwood-1.ron b/assets/common/items/weapons/bow/eldwood-1.ron index 54bcd20f7e..8163ccea61 100644 --- a/assets/common/items/weapons/bow/eldwood-1.ron +++ b/assets/common/items/weapons/bow/eldwood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Inset with topaz", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/weapons/bow/eldwood-2.ron b/assets/common/items/weapons/bow/eldwood-2.ron index d1a3b869b6..6ea16493cc 100644 --- a/assets/common/items/weapons/bow/eldwood-2.ron +++ b/assets/common/items/weapons/bow/eldwood-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "You occasionally see it twitch from your periphery", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 2.0, diff --git a/assets/common/items/weapons/bow/frostwood-0.ron b/assets/common/items/weapons/bow/frostwood-0.ron index a1b2722d04..2dfe33e0ac 100644 --- a/assets/common/items/weapons/bow/frostwood-0.ron +++ b/assets/common/items/weapons/bow/frostwood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The design is reminiscent of a spread eagle's wings", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/bow/frostwood-1.ron b/assets/common/items/weapons/bow/frostwood-1.ron index 1fed9856a3..afedc3fee8 100644 --- a/assets/common/items/weapons/bow/frostwood-1.ron +++ b/assets/common/items/weapons/bow/frostwood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chill to the touch...", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/weapons/bow/frostwood-2.ron b/assets/common/items/weapons/bow/frostwood-2.ron index f6b5c2c134..cca3670e91 100644 --- a/assets/common/items/weapons/bow/frostwood-2.ron +++ b/assets/common/items/weapons/bow/frostwood-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Glows under the light of the moon", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.7, diff --git a/assets/common/items/weapons/bow/hardwood-0.ron b/assets/common/items/weapons/bow/hardwood-0.ron index 373a82aad4..8590d0d106 100644 --- a/assets/common/items/weapons/bow/hardwood-0.ron +++ b/assets/common/items/weapons/bow/hardwood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Some loose brambles are still attached", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/bow/hardwood-1.ron b/assets/common/items/weapons/bow/hardwood-1.ron index 2fc9db0ff3..e61ab6211a 100644 --- a/assets/common/items/weapons/bow/hardwood-1.ron +++ b/assets/common/items/weapons/bow/hardwood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It has a heavy draw weight", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/bow/hardwood-2.ron b/assets/common/items/weapons/bow/hardwood-2.ron index a4829a5df7..31a1a548bc 100644 --- a/assets/common/items/weapons/bow/hardwood-2.ron +++ b/assets/common/items/weapons/bow/hardwood-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made with exquisite craftsmanship", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.1, diff --git a/assets/common/items/weapons/bow/hardwood-3.ron b/assets/common/items/weapons/bow/hardwood-3.ron index 9f53ebee4b..ad4fd573a2 100644 --- a/assets/common/items/weapons/bow/hardwood-3.ron +++ b/assets/common/items/weapons/bow/hardwood-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Perfect for mounted archery", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.9, diff --git a/assets/common/items/weapons/bow/hardwood-4.ron b/assets/common/items/weapons/bow/hardwood-4.ron index 2df1ec4828..760a98bfdc 100644 --- a/assets/common/items/weapons/bow/hardwood-4.ron +++ b/assets/common/items/weapons/bow/hardwood-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "It's hard to pull back all the way", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/bow/hardwood-5.ron b/assets/common/items/weapons/bow/hardwood-5.ron index 678394079d..20b90f9f2f 100644 --- a/assets/common/items/weapons/bow/hardwood-5.ron +++ b/assets/common/items/weapons/bow/hardwood-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made from the antlers of a stag", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.3, diff --git a/assets/common/items/weapons/bow/metal-0.ron b/assets/common/items/weapons/bow/metal-0.ron index 43caab6afe..1c9a376c53 100644 --- a/assets/common/items/weapons/bow/metal-0.ron +++ b/assets/common/items/weapons/bow/metal-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made from the horns of a small beetle", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/bow/metal-1.ron b/assets/common/items/weapons/bow/metal-1.ron index 7fc942f238..3dfbeb0196 100644 --- a/assets/common/items/weapons/bow/metal-1.ron +++ b/assets/common/items/weapons/bow/metal-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "You feel a faint magical aura emanating from the bow", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/bow/metal-2.ron b/assets/common/items/weapons/bow/metal-2.ron index 63fffbd87f..81ef8ad9b9 100644 --- a/assets/common/items/weapons/bow/metal-2.ron +++ b/assets/common/items/weapons/bow/metal-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.3, diff --git a/assets/common/items/weapons/bow/metal-3.ron b/assets/common/items/weapons/bow/metal-3.ron index 0bf7f71ef9..aa7894f962 100644 --- a/assets/common/items/weapons/bow/metal-3.ron +++ b/assets/common/items/weapons/bow/metal-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Its appearance is intimidating", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.5, diff --git a/assets/common/items/weapons/bow/metal-4.ron b/assets/common/items/weapons/bow/metal-4.ron index 636f900ac8..934975bec7 100644 --- a/assets/common/items/weapons/bow/metal-4.ron +++ b/assets/common/items/weapons/bow/metal-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "Reinforced with iron", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/weapons/bow/rawwood-0.ron b/assets/common/items/weapons/bow/rawwood-0.ron index f7409ffe61..91ee1dc3d7 100644 --- a/assets/common/items/weapons/bow/rawwood-0.ron +++ b/assets/common/items/weapons/bow/rawwood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The wood is blackened with dirt", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.7, diff --git a/assets/common/items/weapons/bow/rawwood-1.ron b/assets/common/items/weapons/bow/rawwood-1.ron index b4d4ee73e2..2580140839 100644 --- a/assets/common/items/weapons/bow/rawwood-1.ron +++ b/assets/common/items/weapons/bow/rawwood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It was only recently collected", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.6, diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron index 7c1d5ca9e1..1e1f6f8c83 100644 --- a/assets/common/items/weapons/bow/sagitta.ron +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -3,7 +3,7 @@ ItemDef( description: "Said to have slain a dragon with a single arrow", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 2.5, diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron index ee006a4df9..9ca19db50a 100644 --- a/assets/common/items/weapons/bow/starter.ron +++ b/assets/common/items/weapons/bow/starter.ron @@ -3,7 +3,7 @@ ItemDef( description: "Someone carved their initials into it.", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.5, diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron index f5e1508611..25934e253f 100644 --- a/assets/common/items/weapons/bow/velorite.ron +++ b/assets/common/items/weapons/bow/velorite.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with Velorite power.", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 2.0, diff --git a/assets/common/items/weapons/bow/wood-0.ron b/assets/common/items/weapons/bow/wood-0.ron index ef4dc87dda..c9c2d15f5d 100644 --- a/assets/common/items/weapons/bow/wood-0.ron +++ b/assets/common/items/weapons/bow/wood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made with exquisite craftsmanship", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.9, diff --git a/assets/common/items/weapons/bow/wood-1.ron b/assets/common/items/weapons/bow/wood-1.ron index d97fad1bac..47b31a1f33 100644 --- a/assets/common/items/weapons/bow/wood-1.ron +++ b/assets/common/items/weapons/bow/wood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The bow looks strangely flat...", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.7, diff --git a/assets/common/items/weapons/bow/wood-2.ron b/assets/common/items/weapons/bow/wood-2.ron index 2c47cee7c1..6913d54b34 100644 --- a/assets/common/items/weapons/bow/wood-2.ron +++ b/assets/common/items/weapons/bow/wood-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "You could hunt a deer with this bow", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.8, diff --git a/assets/common/items/weapons/bow/wood-3.ron b/assets/common/items/weapons/bow/wood-3.ron index e84786c33b..83ed637448 100644 --- a/assets/common/items/weapons/bow/wood-3.ron +++ b/assets/common/items/weapons/bow/wood-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made of wood", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/bow/wood-4.ron b/assets/common/items/weapons/bow/wood-4.ron index 3492e806e1..cf5342c894 100644 --- a/assets/common/items/weapons/bow/wood-4.ron +++ b/assets/common/items/weapons/bow/wood-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "Swiftly fires arrows", kind: Tool(( kind: Bow, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.6, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 5621131b1f..71f1f67574 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Opens letters quickly.", kind: Tool(( kind: Dagger, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.2, power: 1.8, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index a886bfdbab..160c1848ce 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Dagger, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.2, power: 2.0, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 92c3315141..a77a91f229 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -3,7 +3,7 @@ ItemDef( description: "Easily concealed.", kind: Tool(( kind: Dagger, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.2, power: 1.0, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index cdf38904ec..c45d19dbe6 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -3,7 +3,7 @@ ItemDef( description: "This item may grant abilities, but is invisible", kind: Tool(( kind: Empty, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.2, power: 1.0, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index 322241ce55..d4dd3c8a8e 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy hammer forged from a simple metal alloy.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron index 93b0ab60ac..2bbfe9b80d 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The entire head of this club is forged from bronze alloy.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/weapons/hammer/burnt_drumstick.ron b/assets/common/items/weapons/hammer/burnt_drumstick.ron index 2373f5dfb4..2879c6bb2a 100644 --- a/assets/common/items/weapons/hammer/burnt_drumstick.ron +++ b/assets/common/items/weapons/hammer/burnt_drumstick.ron @@ -3,7 +3,7 @@ ItemDef( description: "Might need more practice...", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.5, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 3862fd15bb..1f5be1881b 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The bluish gray tinge to the metal of this hammer head provides a slight classiness to the weapon.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.6, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index 8d192f91c3..396b8df3cb 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The decorative hooked head of this mace is formed from a bluish gray metal.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.6, diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron index aa02c68b59..c47bd85732 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 2.0, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index 24992bcfa9..77158f986d 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "The head is barely secured.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.5, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 2dad4bbb88..78af38b331 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Breaks bones like sticks and stones.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.5, diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index f4c258c558..2a0a9c4776 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "This heavy, solid chunk iron hammer head is simple and brutal in its design.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 3436a072bc..611c6122bf 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "This heavy, square iron hammer is designed for squashing heads like watermelons.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index 04e4e8269b..6b47a8d8e9 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A decorative iron mace, great for smashing.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index 4dc171b2a9..11e09192e0 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "The decorative iron mace has a crowning tip on top.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index b1df589d24..b0bc2d63c4 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "Worn head shows that this hammer had been used for many years to make other weapons, now relegated to being a weapon in its own right.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index f851ba6265..045f208efb 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "A hybrid fusion of a warhammer and a polearm.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index 3c7577a8a6..abc37f5af9 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -3,7 +3,7 @@ ItemDef( description: "A rough shaped iron hammer with spikes for added destruction.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index 01b7479c0f..1703fbd940 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -3,7 +3,7 @@ ItemDef( description: "This iron forged hammer is roughly shaped into the shape of a fist holding the hammer head.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index cfc58443ad..f6c39233c0 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -3,7 +3,7 @@ ItemDef( description: "This hammer has a spike on the opposite end, making it dangerous when swung either direction.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 4842e9983d..af3406fa0f 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -3,7 +3,7 @@ ItemDef( description: "It's crackling with lightning.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 2.5, diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index fc1a984f0c..87a82f3d28 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "You feel an evil presence in the hammer.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.8, diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index fe0da9bda4..578b605c86 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "There are strange runes inscribed into it.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.8, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 877d3bfa0e..0060d0f9b6 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "'Property of...' The rest is missing.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.5, diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index 5afb149591..41ce14ee23 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "While lighter and more durable than its iron counterparts, it is nonetheless just as deadly.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index f5371668e5..b48e0d7efb 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The lighter attributes of the metal alloy are barely noticed when forged into such a wide hammer head.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index aab3bcdd76..fc89f5a2cc 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy and wide baton made of a durable metal alloy, decorated with spikes.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index b74c9c62b4..05d3468f49 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy, spiked steel ball tip provides a great smashing weapon.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index 9cc699e849..8e8f8da08c 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "This destructive hammer was likely wielded by a vicious killer.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index fcf9ad23c7..78447d79e2 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "A spiked ball designed to resemble the stars lining the night sky.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.4, diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index 7978d451c1..16bdd562e9 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Bloodied stone tied to a branch, simple but functional as a weapon.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.6, diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index 59d7512f2b..162e47eac1 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "A rough stone, crumbling on the striking surfaces. Still usable as a weapon.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.5, diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index 457b14b2ef..12f670bb5c 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A rock tied to a stick, still good for smashing, but not very strong.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.7, diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index a098d06560..d4e0e3511d 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy rock with a slot worn through to fasten it in place. Brutal in its simple design, but still functional.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.6, diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index c8bd565b39..9ab6dc5cae 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Hardened wood, subjected to many different elements to provide a enough strength to be a weapon.", kind: Tool(( kind: Hammer, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 0.6, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron index 8d859b80ba..aacdafb1f4 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.6, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron index d00a36f38b..c8eb600d56 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.8, diff --git a/assets/common/items/weapons/hammer_1h/bronze-0.ron b/assets/common/items/weapons/hammer_1h/bronze-0.ron index 09a896067c..aae6a4b35e 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-0.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Casted from brass.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer_1h/bronze-1.ron b/assets/common/items/weapons/hammer_1h/bronze-1.ron index 4aae1c247b..5d6736df35 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-1.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from bronze.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-0.ron b/assets/common/items/weapons/hammer_1h/cobalt-0.ron index e0afcb76d8..5fdf8daa2b 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-0.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from cobalt.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.6, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-1.ron b/assets/common/items/weapons/hammer_1h/cobalt-1.ron index 9ec5636729..d74e2d3c02 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-1.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from cobalt.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.5, diff --git a/assets/common/items/weapons/hammer_1h/iron-0.ron b/assets/common/items/weapons/hammer_1h/iron-0.ron index 96d7fba5be..2f0330aacc 100644 --- a/assets/common/items/weapons/hammer_1h/iron-0.ron +++ b/assets/common/items/weapons/hammer_1h/iron-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.4, diff --git a/assets/common/items/weapons/hammer_1h/iron-1.ron b/assets/common/items/weapons/hammer_1h/iron-1.ron index efb1b08e90..986b9582dd 100644 --- a/assets/common/items/weapons/hammer_1h/iron-1.ron +++ b/assets/common/items/weapons/hammer_1h/iron-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.3, diff --git a/assets/common/items/weapons/hammer_1h/iron-2.ron b/assets/common/items/weapons/hammer_1h/iron-2.ron index bed337ac3d..a9e48ef482 100644 --- a/assets/common/items/weapons/hammer_1h/iron-2.ron +++ b/assets/common/items/weapons/hammer_1h/iron-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.1, diff --git a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron index 3245ba2de5..23314f1da6 100644 --- a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with orichalcum.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 2.0, diff --git a/assets/common/items/weapons/hammer_1h/steel-0.ron b/assets/common/items/weapons/hammer_1h/steel-0.ron index 6a6af9f557..13e7987da4 100644 --- a/assets/common/items/weapons/hammer_1h/steel-0.ron +++ b/assets/common/items/weapons/hammer_1h/steel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from steel.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.5, diff --git a/assets/common/items/weapons/hammer_1h/steel-1.ron b/assets/common/items/weapons/hammer_1h/steel-1.ron index 24218019cd..b266011d0e 100644 --- a/assets/common/items/weapons/hammer_1h/steel-1.ron +++ b/assets/common/items/weapons/hammer_1h/steel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Inset with an amethyst.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.4, diff --git a/assets/common/items/weapons/hammer_1h/steel-2.ron b/assets/common/items/weapons/hammer_1h/steel-2.ron index 3560ae80a7..e67e723754 100644 --- a/assets/common/items/weapons/hammer_1h/steel-2.ron +++ b/assets/common/items/weapons/hammer_1h/steel-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Inlaid with gold.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.2, diff --git a/assets/common/items/weapons/hammer_1h/stone-0.ron b/assets/common/items/weapons/hammer_1h/stone-0.ron index 36354f9f0b..96d102067d 100644 --- a/assets/common/items/weapons/hammer_1h/stone-0.ron +++ b/assets/common/items/weapons/hammer_1h/stone-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Bone(s?)", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 0.7, diff --git a/assets/common/items/weapons/hammer_1h/stone-1.ron b/assets/common/items/weapons/hammer_1h/stone-1.ron index 05c1bd0be0..222c782c92 100644 --- a/assets/common/items/weapons/hammer_1h/stone-1.ron +++ b/assets/common/items/weapons/hammer_1h/stone-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chiseled from stone.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 1.0, diff --git a/assets/common/items/weapons/hammer_1h/wood-0.ron b/assets/common/items/weapons/hammer_1h/wood-0.ron index d22e8a5dc1..72b7af9e2a 100644 --- a/assets/common/items/weapons/hammer_1h/wood-0.ron +++ b/assets/common/items/weapons/hammer_1h/wood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "All that remains of a tree...", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 0.8, diff --git a/assets/common/items/weapons/hammer_1h/wood-1.ron b/assets/common/items/weapons/hammer_1h/wood-1.ron index e6ba8ea922..cc90b14e9d 100644 --- a/assets/common/items/weapons/hammer_1h/wood-1.ron +++ b/assets/common/items/weapons/hammer_1h/wood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Carved from wood.", kind: Tool(( kind: Hammer, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.5, power: 0.5, diff --git a/assets/common/items/weapons/sceptre/amethyst.ron b/assets/common/items/weapons/sceptre/amethyst.ron index 9b37b9cb66..f04843d80b 100644 --- a/assets/common/items/weapons/sceptre/amethyst.ron +++ b/assets/common/items/weapons/sceptre/amethyst.ron @@ -3,7 +3,7 @@ ItemDef( description: "Its stone is the closest thing from perfection", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.8, diff --git a/assets/common/items/weapons/sceptre/caduceus.ron b/assets/common/items/weapons/sceptre/caduceus.ron index a3f1fc0798..d82e58b8fa 100644 --- a/assets/common/items/weapons/sceptre/caduceus.ron +++ b/assets/common/items/weapons/sceptre/caduceus.ron @@ -3,7 +3,7 @@ ItemDef( description: "The snakes seem to be alive", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.67, diff --git a/assets/common/items/weapons/sceptre/coralline_cane.ron b/assets/common/items/weapons/sceptre/coralline_cane.ron index 83760b9dbb..972b1eda1d 100644 --- a/assets/common/items/weapons/sceptre/coralline_cane.ron +++ b/assets/common/items/weapons/sceptre/coralline_cane.ron @@ -3,7 +3,7 @@ ItemDef( description: "Traditional danari scepter from the depths of the ocean", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/weapons/sceptre/divine_gohei.ron b/assets/common/items/weapons/sceptre/divine_gohei.ron index d4bd367b01..e8a5566e26 100644 --- a/assets/common/items/weapons/sceptre/divine_gohei.ron +++ b/assets/common/items/weapons/sceptre/divine_gohei.ron @@ -3,7 +3,7 @@ ItemDef( description: "The wind wont make it bend", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/sceptre/druids_arbor.ron b/assets/common/items/weapons/sceptre/druids_arbor.ron index b5dcbad131..c376ae0638 100644 --- a/assets/common/items/weapons/sceptre/druids_arbor.ron +++ b/assets/common/items/weapons/sceptre/druids_arbor.ron @@ -3,7 +3,7 @@ ItemDef( description: "Draws its power from the primordial nature", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/sceptre/emerald.ron b/assets/common/items/weapons/sceptre/emerald.ron index e73f53d225..c543433bb7 100644 --- a/assets/common/items/weapons/sceptre/emerald.ron +++ b/assets/common/items/weapons/sceptre/emerald.ron @@ -3,7 +3,7 @@ ItemDef( description: "Its stone is the closest thing from perfection", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 2.0, diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index 1894439515..9f85955cf2 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Shamanistic energies brought this piece of wood to life again.", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.7, diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index 149b2acf82..963590e6ab 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Do you really want to live forever?", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index f18da6a96e..db03f37da7 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Trusty companion by day and night.", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.3, diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index 5139f7a79c..0c19bb4028 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -3,7 +3,7 @@ ItemDef( description: "'Everything comes at a price...'", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 2.5, diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index 9867a6e5e7..cdbda0a2cc 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Sparkles from living energy.", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.7, diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index b2df1eb8fc..adee91a307 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heals your allies with the mystical Velorite aura.", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 2.0, diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index e9075b4d22..6a62850b66 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heals your allies with the power of nature.", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.91, diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index b34799c3f4..fca4cc64b8 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heals your allies with the power of nature.", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.5, diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron index 5aa3edda28..5c4a1a09b3 100644 --- a/assets/common/items/weapons/sceptre/totem_green.ron +++ b/assets/common/items/weapons/sceptre/totem_green.ron @@ -3,7 +3,7 @@ ItemDef( description: "Territory marker of a Gnarling tribe.\nInfused with healing powers.", kind: Tool(( kind: Sceptre, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index ef3be5fc51..70da95f896 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Should withstand a few more hits, hopefully...", kind: Tool(( kind: Shield, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/staff/aurora.ron b/assets/common/items/weapons/staff/aurora.ron index 547c3dc51a..923d1ede74 100644 --- a/assets/common/items/weapons/staff/aurora.ron +++ b/assets/common/items/weapons/staff/aurora.ron @@ -3,7 +3,7 @@ ItemDef( description: "Praise the sun!", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.4, diff --git a/assets/common/items/weapons/staff/bent_fuse.ron b/assets/common/items/weapons/staff/bent_fuse.ron index 96aa112d66..69bda37556 100644 --- a/assets/common/items/weapons/staff/bent_fuse.ron +++ b/assets/common/items/weapons/staff/bent_fuse.ron @@ -3,7 +3,7 @@ ItemDef( description: "It's twitching from being charged with elemental powers", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.8, diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 245785d2d5..f7bf47b307 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "There's a red gem suspended in the bones.", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.5, diff --git a/assets/common/items/weapons/staff/crimson_eye.ron b/assets/common/items/weapons/staff/crimson_eye.ron index 894123736e..2df89773e6 100644 --- a/assets/common/items/weapons/staff/crimson_eye.ron +++ b/assets/common/items/weapons/staff/crimson_eye.ron @@ -3,7 +3,7 @@ ItemDef( description: "The eye faintly glows.", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.5, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 423081c14e..d64118f259 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "The fire gives off no heat.", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 2.0, diff --git a/assets/common/items/weapons/staff/dragon_tongue.ron b/assets/common/items/weapons/staff/dragon_tongue.ron index f04ba52f70..6398cb42a0 100644 --- a/assets/common/items/weapons/staff/dragon_tongue.ron +++ b/assets/common/items/weapons/staff/dragon_tongue.ron @@ -3,7 +3,7 @@ ItemDef( description: "The one they fear", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 2.0, diff --git a/assets/common/items/weapons/staff/fiery_wishing_rod.ron b/assets/common/items/weapons/staff/fiery_wishing_rod.ron index da0b7ae5cb..2b84da61c8 100644 --- a/assets/common/items/weapons/staff/fiery_wishing_rod.ron +++ b/assets/common/items/weapons/staff/fiery_wishing_rod.ron @@ -3,7 +3,7 @@ ItemDef( description: "Fulfills all your wishes from medium-rare to well-done", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.95, diff --git a/assets/common/items/weapons/staff/flamethrower_0.ron b/assets/common/items/weapons/staff/flamethrower_0.ron index 9f3482fe94..9c51d11797 100644 --- a/assets/common/items/weapons/staff/flamethrower_0.ron +++ b/assets/common/items/weapons/staff/flamethrower_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Definitely-A-Flamethrower", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.5, diff --git a/assets/common/items/weapons/staff/frostwood_torch.ron b/assets/common/items/weapons/staff/frostwood_torch.ron index 2881c528c4..499ef1e549 100644 --- a/assets/common/items/weapons/staff/frostwood_torch.ron +++ b/assets/common/items/weapons/staff/frostwood_torch.ron @@ -3,7 +3,7 @@ ItemDef( description: "Staff made from the coolest wood", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.3, diff --git a/assets/common/items/weapons/staff/golden_khakkara.ron b/assets/common/items/weapons/staff/golden_khakkara.ron index 72298c1042..007fd105f7 100644 --- a/assets/common/items/weapons/staff/golden_khakkara.ron +++ b/assets/common/items/weapons/staff/golden_khakkara.ron @@ -3,7 +3,7 @@ ItemDef( description: "Originally used to frighten away animals", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.1, diff --git a/assets/common/items/weapons/staff/heated_arm.ron b/assets/common/items/weapons/staff/heated_arm.ron index b7ffba5f52..c73f0a7c7a 100644 --- a/assets/common/items/weapons/staff/heated_arm.ron +++ b/assets/common/items/weapons/staff/heated_arm.ron @@ -3,7 +3,7 @@ ItemDef( description: "'Caution, hot surface!'", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.1, power: 1.0, diff --git a/assets/common/items/weapons/staff/infused_tower.ron b/assets/common/items/weapons/staff/infused_tower.ron index 620113d4d6..9610079b86 100644 --- a/assets/common/items/weapons/staff/infused_tower.ron +++ b/assets/common/items/weapons/staff/infused_tower.ron @@ -3,7 +3,7 @@ ItemDef( description: "Portable Beacon", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.1, diff --git a/assets/common/items/weapons/staff/laevateinn.ron b/assets/common/items/weapons/staff/laevateinn.ron index f423800da8..0b40363866 100644 --- a/assets/common/items/weapons/staff/laevateinn.ron +++ b/assets/common/items/weapons/staff/laevateinn.ron @@ -3,7 +3,7 @@ ItemDef( description: "Can shatter the gate of death", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.6, power: 1.67, diff --git a/assets/common/items/weapons/staff/lava_rod.ron b/assets/common/items/weapons/staff/lava_rod.ron index 3521264c5e..15f08cac4d 100644 --- a/assets/common/items/weapons/staff/lava_rod.ron +++ b/assets/common/items/weapons/staff/lava_rod.ron @@ -3,7 +3,7 @@ ItemDef( description: "'Property of Rob MacLava'", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.2, diff --git a/assets/common/items/weapons/staff/ley_seeker.ron b/assets/common/items/weapons/staff/ley_seeker.ron index 11c0734081..33d26b17ba 100644 --- a/assets/common/items/weapons/staff/ley_seeker.ron +++ b/assets/common/items/weapons/staff/ley_seeker.ron @@ -3,7 +3,7 @@ ItemDef( description: "Starts swinging when pointed away from water", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.8, diff --git a/assets/common/items/weapons/staff/orc_iron.ron b/assets/common/items/weapons/staff/orc_iron.ron index 71de0916b5..2c08e1cf9b 100644 --- a/assets/common/items/weapons/staff/orc_iron.ron +++ b/assets/common/items/weapons/staff/orc_iron.ron @@ -3,7 +3,7 @@ ItemDef( description: "Used to mark animals and captured foes", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.5, diff --git a/assets/common/items/weapons/staff/phoenix.ron b/assets/common/items/weapons/staff/phoenix.ron index eb02b5b6d2..62c77f61f8 100644 --- a/assets/common/items/weapons/staff/phoenix.ron +++ b/assets/common/items/weapons/staff/phoenix.ron @@ -3,7 +3,7 @@ ItemDef( description: "The ashes never stop glowing", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.6, power: 2.5, diff --git a/assets/common/items/weapons/staff/ruby_rod.ron b/assets/common/items/weapons/staff/ruby_rod.ron index 1144ff7864..cf8b0b88ea 100644 --- a/assets/common/items/weapons/staff/ruby_rod.ron +++ b/assets/common/items/weapons/staff/ruby_rod.ron @@ -3,7 +3,7 @@ ItemDef( description: "Some legends tell that the ruby is is tied to the fire element", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.6, diff --git a/assets/common/items/weapons/staff/solar.ron b/assets/common/items/weapons/staff/solar.ron index 80d4199fba..dee6c55bb6 100644 --- a/assets/common/items/weapons/staff/solar.ron +++ b/assets/common/items/weapons/staff/solar.ron @@ -3,7 +3,7 @@ ItemDef( description: "Sun energy rumble deep within this staff", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.9, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index b6ebb2e4b2..c5fdea29e5 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Walking stick with a sharpened end.", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.2, power: 0.5, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index c099b18efd..118037cf83 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "Smells like resin and magic.", kind: Tool(( kind: Staff, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.5, diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron index 30b00abbe7..55ee09661b 100644 --- a/assets/common/items/weapons/sword/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword/bloodsteel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.8, diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron index c1851194b6..26cb1c7a81 100644 --- a/assets/common/items/weapons/sword/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword/bloodsteel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.6, diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron index a211ff4a0f..bad92b37bf 100644 --- a/assets/common/items/weapons/sword/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword/bloodsteel-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 2.0, diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron index ce7faeec50..b70b0c0a1c 100644 --- a/assets/common/items/weapons/sword/bronze-0.ron +++ b/assets/common/items/weapons/sword/bronze-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with bronze.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.1, diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron index f0e22034f3..823ad56031 100644 --- a/assets/common/items/weapons/sword/bronze-1.ron +++ b/assets/common/items/weapons/sword/bronze-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with bronze.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.9, diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron index e4a635ba27..c4d2079371 100644 --- a/assets/common/items/weapons/sword/bronze-2.ron +++ b/assets/common/items/weapons/sword/bronze-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with bronze.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.0, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 96ab7947c3..3f054f7efe 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -3,7 +3,7 @@ ItemDef( description: "You sense an eldritch presence watching you.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 2.5, diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron index 327504bf51..64d55f4eac 100644 --- a/assets/common/items/weapons/sword/cobalt-0.ron +++ b/assets/common/items/weapons/sword/cobalt-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.5, diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron index ae0cd3e249..69d817cd5f 100644 --- a/assets/common/items/weapons/sword/cobalt-1.ron +++ b/assets/common/items/weapons/sword/cobalt-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.8, diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron index 2adefc27bd..e16b2260d3 100644 --- a/assets/common/items/weapons/sword/cobalt-2.ron +++ b/assets/common/items/weapons/sword/cobalt-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.6, diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron index 1857a0477d..f79cae2e5a 100644 --- a/assets/common/items/weapons/sword/cobalt-3.ron +++ b/assets/common/items/weapons/sword/cobalt-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.7, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index ed718b3950..650e11fbaa 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -3,7 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 2.0, diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron index 1c738a52bc..9f49e909f5 100644 --- a/assets/common/items/weapons/sword/frost-0.ron +++ b/assets/common/items/weapons/sword/frost-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Radiates a freezing aura.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.7, diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron index 10a0529e00..33afa57201 100644 --- a/assets/common/items/weapons/sword/frost-1.ron +++ b/assets/common/items/weapons/sword/frost-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from a single piece of eternal ice.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.5, power: 1.95, diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron index 291f63d219..c185cfe858 100644 --- a/assets/common/items/weapons/sword/iron-0.ron +++ b/assets/common/items/weapons/sword/iron-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.25, diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron index 0b61f6e87f..d4a8095c87 100644 --- a/assets/common/items/weapons/sword/iron-1.ron +++ b/assets/common/items/weapons/sword/iron-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.45, diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron index 5b94017b70..36573c8b4a 100644 --- a/assets/common/items/weapons/sword/iron-10.ron +++ b/assets/common/items/weapons/sword/iron-10.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.35, diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron index 8b58d33b3a..c2f6aa3bd5 100644 --- a/assets/common/items/weapons/sword/iron-2.ron +++ b/assets/common/items/weapons/sword/iron-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.1, diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron index 0b0e71ee44..a29f1a6265 100644 --- a/assets/common/items/weapons/sword/iron-3.ron +++ b/assets/common/items/weapons/sword/iron-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.15, diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron index f522ac5de7..8620dfe01c 100644 --- a/assets/common/items/weapons/sword/iron-4.ron +++ b/assets/common/items/weapons/sword/iron-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.3, diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron index 0cc9a8bd9d..2af8ed79a7 100644 --- a/assets/common/items/weapons/sword/iron-5.ron +++ b/assets/common/items/weapons/sword/iron-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.05, diff --git a/assets/common/items/weapons/sword/iron-6.ron b/assets/common/items/weapons/sword/iron-6.ron index 44d4393cc3..c51920a989 100644 --- a/assets/common/items/weapons/sword/iron-6.ron +++ b/assets/common/items/weapons/sword/iron-6.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.2, diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron index f8aee3d7eb..b2f049ebaf 100644 --- a/assets/common/items/weapons/sword/iron-7.ron +++ b/assets/common/items/weapons/sword/iron-7.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.4, diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron index a35a0a257e..da3b0b873a 100644 --- a/assets/common/items/weapons/sword/iron-8.ron +++ b/assets/common/items/weapons/sword/iron-8.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.0, diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron index 5d94b7cda6..2b0a0659ef 100644 --- a/assets/common/items/weapons/sword/iron-9.ron +++ b/assets/common/items/weapons/sword/iron-9.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.95, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index 8350bf0f91..992d61b4c3 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -3,7 +3,7 @@ ItemDef( description: "The blade could snap at any moment...", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.5, diff --git a/assets/common/items/weapons/sword/steel-0.ron b/assets/common/items/weapons/sword/steel-0.ron index 64b5d56a73..9c263e7730 100644 --- a/assets/common/items/weapons/sword/steel-0.ron +++ b/assets/common/items/weapons/sword/steel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.4, diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron index 58f32ee999..245d1ecdc3 100644 --- a/assets/common/items/weapons/sword/steel-1.ron +++ b/assets/common/items/weapons/sword/steel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.45, diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron index 80e6e900c9..958f4aad52 100644 --- a/assets/common/items/weapons/sword/steel-2.ron +++ b/assets/common/items/weapons/sword/steel-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.25, diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron index a8c50fa6da..aa223e7512 100644 --- a/assets/common/items/weapons/sword/steel-3.ron +++ b/assets/common/items/weapons/sword/steel-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.5, diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron index 6bd7d5917f..7b94fb6d28 100644 --- a/assets/common/items/weapons/sword/steel-4.ron +++ b/assets/common/items/weapons/sword/steel-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.55, diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron index 4f66f924f0..6d15ebcb90 100644 --- a/assets/common/items/weapons/sword/steel-5.ron +++ b/assets/common/items/weapons/sword/steel-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.2, diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron index be3d39431c..836a2894f4 100644 --- a/assets/common/items/weapons/sword/steel-6.ron +++ b/assets/common/items/weapons/sword/steel-6.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.3, diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron index 7194e1309b..2583aecf77 100644 --- a/assets/common/items/weapons/sword/steel-7.ron +++ b/assets/common/items/weapons/sword/steel-7.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.6, diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron index efcb9f3b5f..1a4372e07f 100644 --- a/assets/common/items/weapons/sword/steel-8.ron +++ b/assets/common/items/weapons/sword/steel-8.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.35, diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron index 0acac17d3d..1340a59961 100644 --- a/assets/common/items/weapons/sword/stone-0.ron +++ b/assets/common/items/weapons/sword/stone-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Covered in stone.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 1.0, diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron index 6e87324322..ae2e1cf7c4 100644 --- a/assets/common/items/weapons/sword/stone-1.ron +++ b/assets/common/items/weapons/sword/stone-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chiseled from flint.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.8, diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron index 18579de35a..9c77a9a33f 100644 --- a/assets/common/items/weapons/sword/stone-2.ron +++ b/assets/common/items/weapons/sword/stone-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chiseled from stone.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.9, diff --git a/assets/common/items/weapons/sword/wood-0.ron b/assets/common/items/weapons/sword/wood-0.ron index aadf349da3..7435d012c6 100644 --- a/assets/common/items/weapons/sword/wood-0.ron +++ b/assets/common/items/weapons/sword/wood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Grown in the shape of a sword.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.6, diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron index 7ef37d79de..15b9c9619c 100644 --- a/assets/common/items/weapons/sword/wood-1.ron +++ b/assets/common/items/weapons/sword/wood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Carved from an oak.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.3, power: 0.8, diff --git a/assets/common/items/weapons/sword/wood-2.ron b/assets/common/items/weapons/sword/wood-2.ron index 695e4b9457..917b859ab8 100644 --- a/assets/common/items/weapons/sword/wood-2.ron +++ b/assets/common/items/weapons/sword/wood-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "The resin glows.", kind: Tool(( kind: Sword, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 0.5, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron index 2cf2f1aa8c..f156f2398e 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.45, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron index 4bc30540c8..f92a7af2f2 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 2.0, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron index 9c8157654e..0b6c86ef47 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.75, diff --git a/assets/common/items/weapons/sword_1h/bronze-0.ron b/assets/common/items/weapons/sword_1h/bronze-0.ron index a46893234e..b1f3f1a196 100644 --- a/assets/common/items/weapons/sword_1h/bronze-0.ron +++ b/assets/common/items/weapons/sword_1h/bronze-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with bronze.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.65, diff --git a/assets/common/items/weapons/sword_1h/bronze-1.ron b/assets/common/items/weapons/sword_1h/bronze-1.ron index bc09df6def..85216098a3 100644 --- a/assets/common/items/weapons/sword_1h/bronze-1.ron +++ b/assets/common/items/weapons/sword_1h/bronze-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with bronze.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.75, diff --git a/assets/common/items/weapons/sword_1h/bronze-2.ron b/assets/common/items/weapons/sword_1h/bronze-2.ron index aba86de79e..1b743d95ce 100644 --- a/assets/common/items/weapons/sword_1h/bronze-2.ron +++ b/assets/common/items/weapons/sword_1h/bronze-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with bronze.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.85, diff --git a/assets/common/items/weapons/sword_1h/cobalt-0.ron b/assets/common/items/weapons/sword_1h/cobalt-0.ron index 0cdc5e7a30..650e006b86 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-0.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.3, diff --git a/assets/common/items/weapons/sword_1h/cobalt-1.ron b/assets/common/items/weapons/sword_1h/cobalt-1.ron index 1f49fa089a..60fdfdf44f 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-1.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.7, diff --git a/assets/common/items/weapons/sword_1h/cobalt-2.ron b/assets/common/items/weapons/sword_1h/cobalt-2.ron index 520a7328c0..02f74ce1ef 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-2.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.4, diff --git a/assets/common/items/weapons/sword_1h/cobalt-3.ron b/assets/common/items/weapons/sword_1h/cobalt-3.ron index 2932e500e7..a67aaa38fb 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-3.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with cobalt.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.6, diff --git a/assets/common/items/weapons/sword_1h/iron-0.ron b/assets/common/items/weapons/sword_1h/iron-0.ron index 1db773f0d8..64432d84c9 100644 --- a/assets/common/items/weapons/sword_1h/iron-0.ron +++ b/assets/common/items/weapons/sword_1h/iron-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/sword_1h/iron-1.ron b/assets/common/items/weapons/sword_1h/iron-1.ron index 7fb13fc469..d4414cabef 100644 --- a/assets/common/items/weapons/sword_1h/iron-1.ron +++ b/assets/common/items/weapons/sword_1h/iron-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.9, diff --git a/assets/common/items/weapons/sword_1h/iron-2.ron b/assets/common/items/weapons/sword_1h/iron-2.ron index bef6341caf..86411e4498 100644 --- a/assets/common/items/weapons/sword_1h/iron-2.ron +++ b/assets/common/items/weapons/sword_1h/iron-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/sword_1h/iron-3.ron b/assets/common/items/weapons/sword_1h/iron-3.ron index ab372db06c..1865ece331 100644 --- a/assets/common/items/weapons/sword_1h/iron-3.ron +++ b/assets/common/items/weapons/sword_1h/iron-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 0.8, diff --git a/assets/common/items/weapons/sword_1h/iron-4.ron b/assets/common/items/weapons/sword_1h/iron-4.ron index a4d4fe2580..1e0250c8b4 100644 --- a/assets/common/items/weapons/sword_1h/iron-4.ron +++ b/assets/common/items/weapons/sword_1h/iron-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with iron.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.1, diff --git a/assets/common/items/weapons/sword_1h/obsidian-0.ron b/assets/common/items/weapons/sword_1h/obsidian-0.ron index 23dd50a938..9934eefe87 100644 --- a/assets/common/items/weapons/sword_1h/obsidian-0.ron +++ b/assets/common/items/weapons/sword_1h/obsidian-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Embedded with obsidian.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.95, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-0.ron b/assets/common/items/weapons/sword_1h/orichalcum-0.ron index 478de886ab..b6bba37d2b 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with orichalcum.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 2.1, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-1.ron b/assets/common/items/weapons/sword_1h/orichalcum-1.ron index 9f84b2286b..8965d52d6f 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-1.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with orichalcum.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.9, diff --git a/assets/common/items/weapons/sword_1h/steel-0.ron b/assets/common/items/weapons/sword_1h/steel-0.ron index fe6496cb9f..40f4b3a643 100644 --- a/assets/common/items/weapons/sword_1h/steel-0.ron +++ b/assets/common/items/weapons/sword_1h/steel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.5, diff --git a/assets/common/items/weapons/sword_1h/steel-1.ron b/assets/common/items/weapons/sword_1h/steel-1.ron index 55cbddfd31..a180660c37 100644 --- a/assets/common/items/weapons/sword_1h/steel-1.ron +++ b/assets/common/items/weapons/sword_1h/steel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.3, diff --git a/assets/common/items/weapons/sword_1h/steel-2.ron b/assets/common/items/weapons/sword_1h/steel-2.ron index c27cd28984..07bac80bc7 100644 --- a/assets/common/items/weapons/sword_1h/steel-2.ron +++ b/assets/common/items/weapons/sword_1h/steel-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.05, diff --git a/assets/common/items/weapons/sword_1h/steel-3.ron b/assets/common/items/weapons/sword_1h/steel-3.ron index 3549207585..c629fddd14 100644 --- a/assets/common/items/weapons/sword_1h/steel-3.ron +++ b/assets/common/items/weapons/sword_1h/steel-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged with steel.", kind: Tool(( kind: Sword, - hands: One, + hands: Direct(One), stats: Direct(( equip_time_secs: 0.4, power: 1.2, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index d2825173a9..6269c25802 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -3,7 +3,7 @@ ItemDef( description: "It's beginning to fall apart.", kind: Tool(( kind: Farming, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 467ccbe468..62da27f04c 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -3,7 +3,7 @@ ItemDef( description: "Smells of fish.", kind: Tool(( kind: Farming, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index 19da48545b..d0baac6ab7 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -3,7 +3,7 @@ ItemDef( description: "It's stained with dirt.", kind: Tool(( kind: Farming, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index dc49cf9556..1fe08a0041 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -3,7 +3,7 @@ ItemDef( description: "It has a chipped edge.", kind: Tool(( kind: Farming, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index fa35b03cf0..7c61d6e1b0 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -3,7 +3,7 @@ ItemDef( description: "One of the prongs is broken.", kind: Tool(( kind: Farming, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 859ac44fa5..f4680b0ed8 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -3,7 +3,7 @@ ItemDef( description: "Held together with twine.", kind: Tool(( kind: Farming, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index e05c6efce2..96fa67e8f6 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It's covered in manure.", kind: Tool(( kind: Farming, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index b9bddbbaae..99465fb1a4 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It's been recently cleaned.", kind: Tool(( kind: Farming, - hands: Two, + hands: Direct(Two), stats: Direct(( equip_time_secs: 0.4, power: 1.0, diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 2ecf3f39b2..c4dc80d06a 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -897,8 +897,10 @@ pub trait ItemDesc { fn quality(&self) -> &Quality; fn num_slots(&self) -> u16; fn item_definition_id(&self) -> &str; - fn components(&self) -> &[Item]; fn tags(&self) -> &[ItemTag]; + fn concrete_item(&self) -> Option<&Item>; + + fn components(&self) -> &[Item] { self.concrete_item().map_or(&[], |i| i.components()) } fn tool(&self) -> Option<&Tool> { if let ItemKind::Tool(tool) = self.kind() { @@ -922,9 +924,9 @@ impl ItemDesc for Item { fn item_definition_id(&self) -> &str { &self.item_def.item_definition_id } - fn components(&self) -> &[Item] { &self.components } - fn tags(&self) -> &[ItemTag] { &self.item_def.tags } + + fn concrete_item(&self) -> Option<&Item> { Some(self) } } impl ItemDesc for ItemDef { @@ -940,9 +942,9 @@ impl ItemDesc for ItemDef { fn item_definition_id(&self) -> &str { &self.item_definition_id } - fn components(&self) -> &[Item] { &[] } - fn tags(&self) -> &[ItemTag] { &self.tags } + + fn concrete_item(&self) -> Option<&Item> { None } } impl Component for Item { @@ -972,6 +974,8 @@ impl<'a, T: ItemDesc + ?Sized> ItemDesc for &'a T { fn components(&self) -> &[Item] { (*self).components() } fn tags(&self) -> &[ItemTag] { (*self).tags() } + + fn concrete_item(&self) -> Option<&Item> { None } } /// Returns all item asset specifiers diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs index 4bce2f9038..984dffddeb 100644 --- a/common/src/comp/inventory/item/modular.rs +++ b/common/src/comp/inventory/item/modular.rs @@ -28,6 +28,7 @@ pub struct ModularComponent { pub toolkind: ToolKind, pub modkind: ModularComponentKind, pub stats: tool::Stats, + pub hand_restriction: Option, } #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -110,26 +111,13 @@ const TAG_EXAMPLES_PREFIX: &str = "common.items.tag_examples.modular"; const HANDS: [Hands; 2] = [Hands::One, Hands::Two]; -fn make_weapon_def(toolkind: ToolKind, hands: Hands) -> (String, RawItemDef) { - let identifier = format!( - "{}.{}.{}", - WEAPON_PREFIX, - toolkind.identifier_name(), - hands.identifier_name() - ); - let name = format!( - "Modular {} {}", - hands.identifier_name(), - toolkind.identifier_name() - ); - let description = format!( - "A {} {} made of components", - hands.identifier_name(), - toolkind.identifier_name() - ); +fn make_weapon_def(toolkind: ToolKind) -> (String, RawItemDef) { + let identifier = format!("{}.{}", WEAPON_PREFIX, toolkind.identifier_name()); + let name = format!("Modular {}", toolkind.identifier_name()); + let description = format!("A {} made of components", toolkind.identifier_name()); let tool = tool::Tool { kind: toolkind, - hands, + hands: tool::HandsKind::Modular, stats: tool::StatKind::Modular, }; let kind = ItemKind::Tool(tool); @@ -206,18 +194,43 @@ fn make_tagexample_def( (identifier, item) } +// Checks that modular weapons should exist for a given toolkind and hands +// combination +fn exists(tool: ToolKind, hands: Hands) -> bool { + match tool { + // Has both 1 handed and 2 handed variants + ToolKind::Sword | ToolKind::Axe | ToolKind::Hammer => true, + // Has only 2 handed variants + ToolKind::Bow | ToolKind::Staff | ToolKind::Sceptre => matches!(hands, Hands::Two), + // Modular weapons do not yet exist + ToolKind::Dagger + | ToolKind::Spear + | ToolKind::Shield + | ToolKind::Natural + | ToolKind::Debug + | ToolKind::Farming + | ToolKind::Pick + | ToolKind::Empty => false, + } +} + fn initialize_modular_assets() -> (HashMap, RawRecipeBook) { let mut itemdefs = HashMap::new(); let mut recipes = HashMap::new(); for &toolkind in &SUPPORTED_TOOLKINDS { + let (identifier, item) = make_weapon_def(toolkind); + itemdefs.insert(identifier.clone(), item); for &hands in &HANDS { - let (identifier, item) = make_weapon_def(toolkind, hands); - itemdefs.insert(identifier.clone(), item); - let recipe = make_recipe_def(identifier.clone(), toolkind, hands); - recipes.insert(identifier, recipe); - for &modkind in &MODKINDS { - let (identifier, item) = make_tagexample_def(toolkind, modkind, hands); - itemdefs.insert(identifier, item); + if exists(toolkind, hands) { + let recipe = make_recipe_def(identifier.clone(), toolkind, hands); + recipes.insert( + format!("{}.{}", identifier.clone(), hands.identifier_name()), + recipe, + ); + for &modkind in &MODKINDS { + let (identifier, item) = make_tagexample_def(toolkind, modkind, hands); + itemdefs.insert(identifier, item); + } } } } diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 48d6e51717..68df435a1f 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -77,6 +77,31 @@ impl ToolKind { } } +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum HandsKind { + Direct(Hands), + Modular, +} + +impl HandsKind { + pub fn resolve_hands(&self, components: &[Item]) -> Hands { + match self { + HandsKind::Direct(hands) => *hands, + HandsKind::Modular => { + // Checks if weapon has components that restrict hands to two. Restrictions to + // one hand or no restrictions default to one-handed weapon. + let is_two_handed = components.iter().any(|item| matches!(item.kind(), ItemKind::ModularComponent(mc) if matches!(mc.hand_restriction, Some(Hands::Two)))); + // If weapon is two handed, make it two handed + if is_two_handed { + Hands::Two + } else { + Hands::One + } + }, + } + } +} + #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum Hands { One, @@ -265,28 +290,14 @@ impl StatKind { impl From<(&MaterialStatManifest, &[Item], &Tool)> for Stats { fn from((msm, components, tool): (&MaterialStatManifest, &[Item], &Tool)) -> Self { - let raw_stats = tool.stats.resolve_stats(msm, components).clamp_speed(); - let (power, speed, poise) = match tool.hands { - Hands::One => (0.67, 1.33, 0.67), - Hands::Two => (1.5, 0.75, 1.5), - }; - Self { - equip_time_secs: raw_stats.equip_time_secs, - power: raw_stats.power * power, - effect_power: raw_stats.effect_power * poise, - speed: raw_stats.speed * speed, - crit_chance: raw_stats.crit_chance, - range: raw_stats.range, - energy_efficiency: raw_stats.energy_efficiency, - buff_strength: raw_stats.buff_strength, - } + tool.stats.resolve_stats(msm, components).clamp_speed() } } #[derive(Clone, Debug, Serialize, Deserialize)] pub struct Tool { pub kind: ToolKind, - pub hands: Hands, + pub hands: HandsKind, pub stats: StatKind, // TODO: item specific abilities } @@ -297,7 +308,7 @@ impl Tool { pub fn new(kind: ToolKind, hands: Hands, stats: Stats) -> Self { Self { kind, - hands, + hands: HandsKind::Direct(hands), stats: StatKind::Direct(stats), } } @@ -305,7 +316,7 @@ impl Tool { pub fn empty() -> Self { Self { kind: ToolKind::Empty, - hands: Hands::One, + hands: HandsKind::Direct(Hands::One), stats: StatKind::Direct(Stats { equip_time_secs: 0.0, power: 1.00, diff --git a/common/src/comp/inventory/loadout.rs b/common/src/comp/inventory/loadout.rs index 470d3fa530..9f08c73bc4 100644 --- a/common/src/comp/inventory/loadout.rs +++ b/common/src/comp/inventory/loadout.rs @@ -1,6 +1,6 @@ use crate::comp::{ inventory::{ - item::{Hands, ItemKind, Tool}, + item::{Hands, ItemKind}, slot::{ArmorSlot, EquipSlot}, InvSlot, }, @@ -172,8 +172,8 @@ impl Loadout { assert_eq!(self.swap(equip_slot_a, item_b), None); // Check if items are valid in their new positions - if !self.slot_can_hold(equip_slot_a, self.equipped(equip_slot_a).map(|x| x.kind())) - || !self.slot_can_hold(equip_slot_b, self.equipped(equip_slot_b).map(|x| x.kind())) + if !self.slot_can_hold(equip_slot_a, self.equipped(equip_slot_a)) + || !self.slot_can_hold(equip_slot_b, self.equipped(equip_slot_b)) { // If not, revert the swap let item_a = self.swap(equip_slot_a, None); @@ -187,11 +187,11 @@ impl Loadout { /// returned, or if there are no free slots then the first occupied slot /// will be returned. The bool part of the tuple indicates whether an item /// is already equipped in the slot. - pub(super) fn get_slot_to_equip_into(&self, item_kind: &ItemKind) -> Option { + pub(super) fn get_slot_to_equip_into(&self, item: &Item) -> Option { let mut suitable_slots = self .slots .iter() - .filter(|s| self.slot_can_hold(s.equip_slot, Some(item_kind))); + .filter(|s| self.slot_can_hold(s.equip_slot, Some(item))); let first = suitable_slots.next(); @@ -205,13 +205,13 @@ impl Loadout { /// Returns all items currently equipped that an item of the given ItemKind /// could replace - pub(super) fn equipped_items_of_kind( - &self, - item_kind: ItemKind, - ) -> impl Iterator { + pub(super) fn equipped_items_of_kind<'a>( + &'a self, + item: &'a Item, + ) -> impl Iterator { self.slots .iter() - .filter(move |s| self.slot_can_hold(s.equip_slot, Some(&item_kind))) + .filter(move |s| self.slot_can_hold(s.equip_slot, Some(item))) .filter_map(|s| s.slot.as_ref()) } @@ -293,7 +293,7 @@ impl Loadout { let loadout_slot = self .slots .iter() - .find(|s| s.slot.is_none() && self.slot_can_hold(s.equip_slot, Some(item.kind()))) + .find(|s| s.slot.is_none() && self.slot_can_hold(s.equip_slot, Some(&item))) .map(|s| s.equip_slot); if let Some(slot) = self .slots @@ -312,45 +312,55 @@ impl Loadout { } /// Checks that a slot can hold a given item - pub(super) fn slot_can_hold( - &self, - equip_slot: EquipSlot, - item_kind: Option<&ItemKind>, - ) -> bool { + pub(super) fn slot_can_hold(&self, equip_slot: EquipSlot, item: Option<&Item>) -> bool { // Disallow equipping incompatible weapon pairs (i.e a two-handed weapon and a // one-handed weapon) if !(match equip_slot { - EquipSlot::ActiveMainhand => Loadout::is_valid_weapon_pair( - item_kind, - self.equipped(EquipSlot::ActiveOffhand).map(|x| &x.kind), - ), - EquipSlot::ActiveOffhand => Loadout::is_valid_weapon_pair( - self.equipped(EquipSlot::ActiveMainhand).map(|x| &x.kind), - item_kind, - ), - EquipSlot::InactiveMainhand => Loadout::is_valid_weapon_pair( - item_kind, - self.equipped(EquipSlot::InactiveOffhand).map(|x| &x.kind), - ), - EquipSlot::InactiveOffhand => Loadout::is_valid_weapon_pair( - self.equipped(EquipSlot::InactiveMainhand).map(|x| &x.kind), - item_kind, - ), + EquipSlot::ActiveMainhand => { + Loadout::is_valid_weapon_pair(item, self.equipped(EquipSlot::ActiveOffhand)) + }, + EquipSlot::ActiveOffhand => { + Loadout::is_valid_weapon_pair(self.equipped(EquipSlot::ActiveMainhand), item) + }, + EquipSlot::InactiveMainhand => { + Loadout::is_valid_weapon_pair(item, self.equipped(EquipSlot::InactiveOffhand)) + }, + EquipSlot::InactiveOffhand => { + Loadout::is_valid_weapon_pair(self.equipped(EquipSlot::InactiveMainhand), item) + }, _ => true, }) { return false; } - item_kind.map_or(true, |item_kind| equip_slot.can_hold(item_kind)) + item.map_or(true, |item| equip_slot.can_hold(item)) } - #[rustfmt::skip] - fn is_valid_weapon_pair(main_hand: Option<&ItemKind>, off_hand: Option<&ItemKind>) -> bool { - matches!((main_hand, off_hand), - (Some(ItemKind::Tool(Tool { hands: Hands::One, .. })), None) | - (Some(ItemKind::Tool(Tool { hands: Hands::Two, .. })), None) | - (Some(ItemKind::Tool(Tool { hands: Hands::One, .. })), Some(ItemKind::Tool(Tool { hands: Hands::One, .. }))) | - (None, None)) + fn is_valid_weapon_pair(main_hand: Option<&Item>, off_hand: Option<&Item>) -> bool { + // Checks that a valid weapon pair is equipped, returns true if... + match ( + main_hand.map(|i| (i.kind(), i.components())), + off_hand.map(|i| (i.kind(), i.components())), + ) { + // A weapon is being equipped in the mainhand, but not in the offhand + (Some((ItemKind::Tool(_), _)), None) => true, + // A weapon is being equipped in both slots, and both weapons are 1 handed + ( + Some((ItemKind::Tool(tool_1), components_1)), + Some((ItemKind::Tool(tool_2), components_2)), + ) => { + matches!( + ( + tool_1.hands.resolve_hands(components_1), + tool_2.hands.resolve_hands(components_2) + ), + (Hands::One, Hands::One) + ) + }, + // A weapon is being unequipped that will result in both slots being empty + (None, None) => true, + _ => false, + } } pub(super) fn swap_equipped_weapons(&mut self) { @@ -358,7 +368,7 @@ impl Loadout { // nothing is equipped in slot let valid_slot = |equip_slot| { self.equipped(equip_slot) - .map_or(true, |i| self.slot_can_hold(equip_slot, Some(i.kind()))) + .map_or(true, |i| self.slot_can_hold(equip_slot, Some(i))) }; // If every weapon is currently in a valid slot, after this change they will diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 9fc4554170..e6e178380c 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -1043,10 +1043,7 @@ impl LoadoutBuilder { #[must_use = "Method consumes builder and returns updated builder."] fn with_equipment(mut self, equip_slot: EquipSlot, item: Option) -> Self { // Panic if item doesn't correspond to slot - assert!( - item.as_ref() - .map_or(true, |item| equip_slot.can_hold(&item.kind)) - ); + assert!(item.as_ref().map_or(true, |item| equip_slot.can_hold(item))); self.0.swap(equip_slot, item); self diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs index 57fa613cee..9b14da0514 100644 --- a/common/src/comp/inventory/mod.rs +++ b/common/src/comp/inventory/mod.rs @@ -9,7 +9,7 @@ use vek::Vec3; use crate::{ comp::{ inventory::{ - item::{tool::AbilityMap, ItemDef, ItemKind, MaterialStatManifest, TagExampleInfo}, + item::{tool::AbilityMap, ItemDef, MaterialStatManifest, TagExampleInfo}, loadout::Loadout, slot::{EquipSlot, Slot, SlotError}, }, @@ -540,7 +540,7 @@ impl Inventory { #[must_use = "Returned items will be lost if not used"] pub fn equip(&mut self, inv_slot: InvSlotId) -> Vec { self.get(inv_slot) - .and_then(|item| self.loadout.get_slot_to_equip_into(item.kind())) + .and_then(|item| self.loadout.get_slot_to_equip_into(item)) .map(|equip_slot| self.swap_inventory_loadout(inv_slot, equip_slot)) .unwrap_or_else(Vec::new) } @@ -551,7 +551,7 @@ impl Inventory { pub fn free_after_equip(&self, inv_slot: InvSlotId) -> i32 { let (inv_slot_for_equipped, slots_from_equipped) = self .get(inv_slot) - .and_then(|item| self.loadout.get_slot_to_equip_into(item.kind())) + .and_then(|item| self.loadout.get_slot_to_equip_into(item)) .and_then(|equip_slot| self.equipped(equip_slot)) .map_or((1, 0), |item| (0, item.slots().len())); @@ -758,7 +758,7 @@ impl Inventory { pub fn can_swap(&self, inv_slot_id: InvSlotId, equip_slot: EquipSlot) -> bool { // Check if loadout slot can hold item if !self.get(inv_slot_id).map_or(true, |item| { - self.loadout.slot_can_hold(equip_slot, Some(item.kind())) + self.loadout.slot_can_hold(equip_slot, Some(item)) }) { trace!("can_swap = false, equip slot can't hold item"); return false; @@ -775,8 +775,8 @@ impl Inventory { true } - pub fn equipped_items_of_kind(&self, item_kind: ItemKind) -> impl Iterator { - self.loadout.equipped_items_of_kind(item_kind) + pub fn equipped_items_of_kind<'a>(&'a self, item: &'a Item) -> impl Iterator { + self.loadout.equipped_items_of_kind(item) } pub fn swap_equipped_weapons(&mut self) { self.loadout.swap_equipped_weapons() } diff --git a/common/src/comp/inventory/slot.rs b/common/src/comp/inventory/slot.rs index 48f2789264..9cb408a23a 100644 --- a/common/src/comp/inventory/slot.rs +++ b/common/src/comp/inventory/slot.rs @@ -110,22 +110,28 @@ pub enum ArmorSlot { } impl Slot { - pub fn can_hold(self, item_kind: &item::ItemKind) -> bool { - match (self, item_kind) { + pub fn can_hold(self, item: &item::Item) -> bool { + match (self, item) { (Self::Inventory(_), _) => true, - (Self::Equip(slot), item_kind) => slot.can_hold(item_kind), + (Self::Equip(slot), item) => slot.can_hold(item), } } } impl EquipSlot { - pub fn can_hold(self, item_kind: &item::ItemKind) -> bool { - match (self, item_kind) { + pub fn can_hold(self, item: &item::Item) -> bool { + match (self, item.kind()) { (Self::Armor(slot), ItemKind::Armor(armor::Armor { kind, .. })) => slot.can_hold(kind), (Self::ActiveMainhand, ItemKind::Tool(_)) => true, - (Self::ActiveOffhand, ItemKind::Tool(tool)) => matches!(tool.hands, tool::Hands::One), + (Self::ActiveOffhand, ItemKind::Tool(tool)) => matches!( + tool.hands.resolve_hands(item.components()), + tool::Hands::One + ), (Self::InactiveMainhand, ItemKind::Tool(_)) => true, - (Self::InactiveOffhand, ItemKind::Tool(tool)) => matches!(tool.hands, tool::Hands::One), + (Self::InactiveOffhand, ItemKind::Tool(tool)) => matches!( + tool.hands.resolve_hands(item.components()), + tool::Hands::One + ), (Self::Lantern, ItemKind::Lantern(_)) => true, (Self::Glider, ItemKind::Glider(_)) => true, _ => false, diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 14fa4b0c9d..06834f51e6 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -5,7 +5,7 @@ use crate::{ arthropod, biped_large, biped_small, character_state::OutputEvents, inventory::slot::{EquipSlot, Slot}, - item::{Hands, ItemKind, Tool, ToolKind}, + item::{Hands, Item, ItemKind, Tool, ToolKind}, quadruped_low, quadruped_medium, quadruped_small, skills::{Skill, SwimSkill, SKILL_MODIFIERS}, theropod, Body, CharacterAbility, CharacterState, Density, InputAttr, InputKind, @@ -948,8 +948,7 @@ pub fn attempt_input( /// Checks that player can block, then attempts to block pub fn handle_block_input(data: &JoinData<'_>, update: &mut StateUpdate) { - let can_block = - |equip_slot| matches!(unwrap_tool_data(data, equip_slot), Some(tool) if tool.can_block()); + let can_block = |equip_slot| matches!(unwrap_tool_data(data, equip_slot), Some((tool, _)) if tool.can_block()); let hands = get_hands(data); if input_is_pressed(data, InputKind::Block) && (can_block(EquipSlot::ActiveMainhand) @@ -1000,13 +999,17 @@ pub fn is_strafing(data: &JoinData<'_>, update: &StateUpdate) -> bool { (update.character.is_aimed() || update.should_strafe) && data.body.can_strafe() } -pub fn unwrap_tool_data<'a>(data: &'a JoinData, equip_slot: EquipSlot) -> Option<&'a Tool> { - if let Some(ItemKind::Tool(tool)) = data +// Returns tool and components +pub fn unwrap_tool_data<'a>( + data: &'a JoinData, + equip_slot: EquipSlot, +) -> Option<(&'a Tool, &'a [Item])> { + if let Some((ItemKind::Tool(tool), components)) = data .inventory .and_then(|inv| inv.equipped(equip_slot)) - .map(|i| i.kind()) + .map(|i| (i.kind(), i.components())) { - Some(tool) + Some((tool, components)) } else { None } @@ -1014,12 +1017,12 @@ pub fn unwrap_tool_data<'a>(data: &'a JoinData, equip_slot: EquipSlot) -> Option pub fn get_hands(data: &JoinData<'_>) -> (Option, Option) { let hand = |slot| { - if let Some(ItemKind::Tool(tool)) = data + if let Some((ItemKind::Tool(tool), components)) = data .inventory .and_then(|inv| inv.equipped(slot)) - .map(|i| i.kind()) + .map(|i| (i.kind(), i.components())) { - Some(tool.hands) + Some(tool.hands.resolve_hands(components)) } else { None } @@ -1176,8 +1179,8 @@ impl AbilityInfo { unwrap_tool_data(data, EquipSlot::ActiveMainhand) }; let (tool, hand) = ( - tool_data.map(|t| t.kind), - tool_data.map(|t| HandInfo::from_main_tool(t, from_offhand)), + tool_data.map(|(t, _)| t.kind), + tool_data.map(|(t, components)| HandInfo::from_main_tool(t, components, from_offhand)), ); Self { @@ -1197,8 +1200,8 @@ pub enum HandInfo { } impl HandInfo { - pub fn from_main_tool(tool: &Tool, from_offhand: bool) -> Self { - match tool.hands { + pub fn from_main_tool(tool: &Tool, components: &[Item], from_offhand: bool) -> Self { + match tool.hands.resolve_hands(components) { Hands::Two => Self::TwoHanded, Hands::One => { if from_offhand { diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 78325df3a8..c3c77e1c4e 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -70,13 +70,13 @@ pub fn price_desc( } } -pub fn kind_text<'a>(kind: &ItemKind, i18n: &'a Localization) -> Cow<'a, str> { - match kind { +pub fn kind_text<'a>(item: &dyn ItemDesc, i18n: &'a Localization) -> Cow<'a, str> { + match item.kind() { ItemKind::Armor(armor) => Cow::Borrowed(armor_kind(armor, i18n)), ItemKind::Tool(tool) => Cow::Owned(format!( "{} ({})", tool_kind(tool, i18n), - tool_hands(tool, i18n) + tool_hands(tool, item.components(), i18n) )), ItemKind::ModularComponent(_mc) => Cow::Borrowed(i18n.get("common.bag.shoulders")), ItemKind::Glider(_glider) => Cow::Borrowed(i18n.get("common.kind.glider")), @@ -274,8 +274,8 @@ fn tool_kind<'a>(tool: &Tool, i18n: &'a Localization) -> &'a str { } /// Output the number of hands needed to hold a tool -pub fn tool_hands<'a>(tool: &Tool, i18n: &'a Localization) -> &'a str { - let hands = match tool.hands { +pub fn tool_hands<'a>(tool: &Tool, components: &[Item], i18n: &'a Localization) -> &'a str { + let hands = match tool.hands.resolve_hands(components) { Hands::One => i18n.get("common.hands.one"), Hands::Two => i18n.get("common.hands.two"), }; diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 028447fbb1..6fa8496048 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -874,7 +874,11 @@ impl FigureMgr { .and_then(|i| i.equipped(equip_slot)) .map(|i| { if let ItemKind::Tool(tool) = i.kind() { - (Some(tool.kind), Some(tool.hands), i.ability_spec()) + ( + Some(tool.kind), + Some(tool.hands.resolve_hands(i.components())), + i.ability_spec(), + ) } else { (None, None, None) } diff --git a/voxygen/src/scene/simple.rs b/voxygen/src/scene/simple.rs index e8989ac394..b939e21e88 100644 --- a/voxygen/src/scene/simple.rs +++ b/voxygen/src/scene/simple.rs @@ -279,27 +279,24 @@ impl Scene { self.figure_model_cache .clean(&mut self.col_lights, scene_data.tick); - let active_item_kind = inventory - .and_then(|inv| inv.equipped(EquipSlot::ActiveMainhand)) - .map(|i| i.kind()); + let item_info = |equip_slot| { + inventory + .and_then(|inv| inv.equipped(equip_slot)) + .and_then(|i| { + if let ItemKind::Tool(tool) = i.kind() { + Some(( + Some(tool.kind), + Some(tool.hands.resolve_hands(i.components())), + )) + } else { + None + } + }) + .unwrap_or((None, None)) + }; - let (active_tool_kind, active_tool_hand) = - if let Some(ItemKind::Tool(tool)) = active_item_kind { - (Some(tool.kind), Some(tool.hands)) - } else { - (None, None) - }; - - let second_item_kind = inventory - .and_then(|inv| inv.equipped(EquipSlot::ActiveOffhand)) - .map(|i| i.kind()); - - let (second_tool_kind, second_tool_hand) = - if let Some(ItemKind::Tool(tool)) = second_item_kind { - (Some(tool.kind), Some(tool.hands)) - } else { - (None, None) - }; + let (active_tool_kind, active_tool_hand) = item_info(EquipSlot::ActiveMainhand); + let (second_tool_kind, second_tool_hand) = item_info(EquipSlot::ActiveOffhand); let hands = (active_tool_hand, second_tool_hand); diff --git a/voxygen/src/ui/widgets/item_tooltip.rs b/voxygen/src/ui/widgets/item_tooltip.rs index 26a9ea8fcf..84f6fcc12a 100644 --- a/voxygen/src/ui/widgets/item_tooltip.rs +++ b/voxygen/src/ui/widgets/item_tooltip.rs @@ -462,14 +462,15 @@ impl<'a> Widget for ItemTooltip<'a> { let quality = get_quality_col(item); - let first_equipped = inventory - .equipped_items_of_kind(item.kind().clone()) - .next() - .cloned(); + let equip_slot = item + .concrete_item() + .map(|item| inventory.equipped_items_of_kind(item)) + .into_iter() + .flatten(); let (title, desc) = (item.name().to_string(), item.description().to_string()); - let item_kind = util::kind_text(item.kind(), i18n).to_string(); + let item_kind = util::kind_text(item, i18n).to_string(); let material_tag = item.tags().iter().find_map(|t| match t { ItemTag::Material(material) => Some(material),