From 2b7b9f887bfa6a8d0a3b8b26b27bd9f0407dec3b Mon Sep 17 00:00:00 2001 From: Snowram Date: Tue, 2 Mar 2021 18:37:26 +0100 Subject: [PATCH] Fixes leather sets --- assets/common/items/armor/leather/belt.ron | 13 ------------- assets/common/items/armor/leather/chest.ron | 13 ------------- assets/common/items/armor/leather/foot.ron | 13 ------------- assets/common/items/armor/leather/hand.ron | 13 ------------- assets/common/items/armor/leather/pants.ron | 13 ------------- assets/common/items/armor/leather/shoulder.ron | 13 ------------- .../common/loot_tables/loot_table_armor_light.ron | 12 ++++++------ assets/common/loot_tables/loot_table_cultists.ron | 12 ++++++------ assets/voxygen/item_image_manifest.ron | 5 ----- assets/voxygen/voxel/armor/leather/shoulder.vox | 3 --- .../voxel/humanoid_armor_shoulder_manifest.ron | 10 ---------- .../2021-03-02-182544_fix_leather_set/down.sql | 1 + .../2021-03-02-182544_fix_leather_set/up.sql | 12 ++++++++++++ 13 files changed, 25 insertions(+), 108 deletions(-) delete mode 100644 assets/common/items/armor/leather/belt.ron delete mode 100644 assets/common/items/armor/leather/chest.ron delete mode 100644 assets/common/items/armor/leather/foot.ron delete mode 100644 assets/common/items/armor/leather/hand.ron delete mode 100644 assets/common/items/armor/leather/pants.ron delete mode 100644 assets/common/items/armor/leather/shoulder.ron delete mode 100644 assets/voxygen/voxel/armor/leather/shoulder.vox create mode 100644 server/src/migrations/2021-03-02-182544_fix_leather_set/down.sql create mode 100644 server/src/migrations/2021-03-02-182544_fix_leather_set/up.sql diff --git a/assets/common/items/armor/leather/belt.ron b/assets/common/items/armor/leather/belt.ron deleted file mode 100644 index c66a57c9f5..0000000000 --- a/assets/common/items/armor/leather/belt.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Leather Belt", - description: "A belt made from simple leather.", - kind: Armor(( - kind: Belt("Leather"), - stats: ( - protection: Normal(1.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/leather/chest.ron b/assets/common/items/armor/leather/chest.ron deleted file mode 100644 index bb7db69674..0000000000 --- a/assets/common/items/armor/leather/chest.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Leather Cuirass", - description: "A cuirass made of simple leather.", - kind: Armor(( - kind: Chest("Leather"), - stats: ( - protection: Normal(10.0), - poise_resilience: Normal(8.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/leather/foot.ron b/assets/common/items/armor/leather/foot.ron deleted file mode 100644 index 9aaba380b3..0000000000 --- a/assets/common/items/armor/leather/foot.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Leather Boots", - description: "Boots made of simple leather.", - kind: Armor(( - kind: Foot("Leather"), - stats: ( - protection: Normal(2.0), - poise_resilience: Normal(3.0), - ), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/leather/hand.ron b/assets/common/items/armor/leather/hand.ron deleted file mode 100644 index 08d438daa8..0000000000 --- a/assets/common/items/armor/leather/hand.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Leather Gloves", - description: "Gloves made of simple leather.", - kind: Armor(( - kind: Hand("Leather"), - stats: ( - protection: Normal(4.0), - poise_resilience: Normal(5.0), - ), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/leather/pants.ron b/assets/common/items/armor/leather/pants.ron deleted file mode 100644 index fd3131ed53..0000000000 --- a/assets/common/items/armor/leather/pants.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Leather Leg Armour", - description: "Leg armour made of simple leather.", - kind: Armor(( - kind: Pants("Leather"), - stats: ( - protection: Normal(8.0), - poise_resilience: Normal(4.0), - ), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/leather/shoulder.ron b/assets/common/items/armor/leather/shoulder.ron deleted file mode 100644 index c82e4e36ec..0000000000 --- a/assets/common/items/armor/leather/shoulder.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Leather Shoulder Pad", - description: "A simple shoulder pad made of leather.", - kind: Armor(( - kind: Shoulder("Leather"), - stats: ( - protection: Normal(6.0), - poise_resilience: Normal(2.0), - ), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_armor_light.ron b/assets/common/loot_tables/loot_table_armor_light.ron index 6190933029..a782d48a51 100644 --- a/assets/common/loot_tables/loot_table_armor_light.ron +++ b/assets/common/loot_tables/loot_table_armor_light.ron @@ -1,21 +1,21 @@ [ // belts (0.50, "common.items.armor.swift.belt"), - (0.50, "common.items.armor.leather.belt"), + (0.50, "common.items.armor.agile.belt"), // chests (0.50, "common.items.armor.swift.chest"), - (0.50, "common.items.armor.leather.chest"), + (0.50, "common.items.armor.agile.chest"), // shoes (0.50, "common.items.armor.swift.foot"), - (0.50, "common.items.armor.leather.foot"), + (0.50, "common.items.armor.agile.foot"), // pants (0.33, "common.items.armor.swift.pants"), - (0.33, "common.items.armor.leather.pants"), + (0.33, "common.items.armor.agile.pants"), (0.33, "common.items.armor.misc.pants.hunting"), // shoulders (0.10, "common.items.armor.misc.shoulder.leather_strip"), (0.20, "common.items.armor.swift.shoulder"), - (0.20, "common.items.armor.leather.shoulder"), + (0.20, "common.items.armor.agile.shoulder"), (0.20, "common.items.armor.agile.shoulder"), (0.07, "common.items.armor.misc.shoulder.leather_iron_0"), (0.07, "common.items.armor.misc.shoulder.leather_iron_1"), @@ -23,5 +23,5 @@ (0.07, "common.items.armor.misc.shoulder.leather_iron_3"), //gloves (0.50, "common.items.armor.swift.hand"), - (0.50, "common.items.armor.leather.hand"), + (0.50, "common.items.armor.agile.hand"), ] \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index 4acf24d46a..59604236f7 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -42,21 +42,21 @@ //Light Armour // belts (0.50, "common.items.armor.swift.belt"), - (0.50, "common.items.armor.leather.belt"), + (0.50, "common.items.armor.agile.belt"), // chests (0.50, "common.items.armor.swift.chest"), - (0.50, "common.items.armor.leather.chest"), + (0.50, "common.items.armor.agile.chest"), // shoes (0.50, "common.items.armor.swift.foot"), - (0.50, "common.items.armor.leather.foot"), + (0.50, "common.items.armor.agile.foot"), // pants (0.33, "common.items.armor.swift.pants"), - (0.33, "common.items.armor.leather.pants"), + (0.33, "common.items.armor.agile.pants"), (0.33, "common.items.armor.misc.pants.hunting"), // shoulders (0.6, "common.items.armor.misc.shoulder.leather_strip"), (0.4, "common.items.armor.swift.shoulder"), - (0.4, "common.items.armor.leather.shoulder"), + (0.4, "common.items.armor.agile.shoulder"), (0.4, "common.items.armor.misc.shoulder.leather_3"), (0.3, "common.items.armor.misc.shoulder.leather_iron_0"), (0.3, "common.items.armor.misc.shoulder.leather_iron_1"), @@ -64,7 +64,7 @@ (0.3, "common.items.armor.misc.shoulder.leather_iron_3"), //gloves (0.50, "common.items.armor.swift.hand"), - (0.50, "common.items.armor.leather.hand"), + (0.50, "common.items.armor.agile.hand"), //backpack (0.001, "common.items.armor.misc.back.backpack"), (0.1, "common.items.armor.misc.bag.heavy_seabag"), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 256e70decb..b89e10c421 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1257,11 +1257,6 @@ "voxel.armor.swift.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), - //Leather Armor - Armor(Shoulder("Leather")): VoxTrans( - "voxel.armor.leather.shoulder", - (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, - ), //Agile Armor Armor(Chest("Agile")): VoxTrans( "voxel.armor.agile.chest", diff --git a/assets/voxygen/voxel/armor/leather/shoulder.vox b/assets/voxygen/voxel/armor/leather/shoulder.vox deleted file mode 100644 index f71a869b52..0000000000 --- a/assets/voxygen/voxel/armor/leather/shoulder.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae45c34b79a82c97fd8910d22e515df574416f6fd489cfc9e0b3779e1a683b04 -size 1472 diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index b6d950c856..466a795ef9 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -61,16 +61,6 @@ color: None ) ), - "Leather": ( - left: ( - vox_spec: ("armor.leather.shoulder", (-3.6, -4.5, 0.0)), - color: None - ), - right: ( - vox_spec: ("armor.leather.shoulder", (-2.6, -4.5, 0.0)), - color: None - ) - ), "ClothPurple": ( left: ( vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)), diff --git a/server/src/migrations/2021-03-02-182544_fix_leather_set/down.sql b/server/src/migrations/2021-03-02-182544_fix_leather_set/down.sql new file mode 100644 index 0000000000..291a97c5ce --- /dev/null +++ b/server/src/migrations/2021-03-02-182544_fix_leather_set/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-03-02-182544_fix_leather_set/up.sql b/server/src/migrations/2021-03-02-182544_fix_leather_set/up.sql new file mode 100644 index 0000000000..c478b77ddd --- /dev/null +++ b/server/src/migrations/2021-03-02-182544_fix_leather_set/up.sql @@ -0,0 +1,12 @@ +UPDATE item +SET item_definition_id = 'common.items.armor.agile.belt' WHERE item_definition_id = 'common.items.armor.leather.belt'; +UPDATE item +SET item_definition_id = 'common.items.armor.agile.chest' WHERE item_definition_id = 'common.items.armor.leather.chest'; +UPDATE item +SET item_definition_id = 'common.items.armor.agile.foot' WHERE item_definition_id = 'common.items.armor.leather.foot'; +UPDATE item +SET item_definition_id = 'common.items.armor.agile.hand' WHERE item_definition_id = 'common.items.armor.leather.hand'; +UPDATE item +SET item_definition_id = 'common.items.armor.agile.pants' WHERE item_definition_id = 'common.items.armor.leather.pants'; +UPDATE item +SET item_definition_id = 'common.items.armor.agile.shoulder' WHERE item_definition_id = 'common.items.armor.leather.shoulder'; \ No newline at end of file