From bbfcde5e59b87d733f4ab15a7631782637365209 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 17 Feb 2021 13:43:17 -0500 Subject: [PATCH] Re-deleted duplicate weapons that somehow reappeared. --- .../items/npc_weapons/axe/malachite_axe-0.ron | 17 ----------------- .../items/npc_weapons/axe/starter_axe.ron | 17 ----------------- .../items/npc_weapons/bow/horn_longbow-0.ron | 17 ----------------- .../items/npc_weapons/dagger/starter_dagger.ron | 17 ----------------- assets/common/items/npc_weapons/empty/empty.ron | 17 ----------------- .../npc_weapons/hammer/cultist_purp_2h-0.ron | 17 ----------------- .../items/npc_weapons/hammer/starter_hammer.ron | 17 ----------------- .../items/npc_weapons/shield/shield_1.ron | 17 ----------------- .../items/npc_weapons/staff/bone_staff.ron | 17 ----------------- .../items/npc_weapons/staff/cultist_staff.ron | 17 ----------------- .../npc_weapons/sword/cultist_purp_2h-0.ron | 17 ----------------- .../sword/cultist_purp_2h_boss-0.ron | 17 ----------------- .../items/npc_weapons/sword/starter_sword.ron | 17 ----------------- .../npc_weapons/sword/zweihander_sword_0.ron | 17 ----------------- assets/common/items/npc_weapons/tool/broom.ron | 17 ----------------- .../items/npc_weapons/tool/fishing_rod.ron | 17 ----------------- assets/common/items/npc_weapons/tool/hoe.ron | 17 ----------------- .../common/items/npc_weapons/tool/pickaxe.ron | 17 ----------------- .../common/items/npc_weapons/tool/pitchfork.ron | 17 ----------------- assets/common/items/npc_weapons/tool/rake.ron | 17 ----------------- .../common/items/npc_weapons/tool/shovel-0.ron | 17 ----------------- .../common/items/npc_weapons/tool/shovel-1.ron | 17 ----------------- 22 files changed, 374 deletions(-) delete mode 100644 assets/common/items/npc_weapons/axe/malachite_axe-0.ron delete mode 100644 assets/common/items/npc_weapons/axe/starter_axe.ron delete mode 100644 assets/common/items/npc_weapons/bow/horn_longbow-0.ron delete mode 100644 assets/common/items/npc_weapons/dagger/starter_dagger.ron delete mode 100644 assets/common/items/npc_weapons/empty/empty.ron delete mode 100644 assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron delete mode 100644 assets/common/items/npc_weapons/hammer/starter_hammer.ron delete mode 100644 assets/common/items/npc_weapons/shield/shield_1.ron delete mode 100644 assets/common/items/npc_weapons/staff/bone_staff.ron delete mode 100644 assets/common/items/npc_weapons/staff/cultist_staff.ron delete mode 100644 assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron delete mode 100644 assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron delete mode 100644 assets/common/items/npc_weapons/sword/starter_sword.ron delete mode 100644 assets/common/items/npc_weapons/sword/zweihander_sword_0.ron delete mode 100644 assets/common/items/npc_weapons/tool/broom.ron delete mode 100644 assets/common/items/npc_weapons/tool/fishing_rod.ron delete mode 100644 assets/common/items/npc_weapons/tool/hoe.ron delete mode 100644 assets/common/items/npc_weapons/tool/pickaxe.ron delete mode 100644 assets/common/items/npc_weapons/tool/pitchfork.ron delete mode 100644 assets/common/items/npc_weapons/tool/rake.ron delete mode 100644 assets/common/items/npc_weapons/tool/shovel-0.ron delete mode 100644 assets/common/items/npc_weapons/tool/shovel-1.ron diff --git a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron deleted file mode 100644 index 5ff8652556..0000000000 --- a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Malachite Axe", - description: "An axe infused with malachite.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.50, - poise_strength: 0.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/axe/starter_axe.ron b/assets/common/items/npc_weapons/axe/starter_axe.ron deleted file mode 100644 index 38913830e8..0000000000 --- a/assets/common/items/npc_weapons/axe/starter_axe.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Notched Axe", - description: "Every dent tells the story of a chopped tree.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.50, - poise_strength: 0.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron deleted file mode 100644 index 486340c34b..0000000000 --- a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Horn Bow", - description: "You don't recognize the creature these horns belong to.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 0.5, - poise_strength: 0.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/dagger/starter_dagger.ron b/assets/common/items/npc_weapons/dagger/starter_dagger.ron deleted file mode 100644 index 24ff9b1c59..0000000000 --- a/assets/common/items/npc_weapons/dagger/starter_dagger.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Rusty Dagger", - description: "Easily concealed.", - kind: Tool( - ( - kind: Dagger, - stats: ( - equip_time_millis: 300, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/empty/empty.ron b/assets/common/items/npc_weapons/empty/empty.ron deleted file mode 100644 index d3176bda5a..0000000000 --- a/assets/common/items/npc_weapons/empty/empty.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Empty", - description: "You expected a description?", - kind: Tool ( - ( - kind: Empty, - stats: ( - equip_time_millis: 200, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron deleted file mode 100644 index 9a0ad62c6c..0000000000 --- a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Magical Cultist Warhammer", - description: "This belonged to an evil Cult Leader.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.5, - poise_strength: 0.5, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/hammer/starter_hammer.ron b/assets/common/items/npc_weapons/hammer/starter_hammer.ron deleted file mode 100644 index 26fc3cea1a..0000000000 --- a/assets/common/items/npc_weapons/hammer/starter_hammer.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Sturdy Old Hammer", - description: "'Property of...' The rest is missing.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.50, - poise_strength: 0.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/shield/shield_1.ron b/assets/common/items/npc_weapons/shield/shield_1.ron deleted file mode 100644 index 01b4fc4e79..0000000000 --- a/assets/common/items/npc_weapons/shield/shield_1.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "A Tattered Targe", - description: "Should withstand a few more hits, hopefully...", - kind: Tool ( - ( - kind: Shield, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/staff/bone_staff.ron b/assets/common/items/npc_weapons/staff/bone_staff.ron deleted file mode 100644 index c2c4f9fec3..0000000000 --- a/assets/common/items/npc_weapons/staff/bone_staff.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Bone Staff", - description: "There's a red gem suspended in the bones.", - kind: Tool( - ( - kind: Staff, - stats: ( - equip_time_millis: 300, - power: 0.8, - poise_strength: 0.8, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/staff/cultist_staff.ron b/assets/common/items/npc_weapons/staff/cultist_staff.ron deleted file mode 100644 index 9c900aaa83..0000000000 --- a/assets/common/items/npc_weapons/staff/cultist_staff.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Cultist Staff", - description: "The fire gives off no heat.", - kind: Tool( - ( - kind: Staff, - stats: ( - equip_time_millis: 300, - power: 0.8, - poise_strength: 0.8, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron deleted file mode 100644 index 02ccff2d57..0000000000 --- a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Magical Cultist Greatsword", - description: "This belonged to an evil Cult Leader.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.5, - poise_strength: 0.5, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron deleted file mode 100644 index bc5072d977..0000000000 --- a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Magical Cultist Greatsword", - description: "This belonged to an evil Cult Leader.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.0, - poise_strength: 1.0, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/sword/starter_sword.ron b/assets/common/items/npc_weapons/sword/starter_sword.ron deleted file mode 100644 index 178eef5752..0000000000 --- a/assets/common/items/npc_weapons/sword/starter_sword.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Battered Sword", - description: "Held together by Rust and hope.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 300, - power: 0.50, - poise_strength: 0.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron deleted file mode 100644 index 197537c5b3..0000000000 --- a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Sturdy Zweihander", - description: "It's a big sword, and sharp too.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.75, - poise_strength: 0.75, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/tool/broom.ron b/assets/common/items/npc_weapons/tool/broom.ron deleted file mode 100644 index 706e4ac95f..0000000000 --- a/assets/common/items/npc_weapons/tool/broom.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Broom", - description: "It's beginning to fall apart.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.5, - poise_strength: 1.5, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/tool/fishing_rod.ron b/assets/common/items/npc_weapons/tool/fishing_rod.ron deleted file mode 100644 index ee4f2cca74..0000000000 --- a/assets/common/items/npc_weapons/tool/fishing_rod.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Fishing Rod", - description: "Smells of fish.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.5, - poise_strength: 1.5, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/tool/hoe.ron b/assets/common/items/npc_weapons/tool/hoe.ron deleted file mode 100644 index d81f904d3b..0000000000 --- a/assets/common/items/npc_weapons/tool/hoe.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Hoe", - description: "It's stained with dirt.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.50, - poise_strength: 1.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/tool/pickaxe.ron b/assets/common/items/npc_weapons/tool/pickaxe.ron deleted file mode 100644 index 6421a7bc87..0000000000 --- a/assets/common/items/npc_weapons/tool/pickaxe.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Pickaxe", - description: "It has a chipped edge.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.50, - poise_strength: 1.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/tool/pitchfork.ron b/assets/common/items/npc_weapons/tool/pitchfork.ron deleted file mode 100644 index 4b88ac3058..0000000000 --- a/assets/common/items/npc_weapons/tool/pitchfork.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Pitchfork", - description: "One of the prongs is broken.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.50, - poise_strength: 1.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/tool/rake.ron b/assets/common/items/npc_weapons/tool/rake.ron deleted file mode 100644 index 1b660c9eb2..0000000000 --- a/assets/common/items/npc_weapons/tool/rake.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Rake", - description: "Held together with twine.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.50, - poise_strength: 1.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/tool/shovel-0.ron b/assets/common/items/npc_weapons/tool/shovel-0.ron deleted file mode 100644 index 00104a97ff..0000000000 --- a/assets/common/items/npc_weapons/tool/shovel-0.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Shovel", - description: "It's covered in manure.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.50, - poise_strength: 1.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -) diff --git a/assets/common/items/npc_weapons/tool/shovel-1.ron b/assets/common/items/npc_weapons/tool/shovel-1.ron deleted file mode 100644 index c6cce260d1..0000000000 --- a/assets/common/items/npc_weapons/tool/shovel-1.ron +++ /dev/null @@ -1,17 +0,0 @@ -ItemDef( - name: "Shovel", - description: "It's been recently cleaned.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.50, - poise_strength: 1.50, - speed: 1.0 - ), - ) - ), - quality: Low, - tags: [], -)