From 7dcee3eb232451c4053328e0f5c98ab5f0c0cbf1 Mon Sep 17 00:00:00 2001 From: Chase Rozon Date: Thu, 19 May 2022 22:46:31 +0000 Subject: [PATCH] Multiple Balance Tweaks & Miscellaneous Changes --- assets/common/entity/wild/aggressive/wolf.ron | 2 +- assets/common/entity/wild/peaceful/cattle.ron | 2 +- .../common/entity/wild/peaceful/highland.ron | 2 +- assets/common/entity/wild/peaceful/rat.ron | 2 +- .../entity/wild/peaceful/river_salamander.ron | 2 +- .../common/entity/wild/peaceful/squirrel.ron | 2 +- assets/common/entity/wild/peaceful/yak.ron | 2 +- .../common/items/armor/hide/carapace/back.ron | 2 +- .../common/items/armor/hide/carapace/belt.ron | 2 +- .../items/armor/hide/carapace/chest.ron | 2 +- .../common/items/armor/hide/carapace/foot.ron | 2 +- .../common/items/armor/hide/carapace/hand.ron | 2 +- .../items/armor/hide/carapace/pants.ron | 2 +- .../items/armor/hide/carapace/shoulder.ron | 2 +- .../items/armor/hide/dragonscale/back.ron | 2 +- .../items/armor/hide/dragonscale/belt.ron | 2 +- .../items/armor/hide/dragonscale/chest.ron | 2 +- .../items/armor/hide/dragonscale/foot.ron | 2 +- .../items/armor/hide/dragonscale/hand.ron | 2 +- .../items/armor/hide/dragonscale/pants.ron | 2 +- .../items/armor/hide/dragonscale/shoulder.ron | 2 +- .../common/items/armor/hide/rawhide/back.ron | 2 +- .../common/items/armor/hide/rawhide/belt.ron | 2 +- .../common/items/armor/hide/rawhide/chest.ron | 2 +- .../common/items/armor/hide/rawhide/foot.ron | 2 +- .../common/items/armor/hide/rawhide/hand.ron | 2 +- .../common/items/armor/hide/rawhide/pants.ron | 2 +- .../items/armor/hide/rawhide/shoulder.ron | 2 +- assets/common/items/armor/hide/scale/back.ron | 2 +- assets/common/items/armor/hide/scale/belt.ron | 2 +- .../common/items/armor/hide/scale/chest.ron | 2 +- assets/common/items/armor/hide/scale/foot.ron | 2 +- assets/common/items/armor/hide/scale/hand.ron | 2 +- .../common/items/armor/hide/scale/pants.ron | 2 +- .../items/armor/hide/scale/shoulder.ron | 2 +- .../items/armor/mail/orichalcum/back.ron | 2 +- .../items/armor/mail/orichalcum/belt.ron | 2 +- .../items/armor/mail/orichalcum/chest.ron | 2 +- .../items/armor/mail/orichalcum/foot.ron | 2 +- .../items/armor/mail/orichalcum/hand.ron | 2 +- .../items/armor/mail/orichalcum/pants.ron | 2 +- .../items/armor/mail/orichalcum/shoulder.ron | 2 +- assets/common/items/armor/merchant/turban.ron | 8 +++--- .../common/items/armor/misc/back/backpack.ron | 2 +- .../armor/misc/bag/knitted_red_pouch.ron | 2 +- .../armor/misc/bag/sturdy_red_backpack.ron | 2 +- .../armor/misc/bag/tiny_leather_pouch.ron | 4 +-- .../items/armor/misc/bag/tiny_red_pouch.ron | 2 +- .../items/armor/misc/bag/troll_hide_pack.ron | 2 +- .../items/armor/misc/bag/woven_red_bag.ron | 2 +- .../common/items/armor/misc/foot/sandals.ron | 2 +- .../items/armor/misc/head/bandana/red.ron | 2 +- assets/common/items/armor/misc/head/crown.ron | 4 +-- .../common/items/armor/misc/head/headband.ron | 2 +- .../common/items/armor/misc/head/hog_hood.ron | 7 +++-- assets/common/items/armor/misc/head/mitre.ron | 5 ++-- .../items/armor/misc/head/spikeguard.ron | 7 +++-- assets/common/items/armor/misc/head/straw.ron | 4 +-- .../items/armor/misc/head/wanderers_hat.ron | 9 +++---- .../items/armor/misc/head/winged_coronet.ron | 8 +++--- .../items/armor/misc/neck/haniwa_talisman.ron | 2 +- .../armor/misc/neck/honeycomb_pendant.ron | 6 ++--- .../armor/misc/neck/pendant_of_protection.ron | 4 +-- .../items/armor/misc/neck/scratched.ron | 2 +- assets/common/items/armor/misc/neck/topaz.ron | 6 ++--- assets/common/items/armor/pirate/hat.ron | 4 +-- assets/common/items/consumable/potion_big.ron | 2 +- assets/common/items/consumable/potion_med.ron | 2 +- .../common/items/consumable/potion_minor.ron | 2 +- .../items/crafting_ing/animal_misc/bone.ron | 2 +- .../crafting_ing/animal_misc/lively_vine.ron | 2 +- .../animal_misc/raptor_feather.ron | 2 +- assets/common/items/crafting_ing/cactus.ron | 2 +- .../items/crafting_ing/cloth/lifecloth.ron | 2 +- .../common/items/crafting_ing/empty_vial.ron | 2 +- .../items/crafting_ing/hide/animal_hide.ron | 2 +- .../items/crafting_ing/hide/carapace.ron | 2 +- .../items/crafting_ing/hide/dragon_scale.ron | 2 +- .../items/crafting_ing/hide/rugged_hide.ron | 2 +- .../common/items/crafting_ing/hide/scales.ron | 2 +- .../items/crafting_ing/hide/tough_hide.ron | 2 +- assets/common/items/crafting_ing/honey.ron | 2 +- assets/common/items/crafting_ing/rock.ron | 2 +- assets/common/items/crafting_ing/stones.ron | 2 +- assets/common/items/crafting_ing/twigs.ron | 2 +- .../items/crafting_tools/mortar_pestle.ron | 2 +- assets/common/items/flowers/moonbell.ron | 2 +- assets/common/items/food/cheese.ron | 2 +- assets/common/items/food/coconut.ron | 2 +- assets/common/items/food/tomato.ron | 2 +- assets/common/items/glider/cloverleaf.ron | 2 +- assets/common/items/glider/sandraptor.ron | 2 +- assets/common/items/glider/snowraptor.ron | 2 +- assets/common/items/glider/woodraptor.ron | 2 +- assets/common/items/lantern/black_0.ron | 2 +- assets/common/items/lantern/geode_purp.ron | 2 +- .../common/items/mineral/ingot/bloodsteel.ron | 2 +- .../common/items/mineral/ore/bloodstone.ron | 2 +- assets/common/items/mineral/ore/velorite.ron | 2 +- .../common/items/mineral/ore/veloritefrag.ron | 2 +- assets/common/items/mineral/stone/basalt.ron | 2 +- assets/common/items/mineral/stone/coal.ron | 2 +- assets/common/items/mineral/stone/granite.ron | 2 +- .../common/items/mineral/stone/obsidian.ron | 2 +- assets/common/items/utility/bomb.ron | 2 +- assets/common/items/utility/coins.ron | 2 +- assets/common/items/utility/collar.ron | 2 +- assets/common/items/weapons/sword/starter.ron | 2 +- .../common/items/weapons/sword_1h/starter.ron | 2 +- .../loot_tables/creature/quad_low/elbst.ron | 5 ++++ .../creature/quad_low/salamander.ron | 2 +- .../creature/quad_medium/cattle.ron | 4 +++ .../creature/quad_medium/highland.ron | 5 ++++ .../loot_tables/creature/quad_medium/wolf.ron | 5 ++++ .../loot_tables/creature/quad_medium/yak.ron | 4 +++ .../creature/quad_small/rodent.ron | 5 ++++ .../loot_tables/dungeon/tier-0/chieftain.ron | 2 +- assets/common/loot_tables/spots/bandit.ron | 18 ++++++------- assets/common/loot_tables/spots/pirate.ron | 6 ++--- assets/common/loot_tables/sprite/crate.ron | 6 ++--- assets/common/recipe_book.ron | 16 ++++++------ .../voxygen/voxel/armor/misc/head/mitre.vox | 4 +-- .../voxel/armor/misc/head/spikeguard.vox | 4 +-- .../voxel/humanoid_armor_head_manifest.ron | 26 +++++++++---------- 124 files changed, 202 insertions(+), 178 deletions(-) create mode 100644 assets/common/loot_tables/creature/quad_low/elbst.ron create mode 100644 assets/common/loot_tables/creature/quad_medium/cattle.ron create mode 100644 assets/common/loot_tables/creature/quad_medium/highland.ron create mode 100644 assets/common/loot_tables/creature/quad_medium/wolf.ron create mode 100644 assets/common/loot_tables/creature/quad_medium/yak.ron create mode 100644 assets/common/loot_tables/creature/quad_small/rodent.ron diff --git a/assets/common/entity/wild/aggressive/wolf.ron b/assets/common/entity/wild/aggressive/wolf.ron index 9ab1563aa9..0b0416f893 100644 --- a/assets/common/entity/wild/aggressive/wolf.ron +++ b/assets/common/entity/wild/aggressive/wolf.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("wolf"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.quad_medium.fanged"), + loot: LootTable("common.loot_tables.creature.quad_medium.wolf"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/peaceful/cattle.ron b/assets/common/entity/wild/peaceful/cattle.ron index f5acba5d22..9893f746f5 100644 --- a/assets/common/entity/wild/peaceful/cattle.ron +++ b/assets/common/entity/wild/peaceful/cattle.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("cattle"), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), + loot: LootTable("common.loot_tables.creature.quad_medium.cattle"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/peaceful/highland.ron b/assets/common/entity/wild/peaceful/highland.ron index 6e4164ac1a..8eebd69e76 100644 --- a/assets/common/entity/wild/peaceful/highland.ron +++ b/assets/common/entity/wild/peaceful/highland.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("highland"), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), + loot: LootTable("common.loot_tables.creature.quad_medium.highland"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/peaceful/rat.ron b/assets/common/entity/wild/peaceful/rat.ron index b07c636c33..ea10580706 100644 --- a/assets/common/entity/wild/peaceful/rat.ron +++ b/assets/common/entity/wild/peaceful/rat.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("rat"), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_small.generic"), + loot: LootTable("common.loot_tables.creature.quad_small.rodent"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/peaceful/river_salamander.ron b/assets/common/entity/wild/peaceful/river_salamander.ron index c12aa35c47..45aff740fb 100644 --- a/assets/common/entity/wild/peaceful/river_salamander.ron +++ b/assets/common/entity/wild/peaceful/river_salamander.ron @@ -6,7 +6,7 @@ body_type: Female, ))), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_low.salamander"), + loot: LootTable("common.loot_tables.creature.quad_low.elbst"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/peaceful/squirrel.ron b/assets/common/entity/wild/peaceful/squirrel.ron index 03c721b685..606ebde5cb 100644 --- a/assets/common/entity/wild/peaceful/squirrel.ron +++ b/assets/common/entity/wild/peaceful/squirrel.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("squirrel"), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_small.generic"), + loot: LootTable("common.loot_tables.creature.quad_small.rodent"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/peaceful/yak.ron b/assets/common/entity/wild/peaceful/yak.ron index f90b59c36c..02aaaa0989 100644 --- a/assets/common/entity/wild/peaceful/yak.ron +++ b/assets/common/entity/wild/peaceful/yak.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("yak"), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), + loot: LootTable("common.loot_tables.creature.quad_medium.yak"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/items/armor/hide/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron index bddb23d28a..bf409190ca 100644 --- a/assets/common/items/armor/hide/carapace/back.ron +++ b/assets/common/items/armor/hide/carapace/back.ron @@ -1,6 +1,6 @@ ItemDef( name: "Carapace Cape", - description: "Shell that once shielded a beast.", + description: "Made from the shell that once shielded a beast.", kind: Armor(( kind: Back, stats: ( diff --git a/assets/common/items/armor/hide/carapace/belt.ron b/assets/common/items/armor/hide/carapace/belt.ron index a2f64cc10e..ced5190a65 100644 --- a/assets/common/items/armor/hide/carapace/belt.ron +++ b/assets/common/items/armor/hide/carapace/belt.ron @@ -1,6 +1,6 @@ ItemDef( name: "Carapace Belt", - description: "Shell that once shielded a beast.", + description: "Made from the shell that once shielded a beast.", kind: Armor(( kind: Belt, stats: ( diff --git a/assets/common/items/armor/hide/carapace/chest.ron b/assets/common/items/armor/hide/carapace/chest.ron index 3ab1bb99e0..a70dae5758 100644 --- a/assets/common/items/armor/hide/carapace/chest.ron +++ b/assets/common/items/armor/hide/carapace/chest.ron @@ -1,6 +1,6 @@ ItemDef( name: "Carapace Cuirass", - description: "Shell that once shielded a beast.", + description: "Made from the shell that once shielded a beast.", kind: Armor(( kind: Chest, stats: ( diff --git a/assets/common/items/armor/hide/carapace/foot.ron b/assets/common/items/armor/hide/carapace/foot.ron index 1cccf90d09..9cf5f29847 100644 --- a/assets/common/items/armor/hide/carapace/foot.ron +++ b/assets/common/items/armor/hide/carapace/foot.ron @@ -1,6 +1,6 @@ ItemDef( name: "Carapace Treads", - description: "Shell that once shielded a beast.", + description: "Made from the shell that once shielded a beast.", kind: Armor(( kind: Foot, stats: ( diff --git a/assets/common/items/armor/hide/carapace/hand.ron b/assets/common/items/armor/hide/carapace/hand.ron index 6d82c45aa0..fc51b424da 100644 --- a/assets/common/items/armor/hide/carapace/hand.ron +++ b/assets/common/items/armor/hide/carapace/hand.ron @@ -1,6 +1,6 @@ ItemDef( name: "Carapace Grips", - description: "Shell that once shielded a beast.", + description: "Made from the shell that once shielded a beast.", kind: Armor(( kind: Hand, stats: ( diff --git a/assets/common/items/armor/hide/carapace/pants.ron b/assets/common/items/armor/hide/carapace/pants.ron index 0465cd63b6..bc810a5033 100644 --- a/assets/common/items/armor/hide/carapace/pants.ron +++ b/assets/common/items/armor/hide/carapace/pants.ron @@ -1,6 +1,6 @@ ItemDef( name: "Carapace Leggings", - description: "Shell that once shielded a beast.", + description: "Made from the shell that once shielded a beast.", kind: Armor(( kind: Pants, stats: ( diff --git a/assets/common/items/armor/hide/carapace/shoulder.ron b/assets/common/items/armor/hide/carapace/shoulder.ron index 8f7966b750..b305dace7d 100644 --- a/assets/common/items/armor/hide/carapace/shoulder.ron +++ b/assets/common/items/armor/hide/carapace/shoulder.ron @@ -1,6 +1,6 @@ ItemDef( name: "Carapace Shoulderpads", - description: "Shell that once shielded a beast.", + description: "Made from the shell that once shielded a beast.", kind: Armor(( kind: Shoulder, stats: ( diff --git a/assets/common/items/armor/hide/dragonscale/back.ron b/assets/common/items/armor/hide/dragonscale/back.ron index 57fa4aead4..c0a0e654b2 100644 --- a/assets/common/items/armor/hide/dragonscale/back.ron +++ b/assets/common/items/armor/hide/dragonscale/back.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dragonscale Cape", - description: "Power pulses through it.", + description: "Crafted from the scales of a legendary creature, power can be felt pulsing through it.", kind: Armor(( kind: Back, stats: ( diff --git a/assets/common/items/armor/hide/dragonscale/belt.ron b/assets/common/items/armor/hide/dragonscale/belt.ron index c7f5e2383f..723b552d7a 100644 --- a/assets/common/items/armor/hide/dragonscale/belt.ron +++ b/assets/common/items/armor/hide/dragonscale/belt.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dragonscale Sash", - description: "Power pulses through it.", + description: "Crafted from the scales of a legendary creature, power can be felt pulsing through it.", kind: Armor(( kind: Belt, stats: ( diff --git a/assets/common/items/armor/hide/dragonscale/chest.ron b/assets/common/items/armor/hide/dragonscale/chest.ron index ddd343d6c8..fdf6cd64b3 100644 --- a/assets/common/items/armor/hide/dragonscale/chest.ron +++ b/assets/common/items/armor/hide/dragonscale/chest.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dragonscale Chestplate", - description: "Power pulses through it.", + description: "Crafted from the scales of a legendary creature, power can be felt pulsing through it.", kind: Armor(( kind: Chest, stats: ( diff --git a/assets/common/items/armor/hide/dragonscale/foot.ron b/assets/common/items/armor/hide/dragonscale/foot.ron index aeb9b9a4c6..8153c83f96 100644 --- a/assets/common/items/armor/hide/dragonscale/foot.ron +++ b/assets/common/items/armor/hide/dragonscale/foot.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dragonscale Spurs", - description: "Power pulses through it.", + description: "Crafted from the scales of a legendary creature, power can be felt pulsing through it.", kind: Armor(( kind: Foot, stats: ( diff --git a/assets/common/items/armor/hide/dragonscale/hand.ron b/assets/common/items/armor/hide/dragonscale/hand.ron index c6bbe4ad85..c62d11a6a3 100644 --- a/assets/common/items/armor/hide/dragonscale/hand.ron +++ b/assets/common/items/armor/hide/dragonscale/hand.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dragonscale Gloves", - description: "Power pulses through it.", + description: "Crafted from the scales of a legendary creature, power can be felt pulsing through it.", kind: Armor(( kind: Hand, stats: ( diff --git a/assets/common/items/armor/hide/dragonscale/pants.ron b/assets/common/items/armor/hide/dragonscale/pants.ron index c7b8091b65..188102448a 100644 --- a/assets/common/items/armor/hide/dragonscale/pants.ron +++ b/assets/common/items/armor/hide/dragonscale/pants.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dragonscale Leggings", - description: "Power pulses through it.", + description: "Crafted from the scales of a legendary creature, power can be felt pulsing through it.", kind: Armor(( kind: Pants, stats: ( diff --git a/assets/common/items/armor/hide/dragonscale/shoulder.ron b/assets/common/items/armor/hide/dragonscale/shoulder.ron index 1f8a549d6e..63f7256c49 100644 --- a/assets/common/items/armor/hide/dragonscale/shoulder.ron +++ b/assets/common/items/armor/hide/dragonscale/shoulder.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dragonscale Mantle", - description: "Power pulses through it.", + description: "Crafted from the scales of a legendary creature, power can be felt pulsing through it.", kind: Armor(( kind: Shoulder, stats: ( diff --git a/assets/common/items/armor/hide/rawhide/back.ron b/assets/common/items/armor/hide/rawhide/back.ron index 75adb70ffc..8a2e4249dc 100644 --- a/assets/common/items/armor/hide/rawhide/back.ron +++ b/assets/common/items/armor/hide/rawhide/back.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rawhide Cloak", - description: "'Tightly packed pieces of leather to endure all weather.'", + description: "Tightly packed pieces of leather. Light-weight and sturdy!", kind: Armor(( kind: Back, stats: ( diff --git a/assets/common/items/armor/hide/rawhide/belt.ron b/assets/common/items/armor/hide/rawhide/belt.ron index 2fbb18ff2c..cff903dc18 100644 --- a/assets/common/items/armor/hide/rawhide/belt.ron +++ b/assets/common/items/armor/hide/rawhide/belt.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rawhide Belt", - description: "'Tightly packed pieces of leather to endure all weather.'", + description: "Tightly packed pieces of leather. Light-weight and sturdy!", kind: Armor(( kind: Belt, stats: ( diff --git a/assets/common/items/armor/hide/rawhide/chest.ron b/assets/common/items/armor/hide/rawhide/chest.ron index aee0ae54ae..de9acc653a 100644 --- a/assets/common/items/armor/hide/rawhide/chest.ron +++ b/assets/common/items/armor/hide/rawhide/chest.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rawhide Chestpiece", - description: "Tightly packed pieces of leather to endure all weather.", + description: "Tightly packed pieces of leather. Light-weight and sturdy!", kind: Armor(( kind: Chest, stats: ( diff --git a/assets/common/items/armor/hide/rawhide/foot.ron b/assets/common/items/armor/hide/rawhide/foot.ron index 84b3fee668..5a1ebb8d19 100644 --- a/assets/common/items/armor/hide/rawhide/foot.ron +++ b/assets/common/items/armor/hide/rawhide/foot.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rawhide Shoes", - description: "'Tightly packed pieces of leather to endure all weather.", + description: "Tightly packed pieces of leather. Light-weight and sturdy!", kind: Armor(( kind: Foot, stats: ( diff --git a/assets/common/items/armor/hide/rawhide/hand.ron b/assets/common/items/armor/hide/rawhide/hand.ron index 9a808db868..d039162e12 100644 --- a/assets/common/items/armor/hide/rawhide/hand.ron +++ b/assets/common/items/armor/hide/rawhide/hand.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rawhide Bracers", - description: "'Tightly packed pieces of leather to endure all weather.'", + description: "Tightly packed pieces of leather. Light-weight and sturdy!", kind: Armor(( kind: Hand, stats: ( diff --git a/assets/common/items/armor/hide/rawhide/pants.ron b/assets/common/items/armor/hide/rawhide/pants.ron index 823f3a50ca..4721844289 100644 --- a/assets/common/items/armor/hide/rawhide/pants.ron +++ b/assets/common/items/armor/hide/rawhide/pants.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rawhide Pants", - description: "'Tightly packed pieces of leather to endure all weather.'", + description: "Tightly packed pieces of leather. Light-weight and sturdy!", kind: Armor(( kind: Pants, stats: ( diff --git a/assets/common/items/armor/hide/rawhide/shoulder.ron b/assets/common/items/armor/hide/rawhide/shoulder.ron index c7b1b8acac..1f224706a4 100644 --- a/assets/common/items/armor/hide/rawhide/shoulder.ron +++ b/assets/common/items/armor/hide/rawhide/shoulder.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rawhide Shoulderpads", - description: "Tightly packed pieces of leather to endure all weather.", + description: "Tightly packed pieces of leather. Light-weight and sturdy!", kind: Armor(( kind: Shoulder, stats: ( diff --git a/assets/common/items/armor/hide/scale/back.ron b/assets/common/items/armor/hide/scale/back.ron index cc16a88c73..70f4a4c797 100644 --- a/assets/common/items/armor/hide/scale/back.ron +++ b/assets/common/items/armor/hide/scale/back.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scale Cape", - description: "Each embedded scale provides protection.", + description: "Each embedded scale provides additional protection.", kind: Armor(( kind: Back, stats: ( diff --git a/assets/common/items/armor/hide/scale/belt.ron b/assets/common/items/armor/hide/scale/belt.ron index 4bbb718348..5f89b47c5a 100644 --- a/assets/common/items/armor/hide/scale/belt.ron +++ b/assets/common/items/armor/hide/scale/belt.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scale Girdle", - description: "Each embedded scale provides protection.", + description: "Each embedded scale provides additional protection.", kind: Armor(( kind: Belt, stats: ( diff --git a/assets/common/items/armor/hide/scale/chest.ron b/assets/common/items/armor/hide/scale/chest.ron index bdd1f191e0..429d1e3b9c 100644 --- a/assets/common/items/armor/hide/scale/chest.ron +++ b/assets/common/items/armor/hide/scale/chest.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scale Chestpiece", - description: "Each embedded scale provides protection.", + description: "Each embedded scale provides additional protection.", kind: Armor(( kind: Chest, stats: ( diff --git a/assets/common/items/armor/hide/scale/foot.ron b/assets/common/items/armor/hide/scale/foot.ron index 40b93f97b0..12d59c852c 100644 --- a/assets/common/items/armor/hide/scale/foot.ron +++ b/assets/common/items/armor/hide/scale/foot.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scale Sabatons", - description: "Each embedded scale provides protection.", + description: "Each embedded scale provides additional protection.", kind: Armor(( kind: Foot, stats: ( diff --git a/assets/common/items/armor/hide/scale/hand.ron b/assets/common/items/armor/hide/scale/hand.ron index 4f9f76046e..60b87f77a6 100644 --- a/assets/common/items/armor/hide/scale/hand.ron +++ b/assets/common/items/armor/hide/scale/hand.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scale Fists", - description: "Each embedded scale provides protection.", + description: "Each embedded scale provides additional protection.", kind: Armor(( kind: Hand, stats: ( diff --git a/assets/common/items/armor/hide/scale/pants.ron b/assets/common/items/armor/hide/scale/pants.ron index 7789c77fea..ddb2830034 100644 --- a/assets/common/items/armor/hide/scale/pants.ron +++ b/assets/common/items/armor/hide/scale/pants.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scale Leggings", - description: "Each embedded scale provides protection.", + description: "Each embedded scale provides additional protection.", kind: Armor(( kind: Pants, stats: ( diff --git a/assets/common/items/armor/hide/scale/shoulder.ron b/assets/common/items/armor/hide/scale/shoulder.ron index b394b5820a..8c3b210499 100644 --- a/assets/common/items/armor/hide/scale/shoulder.ron +++ b/assets/common/items/armor/hide/scale/shoulder.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scale Shoulderguards", - description: "Each embedded scale provides protection.", + description: "Each embedded scale provides additional protection.", kind: Armor(( kind: Shoulder, stats: ( diff --git a/assets/common/items/armor/mail/orichalcum/back.ron b/assets/common/items/armor/mail/orichalcum/back.ron index e5a9fb3537..e50c57ba06 100644 --- a/assets/common/items/armor/mail/orichalcum/back.ron +++ b/assets/common/items/armor/mail/orichalcum/back.ron @@ -1,6 +1,6 @@ ItemDef( name: "Orichalcum Cape", - description: "An ancient alloy. Myths remain of heroes who wore this metal.", + description: "An ancient alloy. Myths remain of heroes who once wore this metal.", kind: Armor(( kind: Back, stats: ( diff --git a/assets/common/items/armor/mail/orichalcum/belt.ron b/assets/common/items/armor/mail/orichalcum/belt.ron index 466136db08..8db21e0fae 100644 --- a/assets/common/items/armor/mail/orichalcum/belt.ron +++ b/assets/common/items/armor/mail/orichalcum/belt.ron @@ -1,6 +1,6 @@ ItemDef( name: "Orichalcum Belt", - description: "An ancient alloy. Myths remain of heroes who wore this metal.", + description: "An ancient alloy. Myths remain of heroes who once wore this metal.", kind: Armor(( kind: Belt, stats: ( diff --git a/assets/common/items/armor/mail/orichalcum/chest.ron b/assets/common/items/armor/mail/orichalcum/chest.ron index 9b5b8130e3..78c687b24b 100644 --- a/assets/common/items/armor/mail/orichalcum/chest.ron +++ b/assets/common/items/armor/mail/orichalcum/chest.ron @@ -1,6 +1,6 @@ ItemDef( name: "Orichalcum Chestguard", - description: "An ancient alloy. Myths remain of heroes who wore this metal.", + description: "An ancient alloy. Myths remain of heroes who once wore this metal.", kind: Armor(( kind: Chest, stats: ( diff --git a/assets/common/items/armor/mail/orichalcum/foot.ron b/assets/common/items/armor/mail/orichalcum/foot.ron index 21a20435db..e77f4ac9c2 100644 --- a/assets/common/items/armor/mail/orichalcum/foot.ron +++ b/assets/common/items/armor/mail/orichalcum/foot.ron @@ -1,6 +1,6 @@ ItemDef( name: "Orichalcum Warboots", - description: "An ancient alloy. Myths remain of heroes who wore this metal.", + description: "An ancient alloy. Myths remain of heroes who once wore this metal.", kind: Armor(( kind: Foot, stats: ( diff --git a/assets/common/items/armor/mail/orichalcum/hand.ron b/assets/common/items/armor/mail/orichalcum/hand.ron index 12ef25e47a..58ad679c34 100644 --- a/assets/common/items/armor/mail/orichalcum/hand.ron +++ b/assets/common/items/armor/mail/orichalcum/hand.ron @@ -1,6 +1,6 @@ ItemDef( name: "Orichalcum Gloves", - description: "An ancient alloy. Myths remain of heroes who wore this metal.", + description: "An ancient alloy. Myths remain of heroes who once wore this metal.", kind: Armor(( kind: Hand, stats: ( diff --git a/assets/common/items/armor/mail/orichalcum/pants.ron b/assets/common/items/armor/mail/orichalcum/pants.ron index 7bce407f49..faf4dcc4fd 100644 --- a/assets/common/items/armor/mail/orichalcum/pants.ron +++ b/assets/common/items/armor/mail/orichalcum/pants.ron @@ -1,6 +1,6 @@ ItemDef( name: "Orichalcum Legplates", - description: "An ancient alloy. Myths remain of heroes who wore this metal.", + description: "An ancient alloy. Myths remain of heroes who once wore this metal.", kind: Armor(( kind: Pants, stats: ( diff --git a/assets/common/items/armor/mail/orichalcum/shoulder.ron b/assets/common/items/armor/mail/orichalcum/shoulder.ron index 5e9d5d772f..3c8bc8378a 100644 --- a/assets/common/items/armor/mail/orichalcum/shoulder.ron +++ b/assets/common/items/armor/mail/orichalcum/shoulder.ron @@ -1,6 +1,6 @@ ItemDef( name: "Orichalcum Mantle", - description: "An ancient alloy. Myths remain of heroes who wore this armor.", + description: "An ancient alloy. Myths remain of heroes who once wore this armor.", kind: Armor(( kind: Shoulder, stats: ( diff --git a/assets/common/items/armor/merchant/turban.ron b/assets/common/items/armor/merchant/turban.ron index a9954c3c24..2d0902812b 100644 --- a/assets/common/items/armor/merchant/turban.ron +++ b/assets/common/items/armor/merchant/turban.ron @@ -1,13 +1,13 @@ ItemDef( name: "Impressive Turban", - description: "Fancy.", + description: "An incredibly fancy and light-weight turban, quite expensive too.", kind: Armor(( kind: Head, stats: ( protection: Some(Normal(5.0)), - poise_resilience: Some(Normal(2.0)), - energy_max: Some(11.0), - energy_reward: Some(0.065), + poise_resilience: Some(Normal(1.5)), + energy_max: Some(12.0), + energy_reward: Some(0.07), ), )), quality: Epic, diff --git a/assets/common/items/armor/misc/back/backpack.ron b/assets/common/items/armor/misc/back/backpack.ron index ebec547266..a36b1e9abc 100644 --- a/assets/common/items/armor/misc/back/backpack.ron +++ b/assets/common/items/armor/misc/back/backpack.ron @@ -1,6 +1,6 @@ ItemDef( name: "Traveler's Backpack", - description: "Comfort and capacity united.", + description: "Comfortable and with enough capacity, its a hoarder's best friend.", kind: Armor(( kind: Back, stats: ( 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 24ec2e6584..86e7360779 100644 --- a/assets/common/items/armor/misc/bag/knitted_red_pouch.ron +++ b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron @@ -1,6 +1,6 @@ ItemDef( name: "Knitted Red Pouch", - description: "Made from some patches of dyed cloth.", + description: "A sizeable red bag with two pouches, made of wool and dye.", kind: Armor( ( kind: Bag, 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 e91f0b0267..17f2fbfd4f 100644 --- a/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron +++ b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron @@ -1,6 +1,6 @@ ItemDef( name: "Sturdy Red Saddlebag", - description: "Made from a large amount of dyed cloth patches.", + description: "A truly reliable and sizeable bag, embroidered with amethyst and thick leather.", kind: Armor( ( kind: Bag, 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 33114f70f9..8e11686178 100644 --- a/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron +++ b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Tiny Leather Pouch", - description: "Made from a few patches of leather.", + name: "Small Leather Pouch", + description: "A small reliable leather pouch.", kind: Armor( ( kind: Bag, 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 6b285ae354..1e344888d3 100644 --- a/assets/common/items/armor/misc/bag/tiny_red_pouch.ron +++ b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron @@ -1,6 +1,6 @@ ItemDef( name: "Tiny Red Pouch", - description: "Made from a single patch of dyed cloth.", + description: "Made from multiple patches of dyed cloth.", kind: Armor( ( kind: Bag, 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 238c72819b..1f09b241df 100644 --- a/assets/common/items/armor/misc/bag/troll_hide_pack.ron +++ b/assets/common/items/armor/misc/bag/troll_hide_pack.ron @@ -1,6 +1,6 @@ ItemDef( name: "Trollhide Pack", - description: "Trolls were definitely hurt\nin the making of this.", + description: "Trolls were definitely hurt in the making of this.", kind: Armor( ( kind: Bag, 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 a2d614a97a..75c2f8c80e 100644 --- a/assets/common/items/armor/misc/bag/woven_red_bag.ron +++ b/assets/common/items/armor/misc/bag/woven_red_bag.ron @@ -1,6 +1,6 @@ ItemDef( name: "Woven Red Bag", - description: "Made from some patches of dyed cloth.", + description: "A moderately sized red bag. Although it still feels pretty cramped.", kind: Armor( ( kind: Bag, diff --git a/assets/common/items/armor/misc/foot/sandals.ron b/assets/common/items/armor/misc/foot/sandals.ron index 2fc027e6ec..876f3f3a8e 100644 --- a/assets/common/items/armor/misc/foot/sandals.ron +++ b/assets/common/items/armor/misc/foot/sandals.ron @@ -1,6 +1,6 @@ ItemDef( name: "Worn out Sandals", - description: "Loyal companions.", + description: "Loyal companions, though they don't look like they can go much further.", kind: Armor(( kind: Foot, stats: ( diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron index 856ddff385..8e21260b3e 100644 --- a/assets/common/items/armor/misc/head/bandana/red.ron +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -5,7 +5,7 @@ ItemDef( kind: Head, stats: ( crit_power: Some(0.008), - stealth: Some(0.15), + stealth: Some(0.14), ), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/crown.ron b/assets/common/items/armor/misc/head/crown.ron index fc5b4c8902..6482a5602c 100644 --- a/assets/common/items/armor/misc/head/crown.ron +++ b/assets/common/items/armor/misc/head/crown.ron @@ -1,13 +1,13 @@ ItemDef( name: "Crown", - description: "Fit for a king.", + description: "A crown fit for royal stature.", kind: Armor(( kind: Head, stats: ( protection: Some(Normal(12.0)), poise_resilience: Some(Normal(2.0)), energy_max: Some(5.0), - crit_power: Some(0.03), + crit_power: Some(0.008), ), )), quality: Epic, diff --git a/assets/common/items/armor/misc/head/headband.ron b/assets/common/items/armor/misc/head/headband.ron index 930ed92218..b086ab8bdc 100644 --- a/assets/common/items/armor/misc/head/headband.ron +++ b/assets/common/items/armor/misc/head/headband.ron @@ -1,6 +1,6 @@ ItemDef( name: "Headband", - description: "yep.", + description: "A simple headband, it's nothing special.", kind: Armor(( kind: Head, stats: ( diff --git a/assets/common/items/armor/misc/head/hog_hood.ron b/assets/common/items/armor/misc/head/hog_hood.ron index 3c3eb0d382..cb9ff4489b 100644 --- a/assets/common/items/armor/misc/head/hog_hood.ron +++ b/assets/common/items/armor/misc/head/hog_hood.ron @@ -1,13 +1,12 @@ ItemDef( - name: "Wild Hog Hood", - description: "Wear the guise of the great swine you felled, so you may honor his sacrifice.", + name: "Hog Hood", + description: "Wear the guise of a great swine now felled, so that you may honor its sacrifice.", kind: Armor(( kind: Head, stats: ( protection: Some(Normal(5.0)), - poise_resilience: Some(Normal(-1.0)), crit_power: Some(0.014), - stealth: Some(0.35), + stealth: Some(0.21), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/mitre.ron b/assets/common/items/armor/misc/head/mitre.ron index bc27b34aaa..27dd5241a1 100644 --- a/assets/common/items/armor/misc/head/mitre.ron +++ b/assets/common/items/armor/misc/head/mitre.ron @@ -1,10 +1,11 @@ ItemDef( name: "Mitre", - description: "Calls strength from above.", + description: "Calls strength down from above.", kind: Armor(( kind: Head, stats: ( - poise_resilience: Some(Normal(1.5)), + protection: Some(Normal(2.0)), + poise_resilience: Some(Normal(0.5)), energy_max: Some(7.0), energy_reward: Some(0.06), ), diff --git a/assets/common/items/armor/misc/head/spikeguard.ron b/assets/common/items/armor/misc/head/spikeguard.ron index 5b8739f57e..7e3f6de732 100644 --- a/assets/common/items/armor/misc/head/spikeguard.ron +++ b/assets/common/items/armor/misc/head/spikeguard.ron @@ -1,13 +1,12 @@ ItemDef( - name: "Spiked Faceguard", - description: "Introvert headgear.", + name: "Spiked Crown", + description: "Resembling some sort of thorny crown.", kind: Armor(( kind: Head, stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.073), - stealth: Some(-0.5), + crit_power: Some(0.036), ), )), quality: High, diff --git a/assets/common/items/armor/misc/head/straw.ron b/assets/common/items/armor/misc/head/straw.ron index efbe059006..11d9b28012 100644 --- a/assets/common/items/armor/misc/head/straw.ron +++ b/assets/common/items/armor/misc/head/straw.ron @@ -1,10 +1,10 @@ ItemDef( name: "Straw Hat", - description: "Simple and stylish.", + description: "Often times worn by villagers. It's simple and stylish!", kind: Armor(( kind: Head, stats: ( - energy_max: Some(4.0), + energy_max: Some(3.0), energy_reward: Some(0.02), ), )), diff --git a/assets/common/items/armor/misc/head/wanderers_hat.ron b/assets/common/items/armor/misc/head/wanderers_hat.ron index 0e40e461e8..405d06b64b 100644 --- a/assets/common/items/armor/misc/head/wanderers_hat.ron +++ b/assets/common/items/armor/misc/head/wanderers_hat.ron @@ -1,14 +1,13 @@ ItemDef( name: "Wanderer's Hat", - description: "A practical hat: light, shady and relatively easy to replace. The perfect headwear for those who feel at home on the highways and byways of Veloren.", + description: "The perfect headwear for those who feel at home on the highways and byways of Veloren.", kind: Armor(( kind: Head, stats: ( - poise_resilience: Some(Normal(1.0)), - crit_power: Some(0.033), - stealth: Some(0.2), + crit_power: Some(0.021), + stealth: Some(0.1), ), )), - quality: High, + quality: Moderate, tags: [], ) diff --git a/assets/common/items/armor/misc/head/winged_coronet.ron b/assets/common/items/armor/misc/head/winged_coronet.ron index ddc7ee8dc7..ec60035fb5 100644 --- a/assets/common/items/armor/misc/head/winged_coronet.ron +++ b/assets/common/items/armor/misc/head/winged_coronet.ron @@ -5,10 +5,10 @@ ItemDef( kind: Head, stats: ( protection: Some(Normal(2.0)), - energy_max: Some(4.0), - energy_reward: Some(0.037), - crit_power: Some(0.015), - stealth: Some(0.18), + energy_max: Some(4.5), + energy_reward: Some(0.04), + crit_power: Some(0.009), + stealth: Some(0.17), ), )), quality: High, diff --git a/assets/common/items/armor/misc/neck/haniwa_talisman.ron b/assets/common/items/armor/misc/neck/haniwa_talisman.ron index 2ac41151be..db8c44fdb5 100644 --- a/assets/common/items/armor/misc/neck/haniwa_talisman.ron +++ b/assets/common/items/armor/misc/neck/haniwa_talisman.ron @@ -1,6 +1,6 @@ ItemDef( name: "Haniwa Talisman", - description: "A talisman depicting a figure of unkown origin.", + description: "A talisman depicting a figure of unknown origin.", kind: Armor(( kind: Neck, stats: ( diff --git a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron index 5df9721eb0..dc02f7bda0 100644 --- a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron +++ b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron @@ -5,10 +5,10 @@ ItemDef( kind: Neck, stats: ( protection: Some(Normal(1.0)), - energy_max: Some(10), - energy_reward: Some(0.05), + energy_max: Some(8.0), + energy_reward: Some(0.04), ), )), - quality: High, + quality: Moderate, tags: [], ) diff --git a/assets/common/items/armor/misc/neck/pendant_of_protection.ron b/assets/common/items/armor/misc/neck/pendant_of_protection.ron index 1082cdf6d7..610334e967 100644 --- a/assets/common/items/armor/misc/neck/pendant_of_protection.ron +++ b/assets/common/items/armor/misc/neck/pendant_of_protection.ron @@ -1,10 +1,10 @@ ItemDef( name: "Pendant of Protection", - description: "You feel as if something is always watching you...", + description: "You feel some sort of presence keeping you safe...", kind: Armor(( kind: Neck, stats: ( - protection: Some(Normal(1.0)), + protection: Some(Normal(1.5)), ), )), quality: Common, diff --git a/assets/common/items/armor/misc/neck/scratched.ron b/assets/common/items/armor/misc/neck/scratched.ron index acbf33970a..f0685e7852 100644 --- a/assets/common/items/armor/misc/neck/scratched.ron +++ b/assets/common/items/armor/misc/neck/scratched.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scratched Necklace", - description: "The string is about to snap...", + description: "A shoddy necklace with a string about to snap...", kind: Armor(( kind: Neck, stats: ( diff --git a/assets/common/items/armor/misc/neck/topaz.ron b/assets/common/items/armor/misc/neck/topaz.ron index 9799a1d7d2..b818db108a 100644 --- a/assets/common/items/armor/misc/neck/topaz.ron +++ b/assets/common/items/armor/misc/neck/topaz.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Neck, stats: ( - protection: Some(Normal(1.0)), - energy_max: Some(10.0), + protection: Some(Normal(0.5)), + energy_max: Some(6.0), ), )), - quality: Moderate, + quality: Common, tags: [], ) diff --git a/assets/common/items/armor/pirate/hat.ron b/assets/common/items/armor/pirate/hat.ron index 2a19e2de44..5452eee64e 100644 --- a/assets/common/items/armor/pirate/hat.ron +++ b/assets/common/items/armor/pirate/hat.ron @@ -4,12 +4,12 @@ ItemDef( kind: Armor(( kind: Head, stats: ( - protection: Some(Normal(4.0)), + protection: Some(Normal(3.0)), energy_reward: Some(0.025), crit_power: Some(0.1), ), )), - quality: High, + quality: Epic, tags: [ ], ) diff --git a/assets/common/items/consumable/potion_big.ron b/assets/common/items/consumable/potion_big.ron index f8044bc2bf..ffed9947be 100644 --- a/assets/common/items/consumable/potion_big.ron +++ b/assets/common/items/consumable/potion_big.ron @@ -1,6 +1,6 @@ ItemDef( name: "Large Potion", - description: "Precious medicine.", + description: "Precious medicine, it makes for the largest rejuvenative flask yet.", kind: Consumable( kind: Drink, effects: [ diff --git a/assets/common/items/consumable/potion_med.ron b/assets/common/items/consumable/potion_med.ron index 71e5a8f500..cb27b87c45 100644 --- a/assets/common/items/consumable/potion_med.ron +++ b/assets/common/items/consumable/potion_med.ron @@ -1,6 +1,6 @@ ItemDef( name: "Medium Potion", - description: "Enchanted healing flask.", + description: "An innovative invention from an apothecary, better than its smaller precursors.", kind: Consumable( kind: Drink, effects: [ diff --git a/assets/common/items/consumable/potion_minor.ron b/assets/common/items/consumable/potion_minor.ron index ad2410bc7a..86200c29bd 100644 --- a/assets/common/items/consumable/potion_minor.ron +++ b/assets/common/items/consumable/potion_minor.ron @@ -1,6 +1,6 @@ ItemDef( name: "Minor Potion", - description: "Made of apples with love.", + description: "A small potion concocted from apples and honey.", kind: Consumable( kind: Drink, effects: [ diff --git a/assets/common/items/crafting_ing/animal_misc/bone.ron b/assets/common/items/crafting_ing/animal_misc/bone.ron index 0f78484fd1..8084d848a8 100644 --- a/assets/common/items/crafting_ing/animal_misc/bone.ron +++ b/assets/common/items/crafting_ing/animal_misc/bone.ron @@ -1,6 +1,6 @@ ItemDef( name: "Thick Bone", - description: "A bone sturdy enough to craft with.", + description: "A thick bone, it seems sturdy enough to craft with.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/animal_misc/lively_vine.ron b/assets/common/items/crafting_ing/animal_misc/lively_vine.ron index ec6ab743c3..4f01df5c68 100644 --- a/assets/common/items/crafting_ing/animal_misc/lively_vine.ron +++ b/assets/common/items/crafting_ing/animal_misc/lively_vine.ron @@ -1,6 +1,6 @@ ItemDef( name: "Lively Vine", - description: "I think it just moved.", + description: "I think it just moved...", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron b/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron index 84d6c95b93..eb4d2ef7f5 100644 --- a/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron +++ b/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron @@ -1,6 +1,6 @@ ItemDef( name: "Raptor Feather", - description: "Large colorful feather from a raptor.", + description: "A large colorful feather from a raptor.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/cactus.ron b/assets/common/items/crafting_ing/cactus.ron index 6196dc45f7..254a35029e 100644 --- a/assets/common/items/crafting_ing/cactus.ron +++ b/assets/common/items/crafting_ing/cactus.ron @@ -1,6 +1,6 @@ ItemDef( name: "Cactus", - description: "Grows in warm and dry places.", + description: "Grows in warm and dry places. Very prickly!", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/cloth/lifecloth.ron b/assets/common/items/crafting_ing/cloth/lifecloth.ron index d773332db8..6cf59c3554 100644 --- a/assets/common/items/crafting_ing/cloth/lifecloth.ron +++ b/assets/common/items/crafting_ing/cloth/lifecloth.ron @@ -1,6 +1,6 @@ ItemDef( name: "Lifecloth", - description: "A fabric imbued with special properties.", + description: "A fabric imbued with the gentleness that nature has to offer.", kind: Ingredient( descriptor: "Lifecloth", ), diff --git a/assets/common/items/crafting_ing/empty_vial.ron b/assets/common/items/crafting_ing/empty_vial.ron index ad9288e47e..14d6fa95c0 100644 --- a/assets/common/items/crafting_ing/empty_vial.ron +++ b/assets/common/items/crafting_ing/empty_vial.ron @@ -1,6 +1,6 @@ ItemDef( name: "Empty Vial", - description: "Can be filled with fluids.", + description: "A simple glass vial used for holding various fluids.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/hide/animal_hide.ron b/assets/common/items/crafting_ing/hide/animal_hide.ron index 3c26171d31..ff107ebf5d 100644 --- a/assets/common/items/crafting_ing/hide/animal_hide.ron +++ b/assets/common/items/crafting_ing/hide/animal_hide.ron @@ -1,6 +1,6 @@ ItemDef( name: "Animal Hide", - description: "A pelt from an animal. Becomes leather.", + description: "A common pelt from most animals. Becomes leather.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/hide/carapace.ron b/assets/common/items/crafting_ing/hide/carapace.ron index 9536cf8a82..05412b14ba 100644 --- a/assets/common/items/crafting_ing/hide/carapace.ron +++ b/assets/common/items/crafting_ing/hide/carapace.ron @@ -1,6 +1,6 @@ ItemDef( name: "Hard Carapace", - description: "Tough, hard carapace.", + description: "Tough, hard carapace, a shield to many creatures.", kind: Ingredient( descriptor: "Carapace", ), diff --git a/assets/common/items/crafting_ing/hide/dragon_scale.ron b/assets/common/items/crafting_ing/hide/dragon_scale.ron index 2ee0b3905c..74d0fa8b63 100644 --- a/assets/common/items/crafting_ing/hide/dragon_scale.ron +++ b/assets/common/items/crafting_ing/hide/dragon_scale.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dragon Scale", - description: "Tough scale from a legendary beast.", + description: "Tough scale from a legendary beast, hot to the touch.", kind: Ingredient( descriptor: "Dragonscale", ), diff --git a/assets/common/items/crafting_ing/hide/rugged_hide.ron b/assets/common/items/crafting_ing/hide/rugged_hide.ron index 2f82c6184f..56e65090e8 100644 --- a/assets/common/items/crafting_ing/hide/rugged_hide.ron +++ b/assets/common/items/crafting_ing/hide/rugged_hide.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rugged Hide", - description: "A durable pelt, favored by leatherworkers.", + description: "A durable pelt from fierce creatures, favored by leatherworkers.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/hide/scales.ron b/assets/common/items/crafting_ing/hide/scales.ron index 7f061e0032..922fd8273d 100644 --- a/assets/common/items/crafting_ing/hide/scales.ron +++ b/assets/common/items/crafting_ing/hide/scales.ron @@ -1,6 +1,6 @@ ItemDef( name: "Scale", - description: "Shiny scale from an animal.", + description: "Shiny scales found off of an animal.", kind: Ingredient( descriptor: "Scale", ), diff --git a/assets/common/items/crafting_ing/hide/tough_hide.ron b/assets/common/items/crafting_ing/hide/tough_hide.ron index a63fcd3d2d..636726d5fc 100644 --- a/assets/common/items/crafting_ing/hide/tough_hide.ron +++ b/assets/common/items/crafting_ing/hide/tough_hide.ron @@ -1,6 +1,6 @@ ItemDef( name: "Tough Hide", - description: "A pelt from something fierce. Becomes leather.", + description: "A relatively tough, rough hide. Becomes leather.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/honey.ron b/assets/common/items/crafting_ing/honey.ron index 813cf010fb..e7ac2d01fb 100644 --- a/assets/common/items/crafting_ing/honey.ron +++ b/assets/common/items/crafting_ing/honey.ron @@ -1,6 +1,6 @@ ItemDef( name: "Honey", - description: "From a beehive.", + description: "Stolen from a beehive. Surely the bees won't be happy with this!", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/rock.ron b/assets/common/items/crafting_ing/rock.ron index c182c760c2..59b3672b5d 100644 --- a/assets/common/items/crafting_ing/rock.ron +++ b/assets/common/items/crafting_ing/rock.ron @@ -1,6 +1,6 @@ ItemDef( name: "Rock", - description: "A solid made up of a bunch of different minerals.", + description: "Made up of a bunch of different minerals, looks like it would hurt to get hit with.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/stones.ron b/assets/common/items/crafting_ing/stones.ron index 89fef2afe4..b27ff774f8 100644 --- a/assets/common/items/crafting_ing/stones.ron +++ b/assets/common/items/crafting_ing/stones.ron @@ -1,6 +1,6 @@ ItemDef( name: "Stones", - description: "Pebbles from the ground.", + description: "Pebbles from the ground, nothing out of the ordinary.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/twigs.ron b/assets/common/items/crafting_ing/twigs.ron index 0621ac8564..35932ec1e1 100644 --- a/assets/common/items/crafting_ing/twigs.ron +++ b/assets/common/items/crafting_ing/twigs.ron @@ -1,6 +1,6 @@ ItemDef( name: "Twigs", - description: "Found near trees.", + description: "Found near trees, a squirrel must've knocked it down.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_tools/mortar_pestle.ron b/assets/common/items/crafting_tools/mortar_pestle.ron index 7d9428a6f8..0da4e8d0db 100644 --- a/assets/common/items/crafting_tools/mortar_pestle.ron +++ b/assets/common/items/crafting_tools/mortar_pestle.ron @@ -1,6 +1,6 @@ ItemDef( name: "Mortar and Pestle", - description: "Crushes and grinds things into\na fine powder or paste.\nUsed to craft various items.", + description: "Crushes and grinds things into a fine powder or paste. Needed to craft various items.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/flowers/moonbell.ron b/assets/common/items/flowers/moonbell.ron index e21ee43093..da5eeed6a6 100644 --- a/assets/common/items/flowers/moonbell.ron +++ b/assets/common/items/flowers/moonbell.ron @@ -1,6 +1,6 @@ ItemDef( name: "Moonbell", - description: "It glistens brilliantly, but only under moonlight.", + description: "It glistens brilliantly under the moonlight.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/food/cheese.ron b/assets/common/items/food/cheese.ron index ef4ae1f25e..b928aaff28 100644 --- a/assets/common/items/food/cheese.ron +++ b/assets/common/items/food/cheese.ron @@ -1,6 +1,6 @@ ItemDef( name: "Dwarven Cheese", - description: "Aromatic and nutritious", + description: "Made from goat milk from the finest dwarven produce. Aromatic and nutritious!", kind: Consumable( kind: Food, effects: [ diff --git a/assets/common/items/food/coconut.ron b/assets/common/items/food/coconut.ron index 476edb4769..b955535c94 100644 --- a/assets/common/items/food/coconut.ron +++ b/assets/common/items/food/coconut.ron @@ -1,6 +1,6 @@ ItemDef( name: "Coconut", - description: "Reliable source of water and fat.\n\nNaturally growing at the top of palm trees.", + description: "Reliable source of water and fat. Can often be found growing on palm trees.", kind: Consumable( kind: Food, effects: [ diff --git a/assets/common/items/food/tomato.ron b/assets/common/items/food/tomato.ron index 747027a8bb..7924699b9f 100644 --- a/assets/common/items/food/tomato.ron +++ b/assets/common/items/food/tomato.ron @@ -1,6 +1,6 @@ ItemDef( name: "Tomato", - description: "A red fruit. Not actually a vegetable.", + description: "A red fruit. It's not actually a vegetable!", kind: Consumable( kind: Food, effects: [ diff --git a/assets/common/items/glider/cloverleaf.ron b/assets/common/items/glider/cloverleaf.ron index 776befa896..a3c1dc8f1b 100644 --- a/assets/common/items/glider/cloverleaf.ron +++ b/assets/common/items/glider/cloverleaf.ron @@ -1,6 +1,6 @@ ItemDef( name: "Cloverleaf", - description: "Brings luck to its owner.", + description: "Brings luck to its owner. Light-weight and cheap to make, and also very cute!", kind: Glider, quality: Moderate, tags: [], diff --git a/assets/common/items/glider/sandraptor.ron b/assets/common/items/glider/sandraptor.ron index b60c4f0460..6fb57f2372 100644 --- a/assets/common/items/glider/sandraptor.ron +++ b/assets/common/items/glider/sandraptor.ron @@ -1,6 +1,6 @@ ItemDef( name: "Sand Raptor Wings", - description: "Take flight with the wings of a predator.", + description: "Take flight with the wings of a thirsty predator", kind: Glider, quality: High, tags: [], diff --git a/assets/common/items/glider/snowraptor.ron b/assets/common/items/glider/snowraptor.ron index 4e56632b6d..19e0c43f0f 100644 --- a/assets/common/items/glider/snowraptor.ron +++ b/assets/common/items/glider/snowraptor.ron @@ -1,6 +1,6 @@ ItemDef( name: "Snow Raptor Wings", - description: "Take flight with the wings of a predator.", + description: "Take flight with the wings of a cold-blooded predator", kind: Glider, quality: High, tags: [], diff --git a/assets/common/items/glider/woodraptor.ron b/assets/common/items/glider/woodraptor.ron index 1d0c9801de..bf4476e11c 100644 --- a/assets/common/items/glider/woodraptor.ron +++ b/assets/common/items/glider/woodraptor.ron @@ -1,6 +1,6 @@ ItemDef( name: "Wood Raptor Wings", - description: "Take flight with the wings of a predator.", + description: "Take flight with the wings of a stealthy predator", kind: Glider, quality: High, tags: [], diff --git a/assets/common/items/lantern/black_0.ron b/assets/common/items/lantern/black_0.ron index b778335c86..19791f4eb2 100644 --- a/assets/common/items/lantern/black_0.ron +++ b/assets/common/items/lantern/black_0.ron @@ -1,6 +1,6 @@ ItemDef( name: "Black Lantern", - description: "Used by city guards.", + description: "Quite common due to popular use of budding adventurers!", kind: Lantern( ( color: (r: 255, g: 128, b: 26), diff --git a/assets/common/items/lantern/geode_purp.ron b/assets/common/items/lantern/geode_purp.ron index 43fe5d7f33..3d18d45c04 100644 --- a/assets/common/items/lantern/geode_purp.ron +++ b/assets/common/items/lantern/geode_purp.ron @@ -1,6 +1,6 @@ ItemDef( name: "Purple Geode", - description: "Emits a calming glow", + description: "Emits a calming glow, helps to calm your nerves.", kind: Lantern( ( color: (r: 144, g: 88, b: 181), diff --git a/assets/common/items/mineral/ingot/bloodsteel.ron b/assets/common/items/mineral/ingot/bloodsteel.ron index 5f727c1fb1..7513084136 100644 --- a/assets/common/items/mineral/ingot/bloodsteel.ron +++ b/assets/common/items/mineral/ingot/bloodsteel.ron @@ -1,6 +1,6 @@ ItemDef( name: "Bloodsteel Ingot", - description: "An alloy of bloodstone and iron.\n\nThis can be used when crafting metal weapons.", + description: "An alloy of bloodstone and iron, with a dark red color.\n\nThis can be used when crafting metal weapons.", kind: Ingredient( descriptor: "Bloodsteel", ), diff --git a/assets/common/items/mineral/ore/bloodstone.ron b/assets/common/items/mineral/ore/bloodstone.ron index f7fc8e5d90..4fc1ac377f 100644 --- a/assets/common/items/mineral/ore/bloodstone.ron +++ b/assets/common/items/mineral/ore/bloodstone.ron @@ -1,6 +1,6 @@ ItemDef( name: "Bloodstone Ore", - description: "A deep red ore.", + description: "A deep red ore, it reminds you of blood.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/mineral/ore/velorite.ron b/assets/common/items/mineral/ore/velorite.ron index 97b7cc76a2..647ce1377c 100644 --- a/assets/common/items/mineral/ore/velorite.ron +++ b/assets/common/items/mineral/ore/velorite.ron @@ -1,6 +1,6 @@ ItemDef( name: "Velorite", - description: "Just a slight touch makes you feel\nthe knowledge of ancient times", + description: "A bizarre, oddly shimmering ore, its origin seems to be shrouded in mystery.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/mineral/ore/veloritefrag.ron b/assets/common/items/mineral/ore/veloritefrag.ron index bc58807383..9d3b9b35cd 100644 --- a/assets/common/items/mineral/ore/veloritefrag.ron +++ b/assets/common/items/mineral/ore/veloritefrag.ron @@ -1,6 +1,6 @@ ItemDef( name: "Velorite Fragment", - description: "Small runes sparkle on its surface", + description: "Small runes sparkle on its surface, though you don't know what it means.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/mineral/stone/basalt.ron b/assets/common/items/mineral/stone/basalt.ron index 86eab024c3..1e262a8cdd 100644 --- a/assets/common/items/mineral/stone/basalt.ron +++ b/assets/common/items/mineral/stone/basalt.ron @@ -1,6 +1,6 @@ ItemDef( name: "Basalt", - description: "A dark volcanic rock.", + description: "A dark volcanic rock, most volcanic rock tends to be basalt..", kind: Ingredient( descriptor: "Basalt", ), diff --git a/assets/common/items/mineral/stone/coal.ron b/assets/common/items/mineral/stone/coal.ron index 19eeead7e5..558e660e1f 100644 --- a/assets/common/items/mineral/stone/coal.ron +++ b/assets/common/items/mineral/stone/coal.ron @@ -1,6 +1,6 @@ ItemDef( name: "Coal", - description: "A black rock that happens to be really good at burning.", + description: "A combustible black rock that happens to be really good at burning.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/mineral/stone/granite.ron b/assets/common/items/mineral/stone/granite.ron index 5315706878..93dc8c178f 100644 --- a/assets/common/items/mineral/stone/granite.ron +++ b/assets/common/items/mineral/stone/granite.ron @@ -1,6 +1,6 @@ ItemDef( name: "Granite", - description: "A light-colored igneous rock.", + description: "A light-colored igneous rock, coarse-grained and formed by intrusion.", kind: Ingredient( descriptor: "Granite", ), diff --git a/assets/common/items/mineral/stone/obsidian.ron b/assets/common/items/mineral/stone/obsidian.ron index 11e74062e9..03ea9ced19 100644 --- a/assets/common/items/mineral/stone/obsidian.ron +++ b/assets/common/items/mineral/stone/obsidian.ron @@ -1,6 +1,6 @@ ItemDef( name: "Obsidian", - description: "An igneous rock that comes from melted rock.", + description: "An igneous rock that comes from felsic lava, it never seems to dwindle.", kind: Ingredient( descriptor: "Obsidian", ), diff --git a/assets/common/items/utility/bomb.ron b/assets/common/items/utility/bomb.ron index 2ae210512d..0fc5690ba0 100644 --- a/assets/common/items/utility/bomb.ron +++ b/assets/common/items/utility/bomb.ron @@ -1,6 +1,6 @@ ItemDef( name: "Bomb", - description: "Boom!", + description: "A highly explosive device, demolitionists adore them!", kind: Throwable( kind: Bomb, ), diff --git a/assets/common/items/utility/coins.ron b/assets/common/items/utility/coins.ron index 5f0330bfc0..fa4dbc14d0 100644 --- a/assets/common/items/utility/coins.ron +++ b/assets/common/items/utility/coins.ron @@ -1,6 +1,6 @@ ItemDef( name: "Coins", - description: "Money can be exchanged for goods and services.", + description: "Precious coins, can be exchanged for goods and services.", kind: Utility( kind: Coins, ), diff --git a/assets/common/items/utility/collar.ron b/assets/common/items/utility/collar.ron index a431765063..51d34c8c93 100644 --- a/assets/common/items/utility/collar.ron +++ b/assets/common/items/utility/collar.ron @@ -1,6 +1,6 @@ ItemDef( name: "Collar", - description: "Tames wild animals within 5 blocks", + description: "Tames neutral wild animals within 5 blocks", kind: Utility( kind: Collar, ), diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index 305c6e9fed..0cf9ff040c 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -1,6 +1,6 @@ ItemDef( name: "Damaged Greatsword", - description: "The blade could snap at any moment...", + description: "The blade could snap at any moment, but you hope it will endure future fights.", kind: Tool(( kind: Sword, hands: Two, diff --git a/assets/common/items/weapons/sword_1h/starter.ron b/assets/common/items/weapons/sword_1h/starter.ron index 5290dc64df..e4764c2c37 100644 --- a/assets/common/items/weapons/sword_1h/starter.ron +++ b/assets/common/items/weapons/sword_1h/starter.ron @@ -1,6 +1,6 @@ ItemDef( name: "Damaged Gladius", - description: "This blade has seen better days.", + description: "This blade has seen better days, but surely it will last.", kind: Tool(( kind: Sword, hands: One, diff --git a/assets/common/loot_tables/creature/quad_low/elbst.ron b/assets/common/loot_tables/creature/quad_low/elbst.ron new file mode 100644 index 0000000000..1fb63f4da8 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/elbst.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.crafting_ing.hide.tough_hide")), + (1.0, Item("common.items.crafting_ing.animal_misc.viscous_ooze")), + (1.0, Item("common.items.food.meat.tough_raw")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/salamander.ron b/assets/common/loot_tables/creature/quad_low/salamander.ron index faad9ec4e5..9e97383c16 100644 --- a/assets/common/loot_tables/creature/quad_low/salamander.ron +++ b/assets/common/loot_tables/creature/quad_low/salamander.ron @@ -1,4 +1,4 @@ [ (1.0, Item("common.items.crafting_ing.hide.tough_hide")), - (3.0, Item("common.items.crafting_ing.hide.scales")), + (1.0, Item("common.items.food.meat.tough_raw")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/cattle.ron b/assets/common/loot_tables/creature/quad_medium/cattle.ron new file mode 100644 index 0000000000..c1c91ff337 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/cattle.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.food.meat.beast_large_raw")), + (1.0, Item("common.items.crafting_ing.hide.animal_hide")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/highland.ron b/assets/common/loot_tables/creature/quad_medium/highland.ron new file mode 100644 index 0000000000..35483d802e --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/highland.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.food.meat.beast_large_raw")), + (1.0, Item("common.items.crafting_ing.hide.animal_hide")), + (1.0, ItemQuantity("common.items.crafting_ing.animal_misc.fur", 1, 2)), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/wolf.ron b/assets/common/loot_tables/creature/quad_medium/wolf.ron new file mode 100644 index 0000000000..beda2c6488 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/wolf.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.food.meat.beast_small_raw")), + (1.0, Item("common.items.crafting_ing.hide.tough_hide")), + (1.0, Item("common.items.crafting_ing.animal_misc.sharp_fang")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/yak.ron b/assets/common/loot_tables/creature/quad_medium/yak.ron new file mode 100644 index 0000000000..c1c91ff337 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/yak.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.food.meat.beast_large_raw")), + (1.0, Item("common.items.crafting_ing.hide.animal_hide")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/rodent.ron b/assets/common/loot_tables/creature/quad_small/rodent.ron new file mode 100644 index 0000000000..986cc406c9 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_small/rodent.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.food.meat.beast_small_raw")), + (1.0, Item("common.items.crafting_ing.animal_misc.fur")), + (1.0, Nothing), +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-0/chieftain.ron b/assets/common/loot_tables/dungeon/tier-0/chieftain.ron index cc91b8d56d..2cf101d28a 100644 --- a/assets/common/loot_tables/dungeon/tier-0/chieftain.ron +++ b/assets/common/loot_tables/dungeon/tier-0/chieftain.ron @@ -5,7 +5,7 @@ (5.0, LootTable("common.loot_tables.armor.tier-1")), // Misc (3.0, Item("common.items.armor.misc.neck.scratched")), - (2.0, Item("common.items.armor.misc.head.straw")), + (2.0, Item("common.items.armor.misc.head.wanderers_hat")), // Indirect crafting materials for T2 gear (1.0, ItemQuantity("common.items.crafting_ing.sticky_thread", 2, 5)), (1.0, ItemQuantity("common.items.mineral.ore.coal", 2, 5)), diff --git a/assets/common/loot_tables/spots/bandit.ron b/assets/common/loot_tables/spots/bandit.ron index b6a4e0bd77..9864cdc42e 100644 --- a/assets/common/loot_tables/spots/bandit.ron +++ b/assets/common/loot_tables/spots/bandit.ron @@ -2,19 +2,17 @@ // Crafting Ingredients (5.0, LootTable("common.loot_tables.materials.common")), // Consumables - (0.5, Item("common.items.consumable.potion_minor")), + (2.0, Item("common.items.consumable.potion_minor")), // Ring - (0.2, Item("common.items.armor.misc.ring.gold")), + (0.4, Item("common.items.armor.misc.ring.gold")), // Necklace - (0.2, Item("common.items.armor.misc.neck.gold")), - // Utility - (0.5, Item("common.items.utility.collar")), + (0.4, Item("common.items.armor.misc.neck.gold")), // Armor - (0.1, Item("common.items.armor.misc.head.bandana.thief")), - (0.1, Item("common.items.armor.misc.head.bandana.red")), - (0.1, Item("common.items.armor.misc.head.hood")), - (0.1, Item("common.items.armor.misc.head.hood_dark")), + (1.0, Item("common.items.armor.misc.head.bandana.thief")), + (1.0, Item("common.items.armor.misc.head.bandana.red")), + (0.4, Item("common.items.armor.misc.head.hood")), + (0.4, Item("common.items.armor.misc.head.hood_dark")), // Food (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (0.25, LootTable("common.loot_tables.food.prepared")), + (0.75, LootTable("common.loot_tables.food.prepared")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/spots/pirate.ron b/assets/common/loot_tables/spots/pirate.ron index 231345dc3c..c3454b6189 100644 --- a/assets/common/loot_tables/spots/pirate.ron +++ b/assets/common/loot_tables/spots/pirate.ron @@ -10,9 +10,9 @@ // Utility (0.05, Item("common.items.utility.collar")), // Armor - (0.007, Item("common.items.armor.pirate.hat")), - (0.005, Item("common.items.armor.misc.head.crown")), + (0.080, Item("common.items.armor.pirate.hat")), + (0.075, Item("common.items.armor.misc.head.crown")), // Food (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (0.25, LootTable("common.loot_tables.food.prepared")), + (0.5, Item("common.items.food.meat.fish_raw")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/crate.ron b/assets/common/loot_tables/sprite/crate.ron index d49b4f0261..8336ee9b25 100644 --- a/assets/common/loot_tables/sprite/crate.ron +++ b/assets/common/loot_tables/sprite/crate.ron @@ -1,5 +1,5 @@ [ - (6.0, LootTable("common.loot_tables.materials.common")), - (12.0, LootTable("common.loot_tables.food.prepared")), - (1.0, Item("common.items.armor.misc.head.wanderers_hat")), + (2.0, LootTable("common.loot_tables.materials.common")), + (3.0, LootTable("common.loot_tables.food.prepared")), + (1.0, Item("common.items.armor.misc.head.straw")), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 241462a8e5..b56ea50853 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -194,7 +194,7 @@ craft_sprite: Some(CookingPot), ), "leather strips": ( - output: ("common.items.crafting_ing.leather.leather_strips", 4), + output: ("common.items.crafting_ing.leather.leather_strips", 3), inputs: [ (Item("common.items.crafting_ing.leather.simple_leather"), 1, false), ], @@ -235,17 +235,17 @@ ], craft_sprite: Some(Forge), ), - "iron ingot": ( + "iron ingot": ( output: ("common.items.mineral.ingot.iron", 1), inputs: [ - (Item("common.items.mineral.ore.iron"), 1, false), + (Item("common.items.mineral.ore.iron"), 2, false), ], craft_sprite: Some(Forge), ), "cobalt ingot": ( output: ("common.items.mineral.ingot.cobalt", 1), inputs: [ - (Item("common.items.mineral.ore.cobalt"), 1, false), + (Item("common.items.mineral.ore.cobalt"), 2, false), ], craft_sprite: Some(Forge), ), @@ -307,14 +307,14 @@ "cotton": ( output: ("common.items.crafting_ing.cloth.cotton", 1), inputs: [ - (Item("common.items.crafting_ing.cotton_boll"), 1, false), + (Item("common.items.crafting_ing.cotton_boll"), 2, false), ], craft_sprite: Some(SpinningWheel), ), "linen_flax": ( output: ("common.items.crafting_ing.cloth.linen", 1), inputs: [ - (Item("common.items.flowers.wild_flax"), 1, false), + (Item("common.items.flowers.wild_flax"), 2, false), ], craft_sprite: Some(SpinningWheel), ), @@ -336,14 +336,14 @@ "moonweave": ( output: ("common.items.crafting_ing.cloth.moonweave", 1), inputs: [ - (Item("common.items.flowers.moonbell"), 1, false), + (Item("common.items.flowers.moonbell"), 2, false), ], craft_sprite: Some(SpinningWheel), ), "sunsilk": ( output: ("common.items.crafting_ing.cloth.sunsilk", 1), inputs: [ - (Item("common.items.flowers.pyrebloom"), 1, false), + (Item("common.items.flowers.pyrebloom"), 2, false), ], craft_sprite: Some(SpinningWheel), ), diff --git a/assets/voxygen/voxel/armor/misc/head/mitre.vox b/assets/voxygen/voxel/armor/misc/head/mitre.vox index c72a94ff2d..97d4e8188c 100644 --- a/assets/voxygen/voxel/armor/misc/head/mitre.vox +++ b/assets/voxygen/voxel/armor/misc/head/mitre.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62bfaa6c892d20ff11c4c764c99fb344fb80627c20dbb0e924a7a2f69a8fb989 -size 7984 +oid sha256:1086f7c62a1ff1789ee42865ed154b2af359a8e0cc47b43e46af4a1f04181da3 +size 16680 diff --git a/assets/voxygen/voxel/armor/misc/head/spikeguard.vox b/assets/voxygen/voxel/armor/misc/head/spikeguard.vox index 590e95370e..168fc1dab9 100644 --- a/assets/voxygen/voxel/armor/misc/head/spikeguard.vox +++ b/assets/voxygen/voxel/armor/misc/head/spikeguard.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64274e8d679867ec4166997a46da16329dfc7812a4cb20b91d2df35f386dfd11 -size 1536 +oid sha256:c2a383762c163647e3c03ef91bfa4f1b71e86addd9ff170a26c0ee588be1f351 +size 1664 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 88958c9891..df7ec71da6 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -529,7 +529,7 @@ color: None ), (Elf, Male, "common.items.armor.misc.head.mitre"): ( - vox_spec: ("armor.misc.head.mitre", (-3.0, -5.0, 5.0)), + vox_spec: ("armor.misc.head.mitre", (-3.0, -5.0, 7.0)), color: None ), (Elf, Female, "common.items.armor.misc.head.mitre"): ( @@ -913,51 +913,51 @@ ), // (Human, Male, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-4.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, 6.0)), color: None ), (Human, Female, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-4.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, 8.0)), color: None ), (Elf, Male, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -4.0, 7.0)), color: None ), (Elf, Female, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, 8.0)), color: None ), (Dwarf, Male, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, 7.0)), color: None ), (Dwarf, Female, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, 7.0)), color: None ), (Danari, Male, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, 8.5)), color: None ), (Danari, Female, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, 9.0)), color: None ), (Undead, Male, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, 7.0)), color: None ), (Undead, Female, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, -1.0)), + vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, 7.0)), color: None ), (Orc, Male, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -2.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -3.0, 8.0)), color: None ), (Orc, Female, "common.items.armor.misc.head.spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, 7.0)), color: None ), // Merchant Turban