diff --git a/assets/common/items/crafting_ing/modular/damage/axe/axe.ron b/assets/common/items/crafting_ing/modular/damage/axe/axe.ron index af04d5d7fe..fb0f07a907 100644 --- a/assets/common/items/crafting_ing/modular/damage/axe/axe.ron +++ b/assets/common/items/crafting_ing/modular/damage/axe/axe.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Axe", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Axe, modkind: Damage, hands: One)), - ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/axe/battleaxe.ron b/assets/common/items/crafting_ing/modular/damage/axe/battleaxe.ron index da06681997..31de2b757e 100644 --- a/assets/common/items/crafting_ing/modular/damage/axe/battleaxe.ron +++ b/assets/common/items/crafting_ing/modular/damage/axe/battleaxe.ron @@ -18,8 +18,5 @@ ItemDef( weapon_name: "Battleaxe", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Axe, modkind: Damage, hands: One)), - ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/axe/greataxe.ron b/assets/common/items/crafting_ing/modular/damage/axe/greataxe.ron index 2d298c2cad..641a2c9ee1 100644 --- a/assets/common/items/crafting_ing/modular/damage/axe/greataxe.ron +++ b/assets/common/items/crafting_ing/modular/damage/axe/greataxe.ron @@ -18,7 +18,5 @@ ItemDef( weapon_name: "Greataxe", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/axe/jagged.ron b/assets/common/items/crafting_ing/modular/damage/axe/jagged.ron index a3dec233b9..b7ad1f1cf1 100644 --- a/assets/common/items/crafting_ing/modular/damage/axe/jagged.ron +++ b/assets/common/items/crafting_ing/modular/damage/axe/jagged.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Jagged Axe", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Axe, modkind: Damage, hands: One)), - ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/axe/labrys.ron b/assets/common/items/crafting_ing/modular/damage/axe/labrys.ron index db42109bdb..770772ba19 100644 --- a/assets/common/items/crafting_ing/modular/damage/axe/labrys.ron +++ b/assets/common/items/crafting_ing/modular/damage/axe/labrys.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Great Mace", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron b/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron index e1eba9e46b..7e4099feef 100644 --- a/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron +++ b/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron @@ -18,8 +18,5 @@ ItemDef( weapon_name: "Ornate Axe", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Axe, modkind: Damage, hands: One)), - ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron b/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron index d79383f4db..14bf11cac9 100644 --- a/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron +++ b/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron @@ -18,7 +18,5 @@ ItemDef( weapon_name: "Poleaxe", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/bow/bow.ron b/assets/common/items/crafting_ing/modular/damage/bow/bow.ron index 863dc9b7a2..076b757499 100644 --- a/assets/common/items/crafting_ing/modular/damage/bow/bow.ron +++ b/assets/common/items/crafting_ing/modular/damage/bow/bow.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Bow", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/bow/composite.ron b/assets/common/items/crafting_ing/modular/damage/bow/composite.ron index 603848d296..b12a308ecf 100644 --- a/assets/common/items/crafting_ing/modular/damage/bow/composite.ron +++ b/assets/common/items/crafting_ing/modular/damage/bow/composite.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Composite Bow", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/bow/greatbow.ron b/assets/common/items/crafting_ing/modular/damage/bow/greatbow.ron index 89348044f6..b0e85060a9 100644 --- a/assets/common/items/crafting_ing/modular/damage/bow/greatbow.ron +++ b/assets/common/items/crafting_ing/modular/damage/bow/greatbow.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Greatbow", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/bow/longbow.ron b/assets/common/items/crafting_ing/modular/damage/bow/longbow.ron index b9613def99..8276cb5432 100644 --- a/assets/common/items/crafting_ing/modular/damage/bow/longbow.ron +++ b/assets/common/items/crafting_ing/modular/damage/bow/longbow.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Longbow", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/bow/ornate.ron b/assets/common/items/crafting_ing/modular/damage/bow/ornate.ron index a9cca999c2..63000eb62c 100644 --- a/assets/common/items/crafting_ing/modular/damage/bow/ornate.ron +++ b/assets/common/items/crafting_ing/modular/damage/bow/ornate.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Ornate Bow", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/bow/shortbow.ron b/assets/common/items/crafting_ing/modular/damage/bow/shortbow.ron index b138b35f38..615270e096 100644 --- a/assets/common/items/crafting_ing/modular/damage/bow/shortbow.ron +++ b/assets/common/items/crafting_ing/modular/damage/bow/shortbow.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Shortbow", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/bow/warbow.ron b/assets/common/items/crafting_ing/modular/damage/bow/warbow.ron index e7e023c6a6..b8315f3a24 100644 --- a/assets/common/items/crafting_ing/modular/damage/bow/warbow.ron +++ b/assets/common/items/crafting_ing/modular/damage/bow/warbow.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Warbow", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/greathammer.ron b/assets/common/items/crafting_ing/modular/damage/hammer/greathammer.ron index 925eb67613..79fa378748 100644 --- a/assets/common/items/crafting_ing/modular/damage/hammer/greathammer.ron +++ b/assets/common/items/crafting_ing/modular/damage/hammer/greathammer.ron @@ -18,7 +18,5 @@ ItemDef( weapon_name: "Greathammer", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/greatmace.ron b/assets/common/items/crafting_ing/modular/damage/hammer/greatmace.ron index db42109bdb..770772ba19 100644 --- a/assets/common/items/crafting_ing/modular/damage/hammer/greatmace.ron +++ b/assets/common/items/crafting_ing/modular/damage/hammer/greatmace.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Great Mace", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/hammer.ron b/assets/common/items/crafting_ing/modular/damage/hammer/hammer.ron index 4feee64b57..90bb6c4791 100644 --- a/assets/common/items/crafting_ing/modular/damage/hammer/hammer.ron +++ b/assets/common/items/crafting_ing/modular/damage/hammer/hammer.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Hammer", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Hammer, modkind: Damage, hands: One)), - ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron b/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron index f93aac13bf..97c9e57e4c 100644 --- a/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron +++ b/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron @@ -18,7 +18,5 @@ ItemDef( weapon_name: "Maul", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron b/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron index 19326c58d2..5a4b004061 100644 --- a/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron +++ b/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron @@ -18,8 +18,5 @@ ItemDef( weapon_name: "Ornate Hammer", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Hammer, modkind: Damage, hands: One)), - ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/spikedmace.ron b/assets/common/items/crafting_ing/modular/damage/hammer/spikedmace.ron index f657e6f522..60a268c62c 100644 --- a/assets/common/items/crafting_ing/modular/damage/hammer/spikedmace.ron +++ b/assets/common/items/crafting_ing/modular/damage/hammer/spikedmace.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Spiked Mace", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Hammer, modkind: Damage, hands: One)), - ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/warhammer.ron b/assets/common/items/crafting_ing/modular/damage/hammer/warhammer.ron index a9aed5169e..034f034408 100644 --- a/assets/common/items/crafting_ing/modular/damage/hammer/warhammer.ron +++ b/assets/common/items/crafting_ing/modular/damage/hammer/warhammer.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Warhammer", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Hammer, modkind: Damage, hands: One)), - ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sceptre/large.ron b/assets/common/items/crafting_ing/modular/damage/sceptre/large.ron index 4031e28b7a..d79494498b 100644 --- a/assets/common/items/crafting_ing/modular/damage/sceptre/large.ron +++ b/assets/common/items/crafting_ing/modular/damage/sceptre/large.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sceptre/medium.ron b/assets/common/items/crafting_ing/modular/damage/sceptre/medium.ron index 75bfc5e0de..83bb3a2679 100644 --- a/assets/common/items/crafting_ing/modular/damage/sceptre/medium.ron +++ b/assets/common/items/crafting_ing/modular/damage/sceptre/medium.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sceptre/small.ron b/assets/common/items/crafting_ing/modular/damage/sceptre/small.ron index 0587029211..81cb05bc28 100644 --- a/assets/common/items/crafting_ing/modular/damage/sceptre/small.ron +++ b/assets/common/items/crafting_ing/modular/damage/sceptre/small.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/staff/large.ron b/assets/common/items/crafting_ing/modular/damage/staff/large.ron index c6098d52b9..6ab3efb5b3 100644 --- a/assets/common/items/crafting_ing/modular/damage/staff/large.ron +++ b/assets/common/items/crafting_ing/modular/damage/staff/large.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/staff/medium.ron b/assets/common/items/crafting_ing/modular/damage/staff/medium.ron index 0a5a060002..08afa8b8fd 100644 --- a/assets/common/items/crafting_ing/modular/damage/staff/medium.ron +++ b/assets/common/items/crafting_ing/modular/damage/staff/medium.ron @@ -18,7 +18,5 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/staff/small.ron b/assets/common/items/crafting_ing/modular/damage/staff/small.ron index 53fabdffe3..5b36a20063 100644 --- a/assets/common/items/crafting_ing/modular/damage/staff/small.ron +++ b/assets/common/items/crafting_ing/modular/damage/staff/small.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sword/greatsword.ron b/assets/common/items/crafting_ing/modular/damage/sword/greatsword.ron index 58e371618f..9db37c9584 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/greatsword.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/greatsword.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Greatsword", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sword/katana.ron b/assets/common/items/crafting_ing/modular/damage/sword/katana.ron index 5788ec96c4..62f350f083 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/katana.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/katana.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Katana", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sword, modkind: Damage, hands: One)), - ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sword/longsword.ron b/assets/common/items/crafting_ing/modular/damage/sword/longsword.ron index c68a4794fb..01aeeeb1dc 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/longsword.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/longsword.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Longsword", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sword, modkind: Damage, hands: One)), - ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron b/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron index bd7cdd7ff4..f14f120fe5 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Ornate Sword", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sword, modkind: Damage, hands: One)), - ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sword/sabre.ron b/assets/common/items/crafting_ing/modular/damage/sword/sabre.ron index fec85d8736..3121c868a1 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/sabre.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/sabre.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Sabre", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sword, modkind: Damage, hands: One)), - ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sword/sawblade.ron b/assets/common/items/crafting_ing/modular/damage/sword/sawblade.ron index afc1c10f72..c5430ccb12 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/sawblade.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/sawblade.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "Sawblade", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sword, modkind: Damage, hands: One)), - ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron b/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron index 740bf89e7d..eaadec3068 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Zweihander", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/axe/long.ron b/assets/common/items/crafting_ing/modular/held/axe/long.ron index 56e9f74129..c82f55930c 100644 --- a/assets/common/items/crafting_ing/modular/held/axe/long.ron +++ b/assets/common/items/crafting_ing/modular/held/axe/long.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Axe, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/axe/medium.ron b/assets/common/items/crafting_ing/modular/held/axe/medium.ron index 6f88982e3b..90a7f6df50 100644 --- a/assets/common/items/crafting_ing/modular/held/axe/medium.ron +++ b/assets/common/items/crafting_ing/modular/held/axe/medium.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Axe, modkind: Held, hands: One)), - ModularComponent((toolkind: Axe, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/axe/short.ron b/assets/common/items/crafting_ing/modular/held/axe/short.ron index c64ce94b85..dc9790e1c2 100644 --- a/assets/common/items/crafting_ing/modular/held/axe/short.ron +++ b/assets/common/items/crafting_ing/modular/held/axe/short.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Axe, modkind: Held, hands: One)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/bow/large.ron b/assets/common/items/crafting_ing/modular/held/bow/large.ron index 9e401f385f..ff98857d25 100644 --- a/assets/common/items/crafting_ing/modular/held/bow/large.ron +++ b/assets/common/items/crafting_ing/modular/held/bow/large.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Bow, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/bow/medium.ron b/assets/common/items/crafting_ing/modular/held/bow/medium.ron index f33906ab5c..1c1f1bbccb 100644 --- a/assets/common/items/crafting_ing/modular/held/bow/medium.ron +++ b/assets/common/items/crafting_ing/modular/held/bow/medium.ron @@ -18,7 +18,5 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Bow, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/bow/small.ron b/assets/common/items/crafting_ing/modular/held/bow/small.ron index dc4f90c4a3..b50d4b518f 100644 --- a/assets/common/items/crafting_ing/modular/held/bow/small.ron +++ b/assets/common/items/crafting_ing/modular/held/bow/small.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Bow, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/hammer/long.ron b/assets/common/items/crafting_ing/modular/held/hammer/long.ron index 2ea659b5ff..e665edd59f 100644 --- a/assets/common/items/crafting_ing/modular/held/hammer/long.ron +++ b/assets/common/items/crafting_ing/modular/held/hammer/long.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Hammer, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/hammer/medium.ron b/assets/common/items/crafting_ing/modular/held/hammer/medium.ron index 204b25ab01..749f167f0d 100644 --- a/assets/common/items/crafting_ing/modular/held/hammer/medium.ron +++ b/assets/common/items/crafting_ing/modular/held/hammer/medium.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Hammer, modkind: Held, hands: One)), - ModularComponent((toolkind: Hammer, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/hammer/short.ron b/assets/common/items/crafting_ing/modular/held/hammer/short.ron index 186c1345d0..3e1907264c 100644 --- a/assets/common/items/crafting_ing/modular/held/hammer/short.ron +++ b/assets/common/items/crafting_ing/modular/held/hammer/short.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Hammer, modkind: Held, hands: One)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron b/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron index d045e4eed3..e4ea61e036 100644 --- a/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron +++ b/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Arbor", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/cane.ron b/assets/common/items/crafting_ing/modular/held/sceptre/cane.ron index ba702cdc53..1d3b7978b5 100644 --- a/assets/common/items/crafting_ing/modular/held/sceptre/cane.ron +++ b/assets/common/items/crafting_ing/modular/held/sceptre/cane.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Cane", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/crook.ron b/assets/common/items/crafting_ing/modular/held/sceptre/crook.ron index 40e1edfefa..1c824a3257 100644 --- a/assets/common/items/crafting_ing/modular/held/sceptre/crook.ron +++ b/assets/common/items/crafting_ing/modular/held/sceptre/crook.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Crook", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron b/assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron index 5a2d9d269a..42fc4d9298 100644 --- a/assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron +++ b/assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Crozier", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron b/assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron index 8a169546cb..6f004bf7e5 100644 --- a/assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron +++ b/assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Grandsceptre", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron b/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron index 53432085d7..794b2166c7 100644 --- a/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron +++ b/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Ornate Sceptre", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron b/assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron index 35d0657e68..9f44562ad7 100644 --- a/assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron +++ b/assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Sceptre", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/staff/brand.ron b/assets/common/items/crafting_ing/modular/held/staff/brand.ron index deedfebb91..a6c3c9519a 100644 --- a/assets/common/items/crafting_ing/modular/held/staff/brand.ron +++ b/assets/common/items/crafting_ing/modular/held/staff/brand.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Brand", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Staff, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/staff/grandstaff.ron b/assets/common/items/crafting_ing/modular/held/staff/grandstaff.ron index ccdd67027d..812220b0bf 100644 --- a/assets/common/items/crafting_ing/modular/held/staff/grandstaff.ron +++ b/assets/common/items/crafting_ing/modular/held/staff/grandstaff.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Grandstaff", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Staff, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/staff/longpole.ron b/assets/common/items/crafting_ing/modular/held/staff/longpole.ron index 8180e5ffdb..f3bc9c9ea8 100644 --- a/assets/common/items/crafting_ing/modular/held/staff/longpole.ron +++ b/assets/common/items/crafting_ing/modular/held/staff/longpole.ron @@ -18,7 +18,5 @@ ItemDef( weapon_name: "Long Pole", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Staff, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/staff/ornate.ron b/assets/common/items/crafting_ing/modular/held/staff/ornate.ron index 598143ca6b..7ba01b43eb 100644 --- a/assets/common/items/crafting_ing/modular/held/staff/ornate.ron +++ b/assets/common/items/crafting_ing/modular/held/staff/ornate.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Ornate Staff", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Staff, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/staff/pole.ron b/assets/common/items/crafting_ing/modular/held/staff/pole.ron index 2517442cfd..1c969853b2 100644 --- a/assets/common/items/crafting_ing/modular/held/staff/pole.ron +++ b/assets/common/items/crafting_ing/modular/held/staff/pole.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Pole", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Staff, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/staff/rod.ron b/assets/common/items/crafting_ing/modular/held/staff/rod.ron index 0be6cc6a06..6fd97202ce 100644 --- a/assets/common/items/crafting_ing/modular/held/staff/rod.ron +++ b/assets/common/items/crafting_ing/modular/held/staff/rod.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Rod", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Staff, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/staff/staff.ron b/assets/common/items/crafting_ing/modular/held/staff/staff.ron index 2dab9010cd..02703b9e64 100644 --- a/assets/common/items/crafting_ing/modular/held/staff/staff.ron +++ b/assets/common/items/crafting_ing/modular/held/staff/staff.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "Staff", )), quality: Modular, - tags: [ - ModularComponent((toolkind: Staff, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sword/hand-and-half.ron b/assets/common/items/crafting_ing/modular/held/sword/hand-and-half.ron index e016c191f9..e6e45ff797 100644 --- a/assets/common/items/crafting_ing/modular/held/sword/hand-and-half.ron +++ b/assets/common/items/crafting_ing/modular/held/sword/hand-and-half.ron @@ -18,9 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Sword, modkind: Held, hands: One)), - ModularComponent((toolkind: Sword, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sword/one-handed.ron b/assets/common/items/crafting_ing/modular/held/sword/one-handed.ron index 344f1fba50..ba3729ce67 100644 --- a/assets/common/items/crafting_ing/modular/held/sword/one-handed.ron +++ b/assets/common/items/crafting_ing/modular/held/sword/one-handed.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Sword, modkind: Held, hands: One)), - ], + tags: [], ) diff --git a/assets/common/items/crafting_ing/modular/held/sword/two-handed.ron b/assets/common/items/crafting_ing/modular/held/sword/two-handed.ron index f0a80f252e..adbbc7e216 100644 --- a/assets/common/items/crafting_ing/modular/held/sword/two-handed.ron +++ b/assets/common/items/crafting_ing/modular/held/sword/two-handed.ron @@ -18,8 +18,6 @@ ItemDef( weapon_name: "", )), quality: Direct(Common), - tags: [ - ModularComponent((toolkind: Sword, modkind: Held, hands: Two)), - ], + tags: [], ) diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 1e09f0c8bb..8e0d88fce6 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -4,7 +4,7 @@ pub mod modular; pub mod tool; // Reexports -pub use modular::{ModularComponent, ModularComponentKind, ModularComponentTag}; +pub use modular::{ModularComponent, ModularComponentKind}; pub use tool::{AbilitySet, AbilitySpec, Hands, MaterialStatManifest, Tool, ToolKind}; use crate::{ @@ -227,7 +227,6 @@ pub enum ItemTag { Leather, Material(Material), MaterialKind(MaterialKind), - ModularComponent(ModularComponentTag), Cultist, Potion, Food, @@ -242,7 +241,6 @@ impl TagExampleInfo for ItemTag { fn name(&self) -> Cow<'static, str> { match self { ItemTag::Material(material) => material.name(), - ItemTag::ModularComponent(kind) => kind.name(), ItemTag::MaterialKind(material_kind) => Cow::Borrowed(material_kind.into()), ItemTag::Leather => Cow::Borrowed("leather"), ItemTag::Cultist => Cow::Borrowed("cultist"), @@ -260,7 +258,6 @@ impl TagExampleInfo for ItemTag { fn exemplar_identifier(&self) -> Cow<'static, str> { match self { ItemTag::Material(_) => Cow::Borrowed("common.items.tag_examples.placeholder"), - ItemTag::ModularComponent(tag) => tag.exemplar_identifier(), ItemTag::MaterialKind(_) => Cow::Borrowed("common.items.tag_examples.placeholder"), ItemTag::Leather => Cow::Borrowed("common.items.tag_examples.leather"), ItemTag::Cultist => Cow::Borrowed("common.items.tag_examples.cultist"), diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs index 8168946118..ce03cd279a 100644 --- a/common/src/comp/inventory/item/modular.rs +++ b/common/src/comp/inventory/item/modular.rs @@ -1,12 +1,8 @@ use super::{ tool::{self, Hands}, - Item, ItemDesc, ItemKind, ItemName, ItemTag, RawItemDef, TagExampleInfo, ToolKind, -}; -use crate::{ - assets::AssetExt, - lottery::Lottery, - recipe::{self, RawRecipe, RawRecipeBook, RawRecipeInput}, + Item, ItemDesc, ItemKind, ItemName, RawItemDef, ToolKind, }; +use crate::{assets::AssetExt, lottery::Lottery, recipe}; use hashbrown::HashMap; use lazy_static::lazy_static; use serde::{Deserialize, Serialize}; @@ -32,7 +28,7 @@ impl ModularComponentKind { match tool { ToolKind::Sword | ToolKind::Axe | ToolKind::Hammer | ToolKind::Bow => Self::Damage, ToolKind::Staff | ToolKind::Sceptre => Self::Held, - _ => unreachable!(), + _ => unimplemented!(), } } } @@ -46,70 +42,6 @@ pub struct ModularComponent { pub weapon_name: String, } -#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] -pub struct ModularComponentTag { - toolkind: ToolKind, - modkind: ModularComponentKind, - hands: Hands, -} - -impl TagExampleInfo for ModularComponentTag { - fn name(&self) -> Cow<'static, str> { - Cow::Owned(format!( - "{} {}", - self.hands.identifier_name().to_owned(), - match self.modkind { - ModularComponentKind::Damage => match self.toolkind { - ToolKind::Sword => "sword blade", - ToolKind::Axe => "axe head", - ToolKind::Hammer => "hammer head", - ToolKind::Bow => "bow limbs", - ToolKind::Dagger => "dagger blade", - ToolKind::Staff => "fire staff core", - ToolKind::Sceptre => "nature sceptre core", - // TODO: naming - ToolKind::Spear => "spear damage component", - ToolKind::Blowgun => "blowgun damage component", - ToolKind::Shield => "shield damage component", - ToolKind::Debug => "debug damage component", - ToolKind::Farming => "farming damage component", - ToolKind::Pick => "pickaxe head", - ToolKind::Natural => "natural damage component", - ToolKind::Empty => "empty damage component", - }, - ModularComponentKind::Held => match self.toolkind { - ToolKind::Sword => "sword hilt", - ToolKind::Axe => "axe shaft", - ToolKind::Hammer => "hammer shaft", - ToolKind::Bow => "bow grip", - ToolKind::Dagger => "dagger hilt", - ToolKind::Staff => "fire staff grip", - ToolKind::Sceptre => "nature sceptre grip", - // TODO: naming - ToolKind::Spear => "spear held component", - ToolKind::Blowgun => "blowgun held component", - ToolKind::Shield => "shield held component", - ToolKind::Natural => "natural held component", - ToolKind::Debug => "debug held component", - ToolKind::Farming => "farming held component", - ToolKind::Pick => "pickaxe handle", - ToolKind::Empty => "empty held component", - }, - } - )) - } - - fn exemplar_identifier(&self) -> Cow<'static, str> { - Cow::Owned(format!( - "{}.{}.{}.{}", - TAG_EXAMPLES_PREFIX, - self.modkind.identifier_name(), - self.toolkind.identifier_name(), - self.hands.identifier_name() - )) - } -} - const SUPPORTED_TOOLKINDS: [ToolKind; 6] = [ ToolKind::Sword, ToolKind::Axe, @@ -118,13 +50,8 @@ const SUPPORTED_TOOLKINDS: [ToolKind; 6] = [ ToolKind::Staff, ToolKind::Sceptre, ]; -const MODKINDS: [ModularComponentKind; 2] = - [ModularComponentKind::Damage, ModularComponentKind::Held]; const WEAPON_PREFIX: &str = "common.items.weapons.modular"; -const TAG_EXAMPLES_PREFIX: &str = "common.items.tag_examples.modular"; - -const HANDS: [Hands; 2] = [Hands::One, Hands::Two]; fn make_weapon_def(toolkind: ToolKind) -> (String, RawItemDef) { let identifier = format!("{}.{}", WEAPON_PREFIX, toolkind.identifier_name()); @@ -147,123 +74,24 @@ fn make_weapon_def(toolkind: ToolKind) -> (String, RawItemDef) { (identifier, item) } -fn make_recipe_def(identifier: String, toolkind: ToolKind, hands: Hands) -> RawRecipe { - let output = (identifier, 1); - let mut inputs = Vec::new(); - for &modkind in &MODKINDS { - let input = RawRecipeInput::Tag(ItemTag::ModularComponent(ModularComponentTag { - toolkind, - modkind, - hands, - })); - inputs.push((input, 1, true)); - } - RawRecipe { - output, - inputs, - craft_sprite: None, - } -} - -fn make_tagexample_def( - toolkind: ToolKind, - modkind: ModularComponentKind, - hands: Hands, -) -> (String, RawItemDef) { - let identifier = format!( - "{}.{}.{}.{}", - TAG_EXAMPLES_PREFIX, - modkind.identifier_name(), - toolkind.identifier_name(), - hands.identifier_name(), - ); - let tag = ModularComponentTag { - toolkind, - modkind, - hands, - }; - // TODO: i18n - let name = ItemName::Direct(format!("Any {}", tag.name())); - let kind = ItemKind::TagExamples { - // TODO: Iterate over components - item_ids: Vec::new(), - }; - - let item = RawItemDef { - name, - description: "".to_string(), - kind, - quality: super::QualityKind::Modular, - tags: vec![ItemTag::ModularComponent(tag)], - slots: 0, - ability_spec: None, - }; - (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::Blowgun - | ToolKind::Shield - | ToolKind::Natural - | ToolKind::Debug - | ToolKind::Farming - | ToolKind::Pick - | ToolKind::Empty => false, - } -} - -fn initialize_modular_assets() -> (HashMap, RawRecipeBook) { +fn initialize_modular_assets() -> HashMap { 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 { - 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); - } - } - } } - (itemdefs, RawRecipeBook(recipes)) + itemdefs } lazy_static! { - static ref ITEM_DEFS_AND_RECIPES: (HashMap, RawRecipeBook) = - initialize_modular_assets(); -} - -pub(crate) fn append_modular_recipes(recipes: &mut RawRecipeBook) { - for (name, recipe) in ITEM_DEFS_AND_RECIPES.1.0.iter() { - // avoid clobbering recipes from the filesystem, to allow overrides - if !recipes.0.contains_key(name) { - recipes.0.insert(name.clone(), recipe.clone()); - } - } + static ref ITEM_DEFS: HashMap = initialize_modular_assets(); } /// Synthesize modular assets programmatically, to allow for the following: /// - Allow the modular tag_examples to auto-update with the list of applicable /// components pub(super) fn synthesize_modular_asset(specifier: &str) -> Option { - let ret = ITEM_DEFS_AND_RECIPES.0.get(specifier).cloned(); + let ret = ITEM_DEFS.get(specifier).cloned(); tracing::trace!("synthesize_modular_asset({:?}) -> {:?}", specifier, ret); ret } diff --git a/common/src/recipe.rs b/common/src/recipe.rs index db986c3bd4..e5605bbf23 100644 --- a/common/src/recipe.rs +++ b/common/src/recipe.rs @@ -342,14 +342,7 @@ impl assets::Compound for RecipeBook { Ok((def, *amount, *is_mod_comp)) } - let mut raw = cache.load::(specifier)?.cloned(); - - // Avoid showing purple-question-box recipes until the assets are added - // (the `if false` is needed because commenting out the call will add a warning - // that there are no other uses of append_modular_recipes) - // if false { - modular::append_modular_recipes(&mut raw); - // } + let raw = cache.load::(specifier)?.cloned(); let recipes = raw .0