diff --git a/CHANGELOG.md b/CHANGELOG.md index 741ec8bb67..bcaa5234c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Spawn rtsim wyverns that travel the world, providing dragon scale loot drops - Hardwood in tropical forests, frostwood in cold forests, and iron wood on the top of giant trees - Recipe for shovel, which is used to dig in mud and graves +- Recipe for a new leather pack ### Changed @@ -31,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Capabilities of strikes to parry & block now more reliable - Defensive Disengage now more responsive and can block melee - Deflect no longer parry melee hits +- Changed recipes for some bags to make them more horizontal +- Increase invetory slots on some bags to improve early game experience - Made helmets, necklaces, rings, twig armors and some gliders salvageable - Tweaked stats on some foods so they generally increase a tiny bit more HP diff --git a/assets/common/items/armor/misc/back/backpack.ron b/assets/common/items/armor/misc/back/backpack.ron index 47c8e663af..db1f9da3f7 100644 --- a/assets/common/items/armor/misc/back/backpack.ron +++ b/assets/common/items/armor/misc/back/backpack.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( )), )), - quality: High, + quality: Epic, tags: [Bag], - slots: 18, + slots: 20, ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/bag/heavy_seabag.ron b/assets/common/items/armor/misc/bag/heavy_seabag.ron index 12dbcd7366..35063c9f9b 100644 --- a/assets/common/items/armor/misc/bag/heavy_seabag.ron +++ b/assets/common/items/armor/misc/bag/heavy_seabag.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bag, stats: Direct(()), )), - quality: Moderate, + quality: Epic, tags: [Bag], - slots: 14, + slots: 20, ) diff --git a/assets/common/items/armor/misc/bag/knitted_red_pouch.ron b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron index 4efb5b14dd..066806fc66 100644 --- a/assets/common/items/armor/misc/bag/knitted_red_pouch.ron +++ b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron @@ -7,5 +7,5 @@ ItemDef( )), quality: Moderate, tags: [Bag], - slots: 9, + slots: 10, ) diff --git a/assets/common/items/armor/misc/bag/liana_kit.ron b/assets/common/items/armor/misc/bag/liana_kit.ron index b48d2891f9..161ede06de 100644 --- a/assets/common/items/armor/misc/bag/liana_kit.ron +++ b/assets/common/items/armor/misc/bag/liana_kit.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bag, stats: Direct(()), )), - quality: Moderate, + quality: High, tags: [Bag], - slots: 12, + slots: 15, ) diff --git a/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron index 69e9165cde..98b340986d 100644 --- a/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron +++ b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bag, stats: Direct(()), )), - quality: Epic, + quality: Legendary, tags: [Bag], slots: 27, ) diff --git a/assets/common/items/armor/misc/bag/reliable_backpack.ron b/assets/common/items/armor/misc/bag/reliable_backpack.ron index 6abddec50d..4e3748f735 100644 --- a/assets/common/items/armor/misc/bag/reliable_backpack.ron +++ b/assets/common/items/armor/misc/bag/reliable_backpack.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bag, stats: Direct(()), )), - quality: High, + quality: Epic, tags: [Bag], - slots: 16, + slots: 20, ) diff --git a/assets/common/items/armor/misc/bag/reliable_leather_pack.ron b/assets/common/items/armor/misc/bag/reliable_leather_pack.ron new file mode 100644 index 0000000000..f94a8edf9c --- /dev/null +++ b/assets/common/items/armor/misc/bag/reliable_leather_pack.ron @@ -0,0 +1,11 @@ +ItemDef( + name: "Reliable Leather Pack", + description: "It will never give you up.", + kind: Armor(( + kind: Bag, + stats: Direct(()), + )), + quality: High, + tags: [Bag], + slots: 15, +) diff --git a/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron index b43d4e8e58..d3ceda8b78 100644 --- a/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron +++ b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bag, stats: Direct(()), )), - quality: High, + quality: Epic, tags: [Bag], - slots: 18, + slots: 20, ) diff --git a/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron index 9b3fa3c644..9346ae033b 100644 --- a/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron +++ b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron @@ -6,6 +6,9 @@ ItemDef( stats: Direct(()), )), quality: Common, - tags: [Bag], + tags: [ + Bag, + SalvageInto(Leather, 1), + ], slots: 6, ) diff --git a/assets/common/items/armor/misc/bag/tiny_red_pouch.ron b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron index c867bffb76..5b751b97bf 100644 --- a/assets/common/items/armor/misc/bag/tiny_red_pouch.ron +++ b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron @@ -6,6 +6,9 @@ ItemDef( stats: Direct(()), )), quality: Common, - tags: [Bag], - slots: 3, + tags: [ + Bag, + SalvageInto(RedLinen, 1) + ], + slots: 6, ) diff --git a/assets/common/items/armor/misc/bag/troll_hide_pack.ron b/assets/common/items/armor/misc/bag/troll_hide_pack.ron index 9e421561d7..a9581f8a34 100644 --- a/assets/common/items/armor/misc/bag/troll_hide_pack.ron +++ b/assets/common/items/armor/misc/bag/troll_hide_pack.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bag, stats: Direct(()), )), - quality: High, + quality: Epic, tags: [Bag], - slots: 18, + slots: 20, ) diff --git a/assets/common/items/armor/misc/bag/woven_red_bag.ron b/assets/common/items/armor/misc/bag/woven_red_bag.ron index 913aa42fd9..cfd06ee040 100644 --- a/assets/common/items/armor/misc/bag/woven_red_bag.ron +++ b/assets/common/items/armor/misc/bag/woven_red_bag.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bag, stats: Direct(()), )), - quality: Moderate, + quality: High, tags: [Bag], slots: 15, ) diff --git a/assets/common/loot_tables/creature/biped_large/saurok.ron b/assets/common/loot_tables/creature/biped_large/saurok.ron index b2a454c9be..368b2b5ad0 100644 --- a/assets/common/loot_tables/creature/biped_large/saurok.ron +++ b/assets/common/loot_tables/creature/biped_large/saurok.ron @@ -9,8 +9,8 @@ // Utility (0.1, Item("common.items.utility.collar")), // Bag - (0.1, Item("common.items.armor.misc.bag.liana_kit")), + (0.5, Item("common.items.armor.misc.bag.liana_kit")), // Food - (2.0, LootTable("common.loot_tables.food.wild_ingredients")), + (1.5, LootTable("common.loot_tables.food.wild_ingredients")), (1.5, LootTable("common.loot_tables.food.prepared")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/sahagin/boss.ron b/assets/common/loot_tables/dungeon/sahagin/boss.ron index bab0bb5fc3..2d681adfdb 100644 --- a/assets/common/loot_tables/dungeon/sahagin/boss.ron +++ b/assets/common/loot_tables/dungeon/sahagin/boss.ron @@ -6,6 +6,5 @@ // Misc (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")), // Special Loot - (1.0, Item("common.items.armor.misc.bag.heavy_seabag")), (0.5, Item("common.items.glider.moonrise")), ] diff --git a/assets/common/loot_tables/dungeon/sea_chapel/dagon.ron b/assets/common/loot_tables/dungeon/sea_chapel/dagon.ron index ea36563ea1..4fe7e49da1 100644 --- a/assets/common/loot_tables/dungeon/sea_chapel/dagon.ron +++ b/assets/common/loot_tables/dungeon/sea_chapel/dagon.ron @@ -1,4 +1,6 @@ [ - (1.0, Item("common.items.crafting_ing.abyssal_heart")), - (1.0, MultiDrop(Item("common.items.crafting_ing.pearl"), 3, 5)), + (3.0, Item("common.items.crafting_ing.abyssal_heart")), + (3.0, MultiDrop(Item("common.items.crafting_ing.pearl"), 3, 5)), + (3.0, MultiDrop(Item("common.items.crafting_ing.brinestone"), 3, 6)), + (1.0, Item("common.items.armor.misc.bag.heavy_seabag")), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 76b06606ad..8769572d34 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -1760,6 +1760,16 @@ ], craft_sprite: None, ), + "reliable_leather_pack": ( + output: ("common.items.armor.misc.bag.reliable_leather_pack", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 3, false), + (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2, false), + (Item("common.items.mineral.ingot.iron"), 1, false), + (Item("common.items.crafting_tools.sewing_set"), 0, false), + ], + craft_sprite: None, + ), "woven_red_bag": ( output: ("common.items.armor.misc.bag.woven_red_bag", 1), inputs: [ @@ -1772,11 +1782,11 @@ "traveler_backpack": ( output: ("common.items.armor.misc.back.backpack", 1), inputs: [ - (Item("common.items.mineral.gem.diamond"), 2, false), - (Item("common.items.crafting_ing.twigs"), 2, false), - (Item("common.items.crafting_ing.cloth.silk"), 4, false), - (Item("common.items.crafting_ing.leather.simple_leather"), 3, false), + (Item("common.items.crafting_ing.leather.rigid_leather"), 4, false), + (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2, false), + (Item("common.items.mineral.gem.diamond"), 2, false), + (Item("common.items.mineral.ingot.iron"), 1, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], craft_sprite: Some(CraftingBench), @@ -1786,7 +1796,7 @@ inputs: [ (Item("common.items.mineral.gem.amethyst"), 2, false), (Item("common.items.crafting_ing.cloth.linen_red"), 3, false), - (Item("common.items.crafting_ing.leather.thick_leather"), 6, false), + (Item("common.items.crafting_ing.cloth.silk"), 6, false), (Item("common.items.armor.misc.bag.woven_red_bag"), 1, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], @@ -1795,8 +1805,8 @@ "troll_hide_pack": ( output: ("common.items.armor.misc.bag.troll_hide_pack", 1), inputs: [ - (Item("common.items.crafting_ing.hide.leather_troll"), 10, false), - (Item("common.items.crafting_ing.leather.simple_leather"), 3, false), + (Item("common.items.crafting_ing.hide.leather_troll"), 6, false), + (Item("common.items.crafting_ing.leather.rigid_leather"), 2, false), (Item("common.items.mineral.gem.diamond"), 1, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], @@ -1808,7 +1818,7 @@ (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1, false), (Item("common.items.crafting_ing.leather.rigid_leather"), 8, false), (Item("common.items.mineral.gem.diamond"), 4, false), - (Item("common.items.mineral.ore.veloritefrag"), 10, false), + (Item("common.items.crafting_ing.cloth.moonweave"), 10, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], craft_sprite: None, diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index e5b559cee5..e0f1c82447 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -3134,6 +3134,10 @@ "voxel.armor.misc.bag.reliable_backpack", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), + Simple("common.items.armor.misc.bag.reliable_leather_pack"): VoxTrans( + "voxel.armor.misc.bag.reliable_leather_pack", + (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, + ), Simple("common.items.armor.misc.bag.liana_kit"): VoxTrans( "voxel.armor.misc.bag.liana_kit", (0.5, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, diff --git a/assets/voxygen/voxel/armor/misc/bag/reliable_leather_pack.vox b/assets/voxygen/voxel/armor/misc/bag/reliable_leather_pack.vox new file mode 100644 index 0000000000..3318faa40f --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/bag/reliable_leather_pack.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8090fc16ece67be7cbef910e827ab31389f976f44341a98f5fea63011e6caae +size 3420 diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index d6e55f7fcc..87e44fcdff 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -793,6 +793,7 @@ Simple("common.items.armor.misc.bag.mindflayer_spellbag"): "voxel.armor.misc.bag.mindflayer_spellbag", Simple("common.items.armor.misc.bag.troll_hide_pack"): "voxel.armor.misc.bag.troll_hide_pack", Simple("common.items.armor.misc.bag.reliable_backpack"): "voxel.armor.misc.bag.reliable_backpack", + Simple("common.items.armor.misc.bag.reliable_leather_pack"): "voxel.armor.misc.bag.reliable_leather_pack", Simple("common.items.armor.misc.bag.liana_kit"): "voxel.armor.misc.bag.liana_kit", Simple("common.items.armor.misc.bag.tiny_leather_pouch"): "voxel.armor.misc.bag.tiny_leather_pouch", Simple("common.items.armor.misc.bag.sturdy_red_backpack"): "voxel.armor.misc.bag.sturdy_red_backpack",