diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron new file mode 100644 index 0000000000..428ca6b41c --- /dev/null +++ b/assets/common/items/weapons/sword/bloodsteel-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bloodsteel Flamberge", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.8, + poise_strength: 0.4, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron new file mode 100644 index 0000000000..dd939deac9 --- /dev/null +++ b/assets/common/items/weapons/sword/bloodsteel-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Fierce Katana", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.6, + poise_strength: 0.4, + speed: 1.2, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron new file mode 100644 index 0000000000..b99e7bea1d --- /dev/null +++ b/assets/common/items/weapons/sword/bloodsteel-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sharktooth", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 2.0, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron new file mode 100644 index 0000000000..62cf323676 --- /dev/null +++ b/assets/common/items/weapons/sword/bronze-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Brass Beast", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.1, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron new file mode 100644 index 0000000000..33ff213600 --- /dev/null +++ b/assets/common/items/weapons/sword/bronze-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bronze Longsword", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.9, + poise_strength: 0.4, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron new file mode 100644 index 0000000000..fef68bd678 --- /dev/null +++ b/assets/common/items/weapons/sword/bronze-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Jagged Longblade", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.0, + poise_strength: 0.4, + speed: 1.0, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron new file mode 100644 index 0000000000..39c8b13bb2 --- /dev/null +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Caladborg", + description: "You sense an eldritch presence watching you.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 2.5, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron new file mode 100644 index 0000000000..d09631b9f3 --- /dev/null +++ b/assets/common/items/weapons/sword/cobalt-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Claymore", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.5, + poise_strength: 0.4, + speed: 1.1, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron new file mode 100644 index 0000000000..e5806380a5 --- /dev/null +++ b/assets/common/items/weapons/sword/cobalt-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Greatsword", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.8, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron new file mode 100644 index 0000000000..e4847fa2cc --- /dev/null +++ b/assets/common/items/weapons/sword/cobalt-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Longsword", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.6, + poise_strength: 0.4, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron new file mode 100644 index 0000000000..bd836c2f85 --- /dev/null +++ b/assets/common/items/weapons/sword/cobalt-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Towerblade", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.7, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/weapons/sword/cultist.ron similarity index 100% rename from assets/common/items/weapons/sword/cultist_purp_2h-0.ron rename to assets/common/items/weapons/sword/cultist.ron diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron b/assets/common/items/weapons/sword/frost-0.ron similarity index 100% rename from assets/common/items/weapons/sword/frost_cleaver_2h-0.ron rename to assets/common/items/weapons/sword/frost-0.ron diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron b/assets/common/items/weapons/sword/frost-1.ron similarity index 100% rename from assets/common/items/weapons/sword/frost_cleaver_2h-1.ron rename to assets/common/items/weapons/sword/frost-1.ron diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron deleted file mode 100644 index cec3a97ad6..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Greatsword", - description: "The blade has been chipped quite a few times.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.8, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron deleted file mode 100644 index 47f454b417..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Greatsword", - description: "The blade has been chipped quite a few times.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.8, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron deleted file mode 100644 index a4b00f52eb..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Greatsword", - description: "The blade has been chipped quite a few times.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.8, - poise_strength: 0.9, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron deleted file mode 100644 index 0bf3dea87b..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Greatsword", - description: "It\'s been polished and sharpened recently.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.4, - poise_strength: 1.6, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron deleted file mode 100644 index beb4200568..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Greatsword", - description: "It\'s been polished and sharpened recently.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.4, - poise_strength: 1.7, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron deleted file mode 100644 index 70ee016351..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Greatsword", - description: "The sword\'s almost a work of art.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.7, - poise_strength: 1.4, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron deleted file mode 100644 index 70ee016351..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Greatsword", - description: "The sword\'s almost a work of art.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.7, - poise_strength: 1.4, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron deleted file mode 100644 index a150fbe41c..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Greatsword", - description: "The sword\'s almost a work of art.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.7, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron deleted file mode 100644 index a2d14a9373..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Greatsword", - description: "It\'s been well used.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.1, - poise_strength: 1.5, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron deleted file mode 100644 index a2d14a9373..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Greatsword", - description: "It\'s been well used.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.1, - poise_strength: 1.5, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron deleted file mode 100644 index dc1b9c8d92..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Greatsword", - description: "It\'s been well used.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.1, - poise_strength: 1.4, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron new file mode 100644 index 0000000000..e7a856c3a6 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Buccaneer's Blade", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.25, + poise_strength: 0.4, + speed: 0.95, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron new file mode 100644 index 0000000000..5ded191f68 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Embedded Greatsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.45, + poise_strength: 0.4, + speed: 0.75, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron new file mode 100644 index 0000000000..4ac727086d --- /dev/null +++ b/assets/common/items/weapons/sword/iron-10.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Warlord's Blade", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.35, + poise_strength: 0.4, + speed: 0.85, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron new file mode 100644 index 0000000000..418dee3cb5 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Claymore", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.1, + poise_strength: 0.4, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron new file mode 100644 index 0000000000..2514580b95 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Flamberge", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.15, + poise_strength: 0.4, + speed: 1.05, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron new file mode 100644 index 0000000000..3ece8d76a1 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Greatsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.3, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron new file mode 100644 index 0000000000..1c4e6c48c5 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-5.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Longsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.05, + poise_strength: 0.4, + speed: 1.15, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-2.ron b/assets/common/items/weapons/sword/iron-6.ron similarity index 54% rename from assets/common/items/weapons/sword/long_2h_fine-2.ron rename to assets/common/items/weapons/sword/iron-6.ron index 87e666fa4e..22bac342b5 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/iron-6.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", + name: "Iron Zweihander", + description: "Forged with iron.", kind: Tool(( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_millis: 300, power: 1.2, - poise_strength: 1.3, + poise_strength: 0.4, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron new file mode 100644 index 0000000000..8fa2ad1022 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-7.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Noble Greatsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.4, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron new file mode 100644 index 0000000000..0f88d130dc --- /dev/null +++ b/assets/common/items/weapons/sword/iron-8.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Royal Longsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.0, + poise_strength: 0.4, + speed: 1.2, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron new file mode 100644 index 0000000000..2bb8b84033 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-9.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Swift Katana", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.95, + poise_strength: 0.4, + speed: 1.25, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-0.ron b/assets/common/items/weapons/sword/long_2h_dam-0.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-2.ron b/assets/common/items/weapons/sword/long_2h_dam-2.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-3.ron b/assets/common/items/weapons/sword/long_2h_dam-3.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-3.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-4.ron b/assets/common/items/weapons/sword/long_2h_dam-4.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-4.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-5.ron b/assets/common/items/weapons/sword/long_2h_dam-5.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-5.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-0.ron b/assets/common/items/weapons/sword/long_2h_fine-0.ron deleted file mode 100644 index 87e666fa4e..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.3, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-1.ron b/assets/common/items/weapons/sword/long_2h_fine-1.ron deleted file mode 100644 index 87e666fa4e..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.3, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-3.ron b/assets/common/items/weapons/sword/long_2h_fine-3.ron deleted file mode 100644 index ee077f7f7f..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-3.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-4.ron b/assets/common/items/weapons/sword/long_2h_fine-4.ron deleted file mode 100644 index 87e666fa4e..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-4.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.3, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-5.ron b/assets/common/items/weapons/sword/long_2h_fine-5.ron deleted file mode 100644 index d2a110603f..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-5.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.4, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-0.ron b/assets/common/items/weapons/sword/long_2h_orn-0.ron deleted file mode 100644 index 7e29776c36..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.0, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-1.ron b/assets/common/items/weapons/sword/long_2h_orn-1.ron deleted file mode 100644 index 2504d7cc97..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-2.ron b/assets/common/items/weapons/sword/long_2h_orn-2.ron deleted file mode 100644 index 7e29776c36..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.0, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-3.ron b/assets/common/items/weapons/sword/long_2h_orn-3.ron deleted file mode 100644 index 7e29776c36..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-3.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.0, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-4.ron b/assets/common/items/weapons/sword/long_2h_orn-4.ron deleted file mode 100644 index 2504d7cc97..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-4.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-5.ron b/assets/common/items/weapons/sword/long_2h_orn-5.ron deleted file mode 100644 index 2504d7cc97..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-5.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-0.ron b/assets/common/items/weapons/sword/long_2h_simple-0.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-1.ron b/assets/common/items/weapons/sword/long_2h_simple-1.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-2.ron b/assets/common/items/weapons/sword/long_2h_simple-2.ron deleted file mode 100644 index 85dc373e74..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 1.0, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-3.ron b/assets/common/items/weapons/sword/long_2h_simple-3.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-3.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-4.ron b/assets/common/items/weapons/sword/long_2h_simple-4.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-4.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-5.ron b/assets/common/items/weapons/sword/long_2h_simple-5.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-5.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron deleted file mode 100644 index 2e63e32189..0000000000 --- a/assets/common/items/weapons/sword/short_sword_0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Vicious Gladius", - description: "There\'s blood encrusted on the blade.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 400, - power: 0.75, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/starter_sword.ron b/assets/common/items/weapons/sword/starter.ron similarity index 74% rename from assets/common/items/weapons/sword/starter_sword.ron rename to assets/common/items/weapons/sword/starter.ron index 53f1048edc..aebc6711c7 100644 --- a/assets/common/items/weapons/sword/starter_sword.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Battered Sword", - description: "Held together by Rust and hope.", + name: "Damaged Greatsword", + description: "The blade could snap at any moment...", kind: Tool(( kind: Sword, hands: Two, diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron b/assets/common/items/weapons/sword/steel-0.ron similarity index 54% rename from assets/common/items/weapons/sword/greatsword_2h_fine-1.ron rename to assets/common/items/weapons/sword/steel-0.ron index 560fde56e6..9916779b2e 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/steel-0.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Fine Greatsword", - description: "It\'s been polished and sharpened recently.", + name: "Butterfly Sword", + description: "Forged with steel.", kind: Tool(( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_millis: 300, power: 1.4, - poise_strength: 1.5, + poise_strength: 0.4, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron new file mode 100644 index 0000000000..d5900b53e9 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Nomad's Longblade", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.45, + poise_strength: 0.4, + speed: 0.95, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron new file mode 100644 index 0000000000..45b4c63880 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Ornamental Longsword", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.25, + poise_strength: 0.4, + speed: 1.15, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron new file mode 100644 index 0000000000..0e831d6528 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Seven-Branched Sword", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.5, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron new file mode 100644 index 0000000000..a790d74d81 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Greatsword", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.55, + poise_strength: 0.4, + speed: 0.85, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron new file mode 100644 index 0000000000..b1124aecfe --- /dev/null +++ b/assets/common/items/weapons/sword/steel-5.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Katana", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.2, + poise_strength: 0.4, + speed: 1.2, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron new file mode 100644 index 0000000000..c47ebf7fc1 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-6.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Longsword", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.3, + poise_strength: 0.4, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron new file mode 100644 index 0000000000..69f6d04cef --- /dev/null +++ b/assets/common/items/weapons/sword/steel-7.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Towerblade", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.6, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron new file mode 100644 index 0000000000..5e6b1f0c3d --- /dev/null +++ b/assets/common/items/weapons/sword/steel-8.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Zweihander", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.35, + poise_strength: 0.4, + speed: 1.05, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron new file mode 100644 index 0000000000..882f171508 --- /dev/null +++ b/assets/common/items/weapons/sword/stone-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Ancient Greatsword", + description: "Covered in stone.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.0, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron new file mode 100644 index 0000000000..34a451e84b --- /dev/null +++ b/assets/common/items/weapons/sword/stone-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Flint Sword", + description: "Chiseled from flint.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.8, + poise_strength: 0.4, + speed: 1.0, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron new file mode 100644 index 0000000000..439590f4c0 --- /dev/null +++ b/assets/common/items/weapons/sword/stone-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Ritual Greatsword", + description: "Chiseled from stone.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.9, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-1.ron b/assets/common/items/weapons/sword/wood-0.ron similarity index 56% rename from assets/common/items/weapons/sword/long_2h_dam-1.ron rename to assets/common/items/weapons/sword/wood-0.ron index 178263d311..25b3896332 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/wood-0.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", + name: "Bladed Branch", + description: "Grown in the shape of a sword.", kind: Tool(( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_millis: 300, power: 0.6, - poise_strength: 0.5, + poise_strength: 0.4, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron new file mode 100644 index 0000000000..8a575e4de7 --- /dev/null +++ b/assets/common/items/weapons/sword/wood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Oaken Greatsword", + description: "Carved from an oak.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.8, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood-2.ron similarity index 78% rename from assets/common/items/weapons/sword/wood_sword.ron rename to assets/common/items/weapons/sword/wood-2.ron index f94591932e..d8b33e4728 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood-2.ron @@ -6,11 +6,11 @@ ItemDef( hands: Two, stats: Direct(( equip_time_millis: 400, - power: 0.8, + power: 0.5, poise_strength: 0.5, - speed: 1.0, + speed: 1.1, )), )), - quality: Moderate, + quality: Low, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/zweihander_sword_0.ron b/assets/common/items/weapons/sword/zweihander_sword_0.ron deleted file mode 100644 index c15a257ef4..0000000000 --- a/assets/common/items/weapons/sword/zweihander_sword_0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Sturdy Zweihander", - description: "It\'s a big sword, and sharp too.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.9, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index bb5f5a7043..fa0b8a83c0 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -9,18 +9,23 @@ (0.05, "common.items.glider.glider_moth"), (0.05, "common.items.armor.ring.ring_gold_0"), // swords - (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"), - (0.08, "common.items.weapons.sword.long_2h_orn-0"), - (0.08, "common.items.weapons.sword.long_2h_orn-1"), - (0.08, "common.items.weapons.sword.long_2h_orn-2"), - (0.08, "common.items.weapons.sword.long_2h_orn-3"), - (0.08, "common.items.weapons.sword.long_2h_orn-4"), - (0.08, "common.items.weapons.sword.long_2h_orn-5"), - (0.20, "common.items.weapons.sword.zweihander_sword_0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"), + (0.03, "common.items.weapons.sword.steel-0"), + (0.03, "common.items.weapons.sword.steel-1"), + (0.03, "common.items.weapons.sword.steel-2"), + (0.03, "common.items.weapons.sword.steel-3"), + (0.03, "common.items.weapons.sword.steel-4"), + (0.03, "common.items.weapons.sword.steel-5"), + (0.03, "common.items.weapons.sword.steel-6"), + (0.03, "common.items.weapons.sword.steel-7"), + (0.03, "common.items.weapons.sword.steel-8"), + (0.02, "common.items.weapons.sword.cobalt-0"), + (0.02, "common.items.weapons.sword.cobalt-1"), + (0.02, "common.items.weapons.sword.cobalt-2"), + (0.02, "common.items.weapons.sword.cobalt-3"), + (0.01, "common.items.weapons.sword.bloodsteel-0"), + (0.01, "common.items.weapons.sword.bloodsteel-1"), + (0.01, "common.items.weapons.sword.bloodsteel-2"), + (0.001, "common.items.weapons.sword.caladbolg"), // axes (0.02, "common.items.weapons.axe.bloodsteel_axe-0"), (0.02, "common.items.weapons.axe.bloodsteel_axe-1"), diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index 49308df576..522067b488 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -69,18 +69,16 @@ (0.001, "common.items.armor.back.backpack_0"), (0.1, "common.items.armor.bag.heavy_seabag"), // Common Weapons - // swords - (0.4, "common.items.weapons.sword.wood_sword"), - (0.3, "common.items.weapons.sword.long_2h_dam-0"), - (0.3, "common.items.weapons.sword.long_2h_dam-1"), - (0.3, "common.items.weapons.sword.long_2h_dam-2"), - (0.3, "common.items.weapons.sword.long_2h_dam-3"), - (0.3, "common.items.weapons.sword.long_2h_dam-4"), - (0.3, "common.items.weapons.sword.long_2h_dam-5"), - (0.25, "common.items.weapons.sword.short_sword_0"), - (0.1, "common.items.weapons.sword.greatsword_2h_dam-0"), - (0.1, "common.items.weapons.sword.greatsword_2h_dam-1"), - (0.1, "common.items.weapons.sword.greatsword_2h_dam-2"), + // swords + (0.10, "common.items.weapons.sword.wood-0"), + (0.10, "common.items.weapons.sword.wood-1"), + (0.10, "common.items.weapons.sword.wood-2"), + (0.10, "common.items.weapons.sword.stone-0"), + (0.10, "common.items.weapons.sword.stone-1"), + (0.10, "common.items.weapons.sword.stone-2"), + (0.15, "common.items.weapons.sword.bronze-0"), + (0.15, "common.items.weapons.sword.bronze-1"), + (0.15, "common.items.weapons.sword.bronze-2"), // axes (0.20, "common.items.weapons.axe.orc_axe-0"), (0.10, "common.items.weapons.axe.worn_iron_axe-0"), @@ -106,24 +104,26 @@ (0.25, "common.items.weapons.bow.wood_shortbow-1"), // Uncommon Weapons // swords - (0.05, "common.items.weapons.sword.long_2h_simple-0"), - (0.05, "common.items.weapons.sword.long_2h_simple-1"), - (0.05, "common.items.weapons.sword.long_2h_simple-2"), - (0.05, "common.items.weapons.sword.long_2h_simple-3"), - (0.05, "common.items.weapons.sword.long_2h_simple-4"), - (0.05, "common.items.weapons.sword.long_2h_simple-5"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-2"), - (0.06, "common.items.weapons.sword.long_2h_fine-0"), - (0.06, "common.items.weapons.sword.long_2h_fine-1"), - (0.06, "common.items.weapons.sword.long_2h_fine-2"), - (0.06, "common.items.weapons.sword.long_2h_fine-3"), - (0.06, "common.items.weapons.sword.long_2h_fine-4"), - (0.06, "common.items.weapons.sword.long_2h_fine-5"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-0"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"), + (0.04, "common.items.weapons.sword.iron-0"), + (0.04, "common.items.weapons.sword.iron-1"), + (0.04, "common.items.weapons.sword.iron-2"), + (0.04, "common.items.weapons.sword.iron-3"), + (0.04, "common.items.weapons.sword.iron-4"), + (0.04, "common.items.weapons.sword.iron-5"), + (0.04, "common.items.weapons.sword.iron-6"), + (0.04, "common.items.weapons.sword.iron-7"), + (0.04, "common.items.weapons.sword.iron-8"), + (0.04, "common.items.weapons.sword.iron-9"), + (0.04, "common.items.weapons.sword.iron-10"), + (0.03, "common.items.weapons.sword.steel-0"), + (0.03, "common.items.weapons.sword.steel-1"), + (0.03, "common.items.weapons.sword.steel-2"), + (0.03, "common.items.weapons.sword.steel-3"), + (0.03, "common.items.weapons.sword.steel-4"), + (0.03, "common.items.weapons.sword.steel-5"), + (0.03, "common.items.weapons.sword.steel-6"), + (0.03, "common.items.weapons.sword.steel-7"), + (0.03, "common.items.weapons.sword.steel-8"), // axes (0.15, "common.items.weapons.axe.bronze_axe-0"), (0.15, "common.items.weapons.axe.bronze_axe-1"), @@ -173,21 +173,18 @@ (0.20, "common.items.weapons.bow.leafy_longbow-0"), // Rare Weapons // swords - (0.08, "common.items.weapons.sword.long_2h_orn-0"), - (0.08, "common.items.weapons.sword.long_2h_orn-1"), - (0.08, "common.items.weapons.sword.long_2h_orn-2"), - (0.08, "common.items.weapons.sword.long_2h_orn-3"), - (0.08, "common.items.weapons.sword.long_2h_orn-4"), - (0.08, "common.items.weapons.sword.long_2h_orn-5"), - (0.20, "common.items.weapons.sword.zweihander_sword_0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"), + (0.20, "common.items.weapons.sword.cobalt-0"), + (0.20, "common.items.weapons.sword.cobalt-1"), + (0.20, "common.items.weapons.sword.cobalt-2"), + (0.20, "common.items.weapons.sword.cobalt-3"), + (0.10, "common.items.weapons.sword.bloodsteel-0"), + (0.10, "common.items.weapons.sword.bloodsteel-1"), + (0.10, "common.items.weapons.sword.bloodsteel-2"), + (0.001, "common.items.weapons.sword.caladbolg"), // axes (0.20, "common.items.weapons.axe.bloodsteel_axe-0"), (0.20, "common.items.weapons.axe.bloodsteel_axe-1"), (0.20, "common.items.weapons.axe.bloodsteel_axe-2"), - (0.30, "common.items.weapons.axe.cobalt_axe-0"), (0.10, "common.items.weapons.axe.malachite_axe-0"), // healing staff (0.25, "common.items.weapons.sceptre.staff_nature"), diff --git a/assets/common/loot_tables/loot_table_humanoids.ron b/assets/common/loot_tables/loot_table_humanoids.ron index 7d626d1423..bf98129ae0 100644 --- a/assets/common/loot_tables/loot_table_humanoids.ron +++ b/assets/common/loot_tables/loot_table_humanoids.ron @@ -15,7 +15,9 @@ (0.10, "common.items.food.apple_stick"), (0.10, "common.items.food.mushroom_stick"), // Weapons - (0.15, "common.items.weapons.sword.wood_sword"), + (0.10, "common.items.weapons.sword.wood-0"), + (0.10, "common.items.weapons.sword.wood-1"), + (0.10, "common.items.weapons.sword.wood-2"), (0.10, "common.items.weapons.axe.worn_iron_axe-0"), (0.10, "common.items.weapons.axe.worn_iron_axe-1"), (0.10, "common.items.weapons.axe.worn_iron_axe-2"), diff --git a/assets/common/loot_tables/loot_table_mindflayer.ron b/assets/common/loot_tables/loot_table_mindflayer.ron index ae58752df7..1f8469c089 100644 --- a/assets/common/loot_tables/loot_table_mindflayer.ron +++ b/assets/common/loot_tables/loot_table_mindflayer.ron @@ -10,7 +10,7 @@ // weapons (1, "common.items.weapons.staff.cultist_staff"), (1, "common.items.weapons.hammer.cultist_purp_2h-0"), - (1, "common.items.weapons.sword.cultist_purp_2h-0"), + (1, "common.items.weapons.sword.cultist"), (0.25, "common.items.crafting_ing.mindflayer_bag_damaged"), (0.01, "common.items.weapons.sceptre.root_evil"), // misc diff --git a/assets/common/loot_tables/loot_table_miniboss.ron b/assets/common/loot_tables/loot_table_miniboss.ron index e44409bf28..763756cba4 100644 --- a/assets/common/loot_tables/loot_table_miniboss.ron +++ b/assets/common/loot_tables/loot_table_miniboss.ron @@ -11,7 +11,7 @@ // weapons (1, "common.items.weapons.staff.cultist_staff"), (1, "common.items.weapons.hammer.cultist_purp_2h-0"), - (1, "common.items.weapons.sword.cultist_purp_2h-0"), + (1, "common.items.weapons.sword.cultist"), // misc (0.25, "common.items.boss_drops.lantern"), ] diff --git a/assets/common/loot_tables/loot_table_villager.ron b/assets/common/loot_tables/loot_table_villager.ron index 44258d60e1..158b8eed81 100644 --- a/assets/common/loot_tables/loot_table_villager.ron +++ b/assets/common/loot_tables/loot_table_villager.ron @@ -29,7 +29,9 @@ (0.10, "common.items.food.apple_stick"), (0.10, "common.items.food.mushroom_stick"), // Weapons - (0.15, "common.items.weapons.sword.wood_sword"), + (0.15, "common.items.weapons.sword.wood-0"), + (0.15, "common.items.weapons.sword.wood-1"), + (0.15, "common.items.weapons.sword.wood-2"), (0.10, "common.items.weapons.axe.worn_iron_axe-0"), (0.10, "common.items.weapons.axe.worn_iron_axe-1"), (0.10, "common.items.weapons.axe.worn_iron_axe-2"), diff --git a/assets/common/loot_tables/loot_table_weapon_common.ron b/assets/common/loot_tables/loot_table_weapon_common.ron index 5d320157ac..84e2fdc0d3 100644 --- a/assets/common/loot_tables/loot_table_weapon_common.ron +++ b/assets/common/loot_tables/loot_table_weapon_common.ron @@ -1,17 +1,12 @@ [ // swords - (0.15, "common.items.weapons.sword.starter_sword"), - (0.15, "common.items.weapons.sword.wood_sword"), - (0.07, "common.items.weapons.sword.long_2h_dam-0"), - (0.07, "common.items.weapons.sword.long_2h_dam-1"), - (0.07, "common.items.weapons.sword.long_2h_dam-2"), - (0.07, "common.items.weapons.sword.long_2h_dam-3"), - (0.07, "common.items.weapons.sword.long_2h_dam-4"), - (0.07, "common.items.weapons.sword.long_2h_dam-5"), - (0.10, "common.items.weapons.sword.short_sword_0"), - (0.06, "common.items.weapons.sword.greatsword_2h_dam-0"), - (0.06, "common.items.weapons.sword.greatsword_2h_dam-1"), - (0.06, "common.items.weapons.sword.greatsword_2h_dam-2"), + (0.15, "common.items.weapons.sword.starter"), + (0.10, "common.items.weapons.sword.wood-0"), + (0.10, "common.items.weapons.sword.wood-1"), + (0.10, "common.items.weapons.sword.wood-2"), + (0.05, "common.items.weapons.sword.stone-0"), + (0.05, "common.items.weapons.sword.stone-1"), + (0.05, "common.items.weapons.sword.stone-2"), // axes (0.30, "common.items.weapons.axe.starter_axe"), (0.20, "common.items.weapons.axe.orc_axe-0"), diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index 8a8cb6715c..df0c9c4b9e 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/assets/common/loot_tables/loot_table_weapon_rare.ron @@ -1,15 +1,13 @@ [ // swords - (0.08, "common.items.weapons.sword.long_2h_orn-0"), - (0.08, "common.items.weapons.sword.long_2h_orn-1"), - (0.08, "common.items.weapons.sword.long_2h_orn-2"), - (0.08, "common.items.weapons.sword.long_2h_orn-3"), - (0.08, "common.items.weapons.sword.long_2h_orn-4"), - (0.08, "common.items.weapons.sword.long_2h_orn-5"), - (0.20, "common.items.weapons.sword.zweihander_sword_0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"), + (0.20, "common.items.weapons.sword.cobalt-0"), + (0.20, "common.items.weapons.sword.cobalt-1"), + (0.20, "common.items.weapons.sword.cobalt-2"), + (0.20, "common.items.weapons.sword.cobalt-3"), + (0.10, "common.items.weapons.sword.bloodsteel-0"), + (0.10, "common.items.weapons.sword.bloodsteel-1"), + (0.10, "common.items.weapons.sword.bloodsteel-2"), + (0.01, "common.items.weapons.sword.caladbolg"), // axes (0.20, "common.items.weapons.axe.bloodsteel_axe-0"), (0.20, "common.items.weapons.axe.bloodsteel_axe-1"), diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron index 33ce82c3e5..bf60c01102 100644 --- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron +++ b/assets/common/loot_tables/loot_table_weapon_uncommon.ron @@ -1,23 +1,28 @@ [ // swords - (0.05, "common.items.weapons.sword.long_2h_simple-0"), - (0.05, "common.items.weapons.sword.long_2h_simple-1"), - (0.05, "common.items.weapons.sword.long_2h_simple-2"), - (0.05, "common.items.weapons.sword.long_2h_simple-3"), - (0.05, "common.items.weapons.sword.long_2h_simple-4"), - (0.05, "common.items.weapons.sword.long_2h_simple-5"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-2"), - (0.06, "common.items.weapons.sword.long_2h_fine-0"), - (0.06, "common.items.weapons.sword.long_2h_fine-1"), - (0.06, "common.items.weapons.sword.long_2h_fine-2"), - (0.06, "common.items.weapons.sword.long_2h_fine-3"), - (0.06, "common.items.weapons.sword.long_2h_fine-4"), - (0.06, "common.items.weapons.sword.long_2h_fine-5"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-0"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"), + (0.15, "common.items.weapons.sword.bronze-0"), + (0.15, "common.items.weapons.sword.bronze-1"), + (0.15, "common.items.weapons.sword.bronze-2"), + (0.04, "common.items.weapons.sword.iron-0"), + (0.04, "common.items.weapons.sword.iron-1"), + (0.04, "common.items.weapons.sword.iron-2"), + (0.04, "common.items.weapons.sword.iron-3"), + (0.04, "common.items.weapons.sword.iron-4"), + (0.04, "common.items.weapons.sword.iron-5"), + (0.04, "common.items.weapons.sword.iron-6"), + (0.04, "common.items.weapons.sword.iron-7"), + (0.04, "common.items.weapons.sword.iron-8"), + (0.04, "common.items.weapons.sword.iron-9"), + (0.04, "common.items.weapons.sword.iron-10"), + (0.03, "common.items.weapons.sword.steel-0"), + (0.03, "common.items.weapons.sword.steel-1"), + (0.03, "common.items.weapons.sword.steel-2"), + (0.03, "common.items.weapons.sword.steel-3"), + (0.03, "common.items.weapons.sword.steel-4"), + (0.03, "common.items.weapons.sword.steel-5"), + (0.03, "common.items.weapons.sword.steel-6"), + (0.03, "common.items.weapons.sword.steel-7"), + (0.03, "common.items.weapons.sword.steel-8"), // axes (0.15, "common.items.weapons.axe.bronze_axe-0"), (0.15, "common.items.weapons.axe.bronze_axe-1"), diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 974602a42a..918c2cc83a 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -243,7 +243,7 @@ ], ), "Forest Spirit": ( - ("common.items.weapons.sword.wood_sword", 1), + ("common.items.weapons.sword.wood-2", 1), [ (Item("common.items.crafting_ing.leather_scraps"), 4), (Item("common.items.crafting_ing.twigs"), 10), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index ec45a3fbf1..59983a57a8 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -103,177 +103,169 @@ (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1, ), // Swords - Tool("common.items.weapons.sword.frost_cleaver_2h-0"): VoxTrans( - "voxel.weapon.sword.frost_cleaver-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40, + Tool("common.items.weapons.sword.bloodsteel-0"): VoxTrans( + "voxel.weapons.sword.bloodsteel-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.frost_cleaver_2h-1"): VoxTrans( - "voxel.weapon.sword.frost_cleaver-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40, + Tool("common.items.weapons.sword.bloodsteel-1"): VoxTrans( + "voxel.weapons.sword.bloodsteel-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.short_sword_0"): VoxTrans( - "voxel.weapon.sword.short_2h-0", - (-3.0, 3.0, 0.0), (-135.0, 90.0, 0.0), 1.60, + Tool("common.items.weapons.sword.bloodsteel-2"): VoxTrans( + "voxel.weapons.sword.bloodsteel-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.starter_sword"): VoxTrans( - "voxel.weapon.sword.rusty_2h", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3, + Tool("common.items.weapons.sword.bronze-0"): VoxTrans( + "voxel.weapons.sword.bronze-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.zweihander_sword_0"): VoxTrans( - "voxel.weapon.sword.zweihander_2h-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + Tool("common.items.weapons.sword.bronze-1"): VoxTrans( + "voxel.weapons.sword.bronze-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.wood_sword"): VoxTrans( - "voxel.weapon.sword.wood_ore_2h", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + Tool("common.items.weapons.sword.bronze-2"): VoxTrans( + "voxel.weapons.sword.bronze-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_dam-0"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_dam-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.caladbolg"): VoxTrans( + "voxel.weapons.sword.caladbolg", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_dam-1"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_dam-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cobalt-0"): VoxTrans( + "voxel.weapons.sword.cobalt-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_dam-2"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_dam-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cobalt-1"): VoxTrans( + "voxel.weapons.sword.cobalt-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_simple-0"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_simple-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cobalt-2"): VoxTrans( + "voxel.weapons.sword.cobalt-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_simple-1"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_simple-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cobalt-3"): VoxTrans( + "voxel.weapons.sword.cobalt-3", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_simple-2"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_simple-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cultist"): VoxTrans( + "voxel.weapons.sword.cultist", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_orn-0"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_orn-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.frost-0"): VoxTrans( + "voxel.weapons.sword.frost-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_orn-1"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_orn-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.frost-1"): VoxTrans( + "voxel.weapons.sword.frost-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_orn-2"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_orn-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-0"): VoxTrans( + "voxel.weapons.sword.iron-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_fine-0"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_fine-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-1"): VoxTrans( + "voxel.weapons.sword.iron-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_fine-1"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_fine-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-10"): VoxTrans( + "voxel.weapons.sword.iron-10", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_fine-2"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_fine-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-2"): VoxTrans( + "voxel.weapons.sword.iron-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-0"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-3"): VoxTrans( + "voxel.weapons.sword.iron-3", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-1"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-4"): VoxTrans( + "voxel.weapons.sword.iron-4", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-2"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-5"): VoxTrans( + "voxel.weapons.sword.iron-5", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-3"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-3", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-6"): VoxTrans( + "voxel.weapons.sword.iron-6", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-4"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-4", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-7"): VoxTrans( + "voxel.weapons.sword.iron-7", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-5"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-5", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-8"): VoxTrans( + "voxel.weapons.sword.iron-8", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-0"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-9"): VoxTrans( + "voxel.weapons.sword.iron-9", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-1"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.starter"): VoxTrans( + "voxel.weapons.sword.starter", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-2"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-0"): VoxTrans( + "voxel.weapons.sword.steel-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-3"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-3", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-1"): VoxTrans( + "voxel.weapons.sword.steel-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-4"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-4", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-2"): VoxTrans( + "voxel.weapons.sword.steel-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-5"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-5", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-3"): VoxTrans( + "voxel.weapons.sword.steel-3", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-0"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-4"): VoxTrans( + "voxel.weapons.sword.steel-4", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-1"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-5"): VoxTrans( + "voxel.weapons.sword.steel-5", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-2"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-6"): VoxTrans( + "voxel.weapons.sword.steel-6", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-3"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-3", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-7"): VoxTrans( + "voxel.weapons.sword.steel-7", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-4"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-4", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-8"): VoxTrans( + "voxel.weapons.sword.steel-8", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-5"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-5", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.stone-0"): VoxTrans( + "voxel.weapons.sword.stone-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-0"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.stone-1"): VoxTrans( + "voxel.weapons.sword.stone-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-1"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.stone-2"): VoxTrans( + "voxel.weapons.sword.stone-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-2"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.wood-0"): VoxTrans( + "voxel.weapons.sword.wood-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-3"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-3", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.wood-1"): VoxTrans( + "voxel.weapons.sword.wood-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-4"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-4", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, - ), - Tool("common.items.weapons.sword.long_2h_fine-5"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-5", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, - ), - Tool("common.items.weapons.sword.cultist_purp_2h-0"): VoxTrans( - "voxel.weapon.sword.cultist_purp_2h-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.wood-2"): VoxTrans( + "voxel.weapons.sword.wood-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.debug.admin_sword"): VoxTrans( "voxel.weapon.sword.frost_cleaver-1", diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index a36258c555..a3fc00748b 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -1,174 +1,166 @@ ({ //Swords - "common.items.weapons.sword.starter_sword": ( - vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)), + "common.items.weapons.sword.bloodsteel-0": ( + vox_spec: ("weapons.sword.bloodsteel-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.wood_sword": ( - vox_spec: ("weapon.sword.wood_ore_2h", (-1.5, -6.5, -4.0)), + "common.items.weapons.sword.bloodsteel-1": ( + vox_spec: ("weapons.sword.bloodsteel-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.zweihander_sword_0": ( - vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)), + "common.items.weapons.sword.bloodsteel-2": ( + vox_spec: ("weapons.sword.bloodsteel-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.short_sword_0": ( - vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -1.0)), + "common.items.weapons.sword.bronze-0": ( + vox_spec: ("weapons.sword.bronze-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_dam-0": ( - vox_spec: ("weapon.sword.greatsword_2h_dam-0", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.bronze-1": ( + vox_spec: ("weapons.sword.bronze-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_dam-1": ( - vox_spec: ("weapon.sword.greatsword_2h_dam-1", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.bronze-2": ( + vox_spec: ("weapons.sword.bronze-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_dam-2": ( - vox_spec: ("weapon.sword.greatsword_2h_dam-2", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.caladbolg": ( + vox_spec: ("weapons.sword.caladbolg", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_simple-0": ( - vox_spec: ("weapon.sword.greatsword_2h_simple-0", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.cobalt-0": ( + vox_spec: ("weapons.sword.cobalt-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_simple-1": ( - vox_spec: ("weapon.sword.greatsword_2h_simple-1", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.cobalt-1": ( + vox_spec: ("weapons.sword.cobalt-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_simple-2": ( - vox_spec: ("weapon.sword.greatsword_2h_simple-2", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.cobalt-2": ( + vox_spec: ("weapons.sword.cobalt-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_orn-0": ( - vox_spec: ("weapon.sword.greatsword_2h_orn-0", (-1.0, -4.5, -7.5)), + "common.items.weapons.sword.cobalt-3": ( + vox_spec: ("weapons.sword.cobalt-3", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_orn-1": ( - vox_spec: ("weapon.sword.greatsword_2h_orn-1", (-1.0, -4.5, -7.5)), + "common.items.weapons.sword.cultist": ( + vox_spec: ("weapons.sword.cultist", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_orn-2": ( - vox_spec: ("weapon.sword.greatsword_2h_orn-2", (-1.0, -4.5, -7.5)), + "common.items.weapons.sword.frost-0": ( + vox_spec: ("weapons.sword.frost-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_fine-0": ( - vox_spec: ("weapon.sword.greatsword_2h_fine-0", (-2.0, -6.5, -8.0)), + "common.items.weapons.sword.frost-1": ( + vox_spec: ("weapons.sword.frost-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_fine-1": ( - vox_spec: ("weapon.sword.greatsword_2h_fine-1", (-2.0, -6.5, -8.0)), + "common.items.weapons.sword.iron-0": ( + vox_spec: ("weapons.sword.iron-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_fine-2": ( - vox_spec: ("weapon.sword.greatsword_2h_fine-2", (-2.0, -6.5, -8.0)), + "common.items.weapons.sword.iron-1": ( + vox_spec: ("weapons.sword.iron-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-0": ( - vox_spec: ("weapon.sword.long_2h_dam-0", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-10": ( + vox_spec: ("weapons.sword.iron-10", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-1": ( - vox_spec: ("weapon.sword.long_2h_dam-1", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-2": ( + vox_spec: ("weapons.sword.iron-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-2": ( - vox_spec: ("weapon.sword.long_2h_dam-2", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-3": ( + vox_spec: ("weapons.sword.iron-3", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-3": ( - vox_spec: ("weapon.sword.long_2h_dam-3", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-4": ( + vox_spec: ("weapons.sword.iron-4", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-4": ( - vox_spec: ("weapon.sword.long_2h_dam-4", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-5": ( + vox_spec: ("weapons.sword.iron-5", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-5": ( - vox_spec: ("weapon.sword.long_2h_dam-5", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-6": ( + vox_spec: ("weapons.sword.iron-6", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-0": ( - vox_spec: ("weapon.sword.long_2h_simple-0", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-7": ( + vox_spec: ("weapons.sword.iron-7", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-1": ( - vox_spec: ("weapon.sword.long_2h_simple-1", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-8": ( + vox_spec: ("weapons.sword.iron-8", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-2": ( - vox_spec: ("weapon.sword.long_2h_simple-2", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-9": ( + vox_spec: ("weapons.sword.iron-9", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-3": ( - vox_spec: ("weapon.sword.long_2h_simple-3", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.starter": ( + vox_spec: ("weapons.sword.starter", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-4": ( - vox_spec: ("weapon.sword.long_2h_simple-4", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.steel-0": ( + vox_spec: ("weapons.sword.steel-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-5": ( - vox_spec: ("weapon.sword.long_2h_simple-5", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.steel-1": ( + vox_spec: ("weapons.sword.steel-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-0": ( - vox_spec: ("weapon.sword.long_2h_orn-0", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-2": ( + vox_spec: ("weapons.sword.steel-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-1": ( - vox_spec: ("weapon.sword.long_2h_orn-1", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-3": ( + vox_spec: ("weapons.sword.steel-3", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-2": ( - vox_spec: ("weapon.sword.long_2h_orn-2", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-4": ( + vox_spec: ("weapons.sword.steel-4", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-3": ( - vox_spec: ("weapon.sword.long_2h_orn-3", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-5": ( + vox_spec: ("weapons.sword.steel-5", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-4": ( - vox_spec: ("weapon.sword.long_2h_orn-4", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-6": ( + vox_spec: ("weapons.sword.steel-6", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-5": ( - vox_spec: ("weapon.sword.long_2h_orn-5", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-7": ( + vox_spec: ("weapons.sword.steel-7", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-0": ( - vox_spec: ("weapon.sword.long_2h_fine-0", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.steel-8": ( + vox_spec: ("weapons.sword.steel-8", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-1": ( - vox_spec: ("weapon.sword.long_2h_fine-1", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.stone-0": ( + vox_spec: ("weapons.sword.stone-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-2": ( - vox_spec: ("weapon.sword.long_2h_fine-2", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.stone-1": ( + vox_spec: ("weapons.sword.stone-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-3": ( - vox_spec: ("weapon.sword.long_2h_fine-3", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.stone-2": ( + vox_spec: ("weapons.sword.stone-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-4": ( - vox_spec: ("weapon.sword.long_2h_fine-4", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.wood-0": ( + vox_spec: ("weapons.sword.wood-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-5": ( - vox_spec: ("weapon.sword.long_2h_fine-5", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.wood-1": ( + vox_spec: ("weapons.sword.wood-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.cultist_purp_2h-0": ( - vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), - color: None - ), - "common.items.weapons.sword.frost_cleaver_2h-0": ( - vox_spec: ("weapon.sword.frost_cleaver-0", (-2.0, -4.5, -7.5)), - color: None - ), - "common.items.weapons.sword.frost_cleaver_2h-1": ( - vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)), + "common.items.weapons.sword.wood-2": ( + vox_spec: ("weapons.sword.wood-2", (-2.0, -4.5, -7.5)), color: None ), // 1h Swords diff --git a/assets/voxygen/voxel/weapon/sword/bloodsteel-0.vox b/assets/voxygen/voxel/weapon/sword/bloodsteel-0.vox new file mode 100644 index 0000000000..41012574b1 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/bloodsteel-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef155ecdc43dbcf39e80085a75a6758997305ab1c905a35d14502dbc360d09f2 +size 1444 diff --git a/assets/voxygen/voxel/weapon/sword/bloodsteel-1.vox b/assets/voxygen/voxel/weapon/sword/bloodsteel-1.vox new file mode 100644 index 0000000000..1f1814b275 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/bloodsteel-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a80af76189c73049bcdb6fe79e1777dac2eb250dc6cf2b9a77bbfb2fd9c1d218 +size 1404 diff --git a/assets/voxygen/voxel/weapon/sword/bloodsteel-2.vox b/assets/voxygen/voxel/weapon/sword/bloodsteel-2.vox new file mode 100644 index 0000000000..7c0776de7e --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/bloodsteel-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c63de92b9e677d322d2a356e8ccda5bdd1bfe096b0132dc11554e303046b7c40 +size 1672 diff --git a/assets/voxygen/voxel/weapon/sword/bronze-0.vox b/assets/voxygen/voxel/weapon/sword/bronze-0.vox new file mode 100644 index 0000000000..ed2822ddc6 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/bronze-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1411faf8dd0a93d4f8ddfc55cb4e6f0dd7d5b39697eba1634d4e8f593878778 +size 1656 diff --git a/assets/voxygen/voxel/weapon/sword/bronze-1.vox b/assets/voxygen/voxel/weapon/sword/bronze-1.vox new file mode 100644 index 0000000000..8045245e0b --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/bronze-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c94d1247384596441ba6193533a2914cc4c3d77db1cb9f8ce406c30e91e18ae2 +size 1616 diff --git a/assets/voxygen/voxel/weapon/sword/bronze-2.vox b/assets/voxygen/voxel/weapon/sword/bronze-2.vox new file mode 100644 index 0000000000..9fe4af43a9 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/bronze-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c6f204b82d28881ed50d362a1164e706de2bca7ad0d5759c9d285e1b6cc73a5 +size 1580 diff --git a/assets/voxygen/voxel/weapon/sword/caladbolg.vox b/assets/voxygen/voxel/weapon/sword/caladbolg.vox new file mode 100644 index 0000000000..f1fcfbd21f --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/caladbolg.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c297c7c06806996c486bb8b6ba3781b272582e06f3ba2dd9712d3f954227b266 +size 1972 diff --git a/assets/voxygen/voxel/weapon/sword/cobalt-0.vox b/assets/voxygen/voxel/weapon/sword/cobalt-0.vox new file mode 100644 index 0000000000..8e9dee8bb1 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/cobalt-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b01ff7f08e4437998bb054408c006c145f74be6d35447b1e196fecacb8946a17 +size 1420 diff --git a/assets/voxygen/voxel/weapon/sword/cobalt-1.vox b/assets/voxygen/voxel/weapon/sword/cobalt-1.vox new file mode 100644 index 0000000000..0177ff300d --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/cobalt-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86aea61f8941f9662cffbd105294156acf478557adeee2e662fefdff192ec830 +size 1872 diff --git a/assets/voxygen/voxel/weapon/sword/cobalt-2.vox b/assets/voxygen/voxel/weapon/sword/cobalt-2.vox new file mode 100644 index 0000000000..33fcae7092 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/cobalt-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feb62e3ce66d68eaa70323e3f6d374258ccda78d92e0461596b924ed76bd0eb4 +size 1592 diff --git a/assets/voxygen/voxel/weapon/sword/cobalt-3.vox b/assets/voxygen/voxel/weapon/sword/cobalt-3.vox new file mode 100644 index 0000000000..cd036be86f --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/cobalt-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4a436f284af710976805b1411737a6463220d0246b9de06970f491c3f2cc58d +size 1640 diff --git a/assets/voxygen/voxel/weapon/sword/cultist_purp_2h-0.vox b/assets/voxygen/voxel/weapon/sword/cultist.vox similarity index 100% rename from assets/voxygen/voxel/weapon/sword/cultist_purp_2h-0.vox rename to assets/voxygen/voxel/weapon/sword/cultist.vox diff --git a/assets/voxygen/voxel/weapon/sword/frost_cleaver-0.vox b/assets/voxygen/voxel/weapon/sword/frost-0.vox similarity index 100% rename from assets/voxygen/voxel/weapon/sword/frost_cleaver-0.vox rename to assets/voxygen/voxel/weapon/sword/frost-0.vox diff --git a/assets/voxygen/voxel/weapon/sword/frost_cleaver-1.vox b/assets/voxygen/voxel/weapon/sword/frost-1.vox similarity index 100% rename from assets/voxygen/voxel/weapon/sword/frost_cleaver-1.vox rename to assets/voxygen/voxel/weapon/sword/frost-1.vox diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-0.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-0.vox deleted file mode 100644 index ab0959656b..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:045c8914c033334b46bf3b359511fb9110889613e18e4704ca8b7a8d38986362 -size 1504 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-1.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-1.vox deleted file mode 100644 index fd36c41f02..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23d8e0c8da691251f73ec8846badceeb61809ba2f3c7e5bcdc2c1b1c1ce9120b -size 1544 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-2.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-2.vox deleted file mode 100644 index 9f86a4866b..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11598d812dfa72a4a221dc9cff867d7c136c80d8eaeaff28360a9ad9d72e8d84 -size 1580 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-0.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-0.vox deleted file mode 100644 index 3ba0a40ca1..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:003d7951f89bc10d0b8e773b0250a0c7362e3e6ebae23e0efb4136d6bd03f267 -size 1600 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-1.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-1.vox deleted file mode 100644 index d023dc7cbe..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3b825a785d77bc20e7685ec47540e242cbcad9badb811579df4a01c3ea05eeb -size 1640 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-2.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-2.vox deleted file mode 100644 index 42ada8b87d..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8edd6b87e943feea13d37606f016a9af2e61b59f32af3ce3bac79f0b3d0a50d0 -size 1680 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-0.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-0.vox deleted file mode 100644 index de81973089..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b243261f2b1ee155414181543d07252450501ca3b279c89ef2b68cb05c9cfa3 -size 1544 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-1.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-1.vox deleted file mode 100644 index 7b9696f3e8..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3fa9e04bf2ae28efb854e8aadf23a43b8a60092e59b79145594895770a3a7df -size 1584 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-2.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-2.vox deleted file mode 100644 index d622a3788f..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:099019d7a721ede11f09c00aa35235f5c89cfc70b883d7b0d154168b332a2184 -size 1624 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-0.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-0.vox deleted file mode 100644 index 4263b26fa4..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf739eb0e1053dc3ae9d71c2c2b61f15efeb8981681aa684d57dbf73318fd3e6 -size 1528 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-1.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-1.vox deleted file mode 100644 index 81ef6e3f0f..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23b44d97877cb330f2b17840a271056a71de17dccaba312c94eaca135d7a1c5c -size 1568 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-2.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-2.vox deleted file mode 100644 index 31adcc92bd..0000000000 --- a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91b3df5f8063f2a172df4661a218649456f2b2c4f2097ec9fc5179fad2e810da -size 1608 diff --git a/assets/voxygen/voxel/weapon/sword/iron-0.vox b/assets/voxygen/voxel/weapon/sword/iron-0.vox new file mode 100644 index 0000000000..0ce1078c33 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b76d7175fa9b9acaef18d3d86c1e47b2e98a7e5a2ac7392242cdc0af2ef448c1 +size 1600 diff --git a/assets/voxygen/voxel/weapon/sword/iron-1.vox b/assets/voxygen/voxel/weapon/sword/iron-1.vox new file mode 100644 index 0000000000..9bca1b2d6d --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0d299e32397147a11c2660d6f5d2dc4ba4846c67b7671c8996c89ddb8c690f3 +size 2144 diff --git a/assets/voxygen/voxel/weapon/sword/iron-10.vox b/assets/voxygen/voxel/weapon/sword/iron-10.vox new file mode 100644 index 0000000000..7dd7394aeb --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06e1f3364047e9787a96ec1a7f00e9e285a5625288ead72c5219346e7f032b72 +size 1844 diff --git a/assets/voxygen/voxel/weapon/sword/iron-2.vox b/assets/voxygen/voxel/weapon/sword/iron-2.vox new file mode 100644 index 0000000000..a93b2a2961 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd78ce811267439313af48eae8d3a0479251734c8fbd0c5e7990c3593e8692bf +size 1420 diff --git a/assets/voxygen/voxel/weapon/sword/iron-3.vox b/assets/voxygen/voxel/weapon/sword/iron-3.vox new file mode 100644 index 0000000000..3c7be3fd64 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6015961967fe69cf972b1d880e5fdd7b0738e5fff72fd95dc4a968eab415c863 +size 1428 diff --git a/assets/voxygen/voxel/weapon/sword/iron-4.vox b/assets/voxygen/voxel/weapon/sword/iron-4.vox new file mode 100644 index 0000000000..6faa91f889 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cab6f7a08c122009724ef30956d5463ad1d328daba1036ecfe518dc00e3f2303 +size 1656 diff --git a/assets/voxygen/voxel/weapon/sword/iron-5.vox b/assets/voxygen/voxel/weapon/sword/iron-5.vox new file mode 100644 index 0000000000..faea090418 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82c8d021a24d7dfdb09a8fa6281a3b8474dd0168178f96ee9a20bbb7148fd5c4 +size 1396 diff --git a/assets/voxygen/voxel/weapon/sword/iron-6.vox b/assets/voxygen/voxel/weapon/sword/iron-6.vox new file mode 100644 index 0000000000..dcbce3629f --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c96c8100137a5e5be81ff28e57df6e905fbade09d676f12d07417efa9736ae6 +size 1452 diff --git a/assets/voxygen/voxel/weapon/sword/iron-7.vox b/assets/voxygen/voxel/weapon/sword/iron-7.vox new file mode 100644 index 0000000000..f8b68996cc --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbb0e161468fce02940591f1aa33553adb69fb2adbca1c985bfd714b5e36e0b0 +size 1928 diff --git a/assets/voxygen/voxel/weapon/sword/iron-8.vox b/assets/voxygen/voxel/weapon/sword/iron-8.vox new file mode 100644 index 0000000000..73117188d9 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02feb1884b35beedef6eb75ae0f1a6ee88bd7018614bce6e7fa94b078465d928 +size 1532 diff --git a/assets/voxygen/voxel/weapon/sword/iron-9.vox b/assets/voxygen/voxel/weapon/sword/iron-9.vox new file mode 100644 index 0000000000..29ec25ea6e --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/iron-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:716500b7555db7cddef9facdad0ef1e6a62ae48d2e53a15c1ebd9394b1974f4e +size 1340 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-0.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-0.vox deleted file mode 100644 index 943d039f9b..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_dam-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:453bac4ae997df9a39e56e7d022be37fbc2a5f878586c27e1b809e6ed859d83d -size 1348 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-1.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-1.vox deleted file mode 100644 index 07e76f6131..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_dam-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa97f7020b5d7fc62d1a09e51b79caa980e114905359570827321e0532b7eaaf -size 1376 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-2.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-2.vox deleted file mode 100644 index f7eb60f339..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_dam-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bd22e30968c32881f5a8b0da216ff693c0acd69d6b3f9924bb3f005f98a0cce -size 1400 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-3.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-3.vox deleted file mode 100644 index f14cf39831..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_dam-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b5f08a22a42e8586d6dd21b7c0b239e1d5401511a607e58acf78045256d608a -size 1368 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-4.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-4.vox deleted file mode 100644 index 8144b9b465..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_dam-4.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e7025b9eb3c6beca1c793541ee27941ef4085c5e5175f4e6544c82947eaacb4 -size 1388 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-5.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-5.vox deleted file mode 100644 index 010d8bb033..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_dam-5.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58a37101cd546ed25493969156c7e716534102145f9f895a12c3a8ad4e85a05c -size 1400 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-0.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-0.vox deleted file mode 100644 index e35f357cdd..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_fine-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2d5a92f2887cc79dd03a41fad816273f82e4b5a88fb1c941e42a2325917910d -size 1404 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-1.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-1.vox deleted file mode 100644 index 85618d53be..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_fine-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0fd0f970126166ffd3f9f9c762777403040de1d2e07e11bb7fed80f4496741d4 -size 1436 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-2.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-2.vox deleted file mode 100644 index 0ca1d58d31..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_fine-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52eab2be93d5952fcab375e895088dce340c75dc08abb636fc7ae08c242d9521 -size 1460 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-3.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-3.vox deleted file mode 100644 index f4ddf94fae..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_fine-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30b41201195d03164204f5ff8b4c0cded476417f86fcb3a8d84cfd693634fd5e -size 1448 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-4.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-4.vox deleted file mode 100644 index 5f94cc4855..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_fine-4.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:559cf56e421c8f9b0d82b028d40996b48d0a3ce7aac971a3fdf88d85b4ba40b7 -size 1424 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-5.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-5.vox deleted file mode 100644 index 5cc1a481e6..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_fine-5.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d976afa9a8d30d6d03a46d42cd65f33fbc3a26117bfa8921c0c61229ee64edfb -size 1460 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_orn-0.vox b/assets/voxygen/voxel/weapon/sword/long_2h_orn-0.vox deleted file mode 100644 index 54b8922541..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_orn-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e398cbd51e5927d6c25b41ec7e2e4eb00ba605762cad36e2afb1219aeed78a15 -size 1372 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_orn-1.vox b/assets/voxygen/voxel/weapon/sword/long_2h_orn-1.vox deleted file mode 100644 index b73e362524..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_orn-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7172b3603c3236753e859c3ecf41d7cb5eac9111e3ca588c5b13cb0b16bee59 -size 1404 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_orn-2.vox b/assets/voxygen/voxel/weapon/sword/long_2h_orn-2.vox deleted file mode 100644 index 49c74dbe9b..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_orn-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f328f79285258e7e470d22cc4967c34804c33bb1008079d7b79efa001f736464 -size 1428 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_orn-3.vox b/assets/voxygen/voxel/weapon/sword/long_2h_orn-3.vox deleted file mode 100644 index c0c18ae1f6..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_orn-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cecca5f753cf3aca9008f3df2ce2d8f64e5fc7db16c2313c7e88eb11f146088a -size 1416 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_orn-4.vox b/assets/voxygen/voxel/weapon/sword/long_2h_orn-4.vox deleted file mode 100644 index fdf257e02b..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_orn-4.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f76557b513db6b5518b5ba71c38fb40f997a6a4fd0dbc85f9a9d78c071f0ae3c -size 1392 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_orn-5.vox b/assets/voxygen/voxel/weapon/sword/long_2h_orn-5.vox deleted file mode 100644 index 5494f981ec..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_orn-5.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49624957037f66235d1f3d3d73ea4df3fd4f0e2c7341ee56eafe9b28684230ea -size 1428 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-0.vox b/assets/voxygen/voxel/weapon/sword/long_2h_simple-0.vox deleted file mode 100644 index 5b65f9dcb9..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_simple-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0f06642cbbd6ec66ac7c38e8ad398af03a0acb3b2b872a207bb5e6797333659 -size 1360 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-1.vox b/assets/voxygen/voxel/weapon/sword/long_2h_simple-1.vox deleted file mode 100644 index 64e6d00347..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_simple-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2c8e0874f467aacf17306199b531c1872e1c137dd715635be0b3c49f40d6933 -size 1392 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-2.vox b/assets/voxygen/voxel/weapon/sword/long_2h_simple-2.vox deleted file mode 100644 index 7f157dca55..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_simple-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea9612e8cbd29a8d659c1a7ba9a63388a8a698072c0b06d54492ca8e971346ad -size 1416 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-3.vox b/assets/voxygen/voxel/weapon/sword/long_2h_simple-3.vox deleted file mode 100644 index 7a71bcd575..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_simple-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af7c1b07d98053249631c94ea80efeafc662cfcd264b4bea79cd5852bbae6e41 -size 1404 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-4.vox b/assets/voxygen/voxel/weapon/sword/long_2h_simple-4.vox deleted file mode 100644 index 0e8633c32c..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_simple-4.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4886876e2d7eb20f180d96200f675c4c7a17da7e5014ca7aab01a1da9e8f37e2 -size 1380 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-5.vox b/assets/voxygen/voxel/weapon/sword/long_2h_simple-5.vox deleted file mode 100644 index 98a84c74bb..0000000000 --- a/assets/voxygen/voxel/weapon/sword/long_2h_simple-5.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fe23c4cb5cf373609b1c70e7e08c51173f0cae00aea789fe647a3a467a2b412 -size 1416 diff --git a/assets/voxygen/voxel/weapon/sword/rusty_2h.vox b/assets/voxygen/voxel/weapon/sword/rusty_2h.vox deleted file mode 100644 index 1108e4a179..0000000000 --- a/assets/voxygen/voxel/weapon/sword/rusty_2h.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4116ac76b84c0b8d7c238358e57836d9a3d00990f21a5aa657818d39f67887e2 -size 1596 diff --git a/assets/voxygen/voxel/weapon/sword/short_2h-0.vox b/assets/voxygen/voxel/weapon/sword/short_2h-0.vox deleted file mode 100644 index ef89183839..0000000000 --- a/assets/voxygen/voxel/weapon/sword/short_2h-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51153a3f8c32d10a7d51ef72e84f545de84da0de7033c977fd1fbc7256383cf8 -size 1508 diff --git a/assets/voxygen/voxel/weapon/sword/starter.vox b/assets/voxygen/voxel/weapon/sword/starter.vox new file mode 100644 index 0000000000..45541dd0d1 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/starter.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f417da93cf8c372d5cf4560e41b9db3878b9cdd5ead043641118c5a77be0799c +size 1580 diff --git a/assets/voxygen/voxel/weapon/sword/steel-0.vox b/assets/voxygen/voxel/weapon/sword/steel-0.vox new file mode 100644 index 0000000000..37f8f15d94 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c75ff46d7b84c58a81343f3d18d5053fb07e420249a6e044fda457b0a17cabb +size 1720 diff --git a/assets/voxygen/voxel/weapon/sword/steel-1.vox b/assets/voxygen/voxel/weapon/sword/steel-1.vox new file mode 100644 index 0000000000..07db3e3bd7 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa105301f7fe326df51e434989f80c99c349e1c119c1a23772e800ba986d6f10 +size 1592 diff --git a/assets/voxygen/voxel/weapon/sword/steel-2.vox b/assets/voxygen/voxel/weapon/sword/steel-2.vox new file mode 100644 index 0000000000..0583c62900 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb22752faa41cc1a507e0d7a506e7db56d990fc1651c443095fd96210c1ba71a +size 1712 diff --git a/assets/voxygen/voxel/weapon/sword/steel-3.vox b/assets/voxygen/voxel/weapon/sword/steel-3.vox new file mode 100644 index 0000000000..31077ed1a1 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42606802d3fca5b466940389bbb00644d3720d97c5ea66b73c7ded85e02467bb +size 1572 diff --git a/assets/voxygen/voxel/weapon/sword/steel-4.vox b/assets/voxygen/voxel/weapon/sword/steel-4.vox new file mode 100644 index 0000000000..56061cfa39 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:575c0e21406e40902c316fcb68c7f6f1467b1044b3906efaa85c833e1d6e162d +size 1872 diff --git a/assets/voxygen/voxel/weapon/sword/steel-5.vox b/assets/voxygen/voxel/weapon/sword/steel-5.vox new file mode 100644 index 0000000000..d98fef6a74 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a72afb2679a47a7795838c082d1375764d4516875eca2f73e3b9ec1c5ea3f8c5 +size 1376 diff --git a/assets/voxygen/voxel/weapon/sword/steel-6.vox b/assets/voxygen/voxel/weapon/sword/steel-6.vox new file mode 100644 index 0000000000..869be62f65 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f933837587314156f1d1166d967079313e296f087f0a328265d8504ddd692865 +size 1616 diff --git a/assets/voxygen/voxel/weapon/sword/steel-7.vox b/assets/voxygen/voxel/weapon/sword/steel-7.vox new file mode 100644 index 0000000000..2f1e7197de --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0db3b4aa033e18910a97e92377b985f56b20728a8a2999621e7f14df3a30f023 +size 2056 diff --git a/assets/voxygen/voxel/weapon/sword/steel-8.vox b/assets/voxygen/voxel/weapon/sword/steel-8.vox new file mode 100644 index 0000000000..1235a0035f --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/steel-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11ffc873adb812d4156957437e9e011519492547eda835c0235ada7430aa9543 +size 1468 diff --git a/assets/voxygen/voxel/weapon/sword/stone-0.vox b/assets/voxygen/voxel/weapon/sword/stone-0.vox new file mode 100644 index 0000000000..27c33e0296 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/stone-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f03147ddaaf2e3e4cb39c5ad5bbdcce626799846e6160d8f79e7f1a7c279174d +size 2488 diff --git a/assets/voxygen/voxel/weapon/sword/stone-1.vox b/assets/voxygen/voxel/weapon/sword/stone-1.vox new file mode 100644 index 0000000000..0ec8744c8f --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/stone-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18889109ba3052387935d348dd32403dff870cb80fe5f230c940e0e96c3eb37d +size 1624 diff --git a/assets/voxygen/voxel/weapon/sword/stone-2.vox b/assets/voxygen/voxel/weapon/sword/stone-2.vox new file mode 100644 index 0000000000..0c249b8ba4 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/stone-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:325f519676f7d6e6401301eb11d6c6b8fc6eb21e636125536b018b37514ad1c6 +size 1976 diff --git a/assets/voxygen/voxel/weapon/sword/wood-0.vox b/assets/voxygen/voxel/weapon/sword/wood-0.vox new file mode 100644 index 0000000000..b46dbf05e3 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/wood-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34e6f484b2f429cb71193f745a4bdde91c1ca861bcdf3ab352719dbd7a126188 +size 1676 diff --git a/assets/voxygen/voxel/weapon/sword/wood-1.vox b/assets/voxygen/voxel/weapon/sword/wood-1.vox new file mode 100644 index 0000000000..8aa679004f --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/wood-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef5b8dbe94deec07df348c94bf16db1e9607fdd2e3b363e76abc845d6a274e24 +size 2080 diff --git a/assets/voxygen/voxel/weapon/sword/wood_ore_2h.vox b/assets/voxygen/voxel/weapon/sword/wood-2.vox similarity index 100% rename from assets/voxygen/voxel/weapon/sword/wood_ore_2h.vox rename to assets/voxygen/voxel/weapon/sword/wood-2.vox diff --git a/assets/voxygen/voxel/weapon/sword/wood_2h.vox b/assets/voxygen/voxel/weapon/sword/wood_2h.vox deleted file mode 100644 index 32267ca3fe..0000000000 --- a/assets/voxygen/voxel/weapon/sword/wood_2h.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70ee307de7d45c31cb8b1cb0bbe06146564f884e2e909967f929915415e529c7 -size 1520 diff --git a/assets/voxygen/voxel/weapon/sword/zweihander_2h-0.vox b/assets/voxygen/voxel/weapon/sword/zweihander_2h-0.vox deleted file mode 100644 index e9ad1aaebb..0000000000 --- a/assets/voxygen/voxel/weapon/sword/zweihander_2h-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8676b2e4513262bba1faacf3facb1ae71e528dc69004d43114052c53c78b7864 -size 1452 diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 7b876c6470..828a59bae4 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -85,10 +85,10 @@ fn weapon_stats() -> Result<(), Box> { { match item.kind() { comp::item::ItemKind::Tool(tool) => { - let power = tool.base_power().to_string(); - let poise_strength = tool.base_poise_strength().to_string(); - let speed = tool.base_speed().to_string(); - let equip_time = tool.equip_time().subsec_millis().to_string(); + let power = tool.base_power(&[]).to_string(); + let poise_strength = tool.base_poise_strength(&[]).to_string(); + let speed = tool.base_speed(&[]).to_string(); + let equip_time = tool.equip_time(&[]).subsec_millis().to_string(); let kind = get_tool_kind(&tool.kind); let hands = get_tool_hands(&tool); diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index f35adcb522..979be8bab6 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -24,7 +24,7 @@ use rand::Rng; /// // Build a loadout with character starter defaults and a specific sword with default sword abilities /// let loadout = LoadoutBuilder::new() /// .defaults() -/// .active_item(Some(Item::new_from_asset_expect("common.items.weapons.sword.zweihander_sword_0"))) +/// .active_item(Some(Item::new_from_asset_expect("common.items.weapons.sword.steel-8"))) /// .build(); /// ``` #[derive(Clone)] diff --git a/common/src/comp/inventory/test.rs b/common/src/comp/inventory/test.rs index 8f6f749046..d35aefadea 100644 --- a/common/src/comp/inventory/test.rs +++ b/common/src/comp/inventory/test.rs @@ -173,7 +173,7 @@ fn can_swap_equipped_bag_into_only_empty_slot_provided_by_itself_should_return_f fn unequip_items_both_hands() { let mut inv = Inventory::new_empty(); - let sword = Item::new_from_asset_expect("common.items.weapons.sword.zweihander_sword_0"); + let sword = Item::new_from_asset_expect("common.items.weapons.sword.steel-8"); inv.replace_loadout_item(EquipSlot::Mainhand, Some(sword.clone())); inv.replace_loadout_item(EquipSlot::Offhand, Some(sword.clone())); diff --git a/server/src/migrations/2021-02-24-230149_weapon-replacements/down.sql b/server/src/migrations/2021-02-24-230149_weapon-replacements/down.sql new file mode 100644 index 0000000000..291a97c5ce --- /dev/null +++ b/server/src/migrations/2021-02-24-230149_weapon-replacements/down.sql @@ -0,0 +1 @@ +-- This file should undo anything in `up.sql` \ No newline at end of file diff --git a/server/src/migrations/2021-02-24-230149_weapon-replacements/up.sql b/server/src/migrations/2021-02-24-230149_weapon-replacements/up.sql new file mode 100644 index 0000000000..136f75cda0 --- /dev/null +++ b/server/src/migrations/2021-02-24-230149_weapon-replacements/up.sql @@ -0,0 +1,86 @@ +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-0' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_dam-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-0' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_dam-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-0' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_dam-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-7' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_fine-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-7' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_fine-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-7' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_fine-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-1' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_orn-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-1' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_orn-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-1' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_orn-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-4' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_simple-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-4' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_simple-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-4' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_simple-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-3'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-4'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-5'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-3'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-4'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-5'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-3'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-4'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-5'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-3'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-4'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-5'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-8' WHERE item_definition_id = 'common.items.weapons.sword.zweihander_sword_0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.wood-2' WHERE item_definition_id = 'common.items.weapons.sword.wood_sword'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.starter' WHERE item_definition_id = 'common.items.weapons.sword.starter_sword'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.wood-0' WHERE item_definition_id = 'common.items.weapons.sword.short_sword_0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.cultist' WHERE item_definition_id = 'common.items.weapons.sword.cultist_purp_2h-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.frost-0' WHERE item_definition_id = 'common.items.weapons.sword.frost_cleaver_2h-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.frost-1' WHERE item_definition_id = 'common.items.weapons.sword.frost_cleaver_2h-1'; diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs index 3d4e506fc7..cc263948bf 100644 --- a/server/src/rtsim/entity.rs +++ b/server/src/rtsim/entity.rs @@ -66,9 +66,9 @@ impl Entity { let mut rng = self.rng(PERM_LOADOUT); let main_tool = comp::Item::new_from_asset_expect( (&[ - "common.items.weapons.sword.wood_sword", - "common.items.weapons.sword.starter_sword", - "common.items.weapons.sword.short_sword_0", + "common.items.weapons.sword.wood-2", + "common.items.weapons.sword.starter", + "common.items.weapons.sword.wood-0", "common.items.weapons.bow.starter_bow", "common.items.weapons.bow.leafy_longbow-0", ]) diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index af3f53eadc..096a0e942a 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -102,7 +102,7 @@ fn maps_basic_melee() { fn matches_ability_stage() { let loadout = LoadoutBuilder::new() .active_item(Some(Item::new_from_asset_expect( - "common.items.weapons.sword.starter_sword", + "common.items.weapons.sword.starter", ))) .build(); let inventory = Inventory::new_with_loadout(loadout); diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs index 8fbf62aa1e..e9dcf49b29 100644 --- a/voxygen/src/menu/char_selection/ui/mod.rs +++ b/voxygen/src/menu/char_selection/ui/mod.rs @@ -52,7 +52,7 @@ const STARTER_HAMMER: &str = "common.items.weapons.hammer.starter_hammer"; const STARTER_BOW: &str = "common.items.weapons.bow.starter_bow"; const STARTER_AXE: &str = "common.items.weapons.axe.starter_axe"; const STARTER_STAFF: &str = "common.items.weapons.staff.starter_staff"; -const STARTER_SWORD: &str = "common.items.weapons.sword.starter_sword"; +const STARTER_SWORD: &str = "common.items.weapons.sword.starter"; const STARTER_SCEPTRE: &str = "common.items.weapons.sceptre.starter_sceptre"; // TODO: what does this comment mean? // // Use in future MR to make this a starter weapon diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index 5ba43459ee..0bee816343 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -615,8 +615,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.starter_axe", - 1 => "common.items.weapons.sword.starter_sword", - 2 => "common.items.weapons.sword.starter_sword", + 1..=2 => "common.items.weapons.sword.starter", 3 => "common.items.weapons.hammer.starter_hammer", 4 => "common.items.weapons.staff.starter_staff", _ => "common.items.weapons.bow.starter_bow", @@ -632,8 +631,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.worn_iron_axe-0", - 1 => "common.items.weapons.sword.zweihander_sword_0", - 2 => "common.items.weapons.sword.zweihander_sword_0", + 1..=2 => "common.items.weapons.sword.steel-8", 3 => "common.items.weapons.hammer.worn_iron_hammer-0", 4 => "common.items.weapons.staff.bone_staff", _ => "common.items.weapons.bow.wood_shortbow-1", @@ -649,8 +647,8 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.bronze_axe-0", - 1 => "common.items.weapons.sword.greatsword_2h_simple-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1 => "common.items.weapons.sword.iron-4", + 2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.bronze_hammer-0", 4 => "common.items.weapons.staff.bone_staff", _ => "common.items.weapons.bow.wood_longbow-0", @@ -666,8 +664,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.steel_axe-0", - 1 => "common.items.weapons.sword.long_2h_orn-0", - 2 => "common.items.weapons.sword.long_2h_orn-0", + 1..=2 => "common.items.weapons.sword.steel-2", 3 => "common.items.weapons.hammer.cobalt_hammer-0", 4 => "common.items.weapons.staff.amethyst_staff", _ => "common.items.weapons.bow.horn_longbow-0", @@ -683,8 +680,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.malachite_axe-0", - 1 => "common.items.weapons.sword.cultist_purp_2h-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", 4 => "common.items.weapons.staff.cultist_staff", _ => "common.items.weapons.bow.horn_longbow-0", @@ -717,8 +713,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..5) { 0 => "common.items.weapons.axe.malachite_axe-0", - 1 => "common.items.weapons.sword.cultist_purp_2h-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", _ => "common.items.weapons.bow.horn_longbow-0", }, @@ -789,12 +784,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.worn_iron_axe-0", - 1 => { - "common.items.weapons.sword.zweihander_sword_0" - }, - 2 => { - "common.items.weapons.sword.zweihander_sword_0" - }, + 1..=2 => "common.items.weapons.sword.steel-8", 3 => { "common.items.weapons.hammer.worn_iron_hammer-0" }, @@ -838,8 +828,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.steel_axe-0", - 1 => "common.items.weapons.sword.long_2h_orn-0", - 2 => "common.items.weapons.sword.long_2h_orn-0", + 1..=2 => "common.items.weapons.sword.steel-2", 3 => "common.items.weapons.hammer.cobalt_hammer-0", 4 => "common.items.weapons.staff.amethyst_staff", _ => "common.items.weapons.bow.horn_longbow-0", @@ -862,8 +851,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.malachite_axe-0", - 1 => "common.items.weapons.sword.cultist_purp_2h-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", 4 => "common.items.weapons.staff.cultist_staff", @@ -1017,8 +1005,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.malachite_axe-0", - 1 => "common.items.weapons.sword.cultist_purp_2h-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1..=2 => "common.items.weapons.sword.cultist", 3 => { "common.items.weapons.hammer.cultist_purp_2h-0" }, diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index 35fdeea176..ee2c443324 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -930,7 +930,7 @@ impl Settlement { match dynamic_rng.gen_range(0..5) { 0 => entity .with_main_tool(Item::new_from_asset_expect( - "common.items.weapons.sword.greatsword_2h_simple-0", + "common.items.weapons.sword.iron-4", )) .with_name("Guard") .with_level(dynamic_rng.gen_range(10..15))