diff --git a/CHANGELOG.md b/CHANGELOG.md index bd41ea105a..2b33c80cc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,6 +68,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added a new option in the graphics menu to enable GPU timing (not always supported). The timing values can be viewed in the HUD debug info (F3) and will be saved as chrome trace files in the working directory when taking a screenshot. - Added new Present Mode option in the graphics menu. Selecting Fifo (i.e. vsync) or Mailbox can be used to eliminate screen tearing. - Quality color indicators next to recipe names in crafting menu +- New cave visuals: Ridges, pits, new sprites, colors +- Veins in caves to dig through to uncover ore +- Armor material system with 6 armor sets each in hide, mail and cloth categories +- New armor stats including max energy, energy reward, critical hit damage +- Meat drops from animals +- New ores, plants and hides to be looted from the world and processed into craft ingredients +- Added more crafting stations, loom, spinning wheel, tanning rack, forge ### Changed @@ -123,6 +130,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Reworked tidal warrior to have unique attacks - Reworked yeti to have unique attacks - Widened recipe name list in crafting menu +- Reworked animal loot tables ### Removed @@ -130,6 +138,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Gravity component has been removed - In-air movement has been removed - Energy cost of deploying the glider has been removed +- Removed steel and cultist loot tables ### Fixed diff --git a/Cargo.lock b/Cargo.lock index b4bfc16740..4d66c7cb35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5776,6 +5776,7 @@ dependencies = [ "ordered-float 2.5.1", "rand 0.8.3", "rayon", + "ron", "roots", "serde", "serde_repr", diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index d9e401f986..6a3c4f4f57 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -148,6 +148,11 @@ secondary: "common.abilities.custom.quadmedbasic.triplestrike", abilities: [], ), + Custom("Basilisk"): ( + primary: "common.abilities.custom.basilisk.singlestrike", + secondary: "common.abilities.custom.basilisk.triplestrike", + abilities: [], + ), Custom("Quad Low Ranged"): ( primary: "common.abilities.custom.quadlowranged.singlestrike", secondary: "common.abilities.custom.quadlowranged.firebomb", diff --git a/assets/common/abilities/custom/basilisk/singlestrike.ron b/assets/common/abilities/custom/basilisk/singlestrike.ron new file mode 100644 index 0000000000..3f21ccc88a --- /dev/null +++ b/assets/common/abilities/custom/basilisk/singlestrike.ron @@ -0,0 +1,27 @@ +ComboMelee( + stage_data: [ + ( + stage: 1, + base_damage: 130, + damage_increase: 0, + base_poise_damage: 28, + poise_damage_increase: 0, + knockback: 3.0, + range: 3.0, + angle: 60.0, + base_buildup_duration: 0.4, + base_swing_duration: 0.07, + base_recover_duration: 0.4, + forward_movement: 3.0, + damage_kind: Crushing, + ), + ], + initial_energy_gain: 0, + max_energy_gain: 0, + energy_increase: 0, + speed_increase: 0.0, + max_speed_increase: 0.0, + scales_from_combo: 0, + is_interruptible: false, + ori_modifier: 0.6, +) diff --git a/assets/common/abilities/custom/basilisk/triplestrike.ron b/assets/common/abilities/custom/basilisk/triplestrike.ron new file mode 100644 index 0000000000..fced56cfda --- /dev/null +++ b/assets/common/abilities/custom/basilisk/triplestrike.ron @@ -0,0 +1,57 @@ +ComboMelee( + stage_data: [ + ( + stage: 1, + base_damage: 100, + damage_increase: 0, + base_poise_damage: 15, + poise_damage_increase: 0, + knockback: 7.0, + range: 2.8, + angle: 30.0, + base_buildup_duration: 0.65, + base_swing_duration: 0.07, + base_recover_duration: 0.3, + forward_movement: 2.0, + damage_kind: Crushing, + ), + ( + stage: 2, + base_damage: 100, + damage_increase: 0, + base_poise_damage: 18, + poise_damage_increase: 0, + knockback: 7.0, + range: 2.8, + angle: 30.0, + base_buildup_duration: 0.4, + base_swing_duration: 0.07, + base_recover_duration: 0.3, + forward_movement: 1.5, + damage_kind: Crushing, + ), + ( + stage: 3, + base_damage: 100, + damage_increase: 0, + base_poise_damage: 20, + poise_damage_increase: 0, + knockback: 7.0, + range: 2.8, + angle: 30.0, + base_buildup_duration: 0.4, + base_swing_duration: 0.07, + base_recover_duration: 0.3, + forward_movement: 1.5, + damage_kind: Crushing, + ), + ], + initial_energy_gain: 0, + max_energy_gain: 0, + energy_increase: 0, + speed_increase: 0.0, + max_speed_increase: 0.0, + scales_from_combo: 0, + is_interruptible: false, + ori_modifier: 0.65, +) diff --git a/assets/common/abilities/pick/swing.ron b/assets/common/abilities/pick/swing.ron index 9e4a76fd5c..55a6fbe4ec 100644 --- a/assets/common/abilities/pick/swing.ron +++ b/assets/common/abilities/pick/swing.ron @@ -1,12 +1,12 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.6, - swing_duration: 0.1, - recover_duration: 0.15, + buildup_duration: 0.25, + swing_duration: 0.05, + recover_duration: 0.075, base_damage: 50, base_poise_damage: 0, knockback: ( strength: 0.0, direction: Away), - range: 3.5, + range: 4.5, max_angle: 20.0, damage_effect: None, damage_kind: Piercing, diff --git a/assets/common/cave_scatter.ron b/assets/common/cave_scatter.ron deleted file mode 100644 index 2176f1d68d..0000000000 --- a/assets/common/cave_scatter.ron +++ /dev/null @@ -1,15 +0,0 @@ -[ - (10, Velorite), - (15, VeloriteFrag), - (110, Stones), - (150, ShortGrass), - (120, CaveMushroom), - (30, AmethystSmall), - (30, TopazSmall), - (16, SapphireSmall), - (12, EmeraldSmall), - (8, RubySmall), - (4, DiamondSmall), - (5, Chest), - (15, Crate), -] diff --git a/assets/common/cave_scatter/dark_ceiling.ron b/assets/common/cave_scatter/dark_ceiling.ron new file mode 100644 index 0000000000..d8f1c601e3 --- /dev/null +++ b/assets/common/cave_scatter/dark_ceiling.ron @@ -0,0 +1,3 @@ +[ + (1, Orb), +] diff --git a/assets/common/cave_scatter/dark_floor.ron b/assets/common/cave_scatter/dark_floor.ron new file mode 100644 index 0000000000..1b3f456bff --- /dev/null +++ b/assets/common/cave_scatter/dark_floor.ron @@ -0,0 +1,10 @@ +[ + (20, Velorite), + (30, VeloriteFrag), + (5, CaveMushroom), + (16, SapphireSmall), + (12, EmeraldSmall), + (15, Cobalt), + (40, Coal), + (10, RubySmall), +] diff --git a/assets/common/cave_scatter/deep_ceiling.ron b/assets/common/cave_scatter/deep_ceiling.ron new file mode 100644 index 0000000000..dbe279a7ee --- /dev/null +++ b/assets/common/cave_scatter/deep_ceiling.ron @@ -0,0 +1,6 @@ +[ + (10, CeilingMushroom), + (6, Liana), + (7, CrystalHigh), + +] diff --git a/assets/common/cave_scatter/deep_floor.ron b/assets/common/cave_scatter/deep_floor.ron new file mode 100644 index 0000000000..66c2e3ce59 --- /dev/null +++ b/assets/common/cave_scatter/deep_floor.ron @@ -0,0 +1,15 @@ +[ + (30, Velorite), + (40, VeloriteFrag), + (10, CaveMushroom), + (30, Mushroom), + (10, AmethystSmall), + (10, TopazSmall), + (16, SapphireSmall), + (60, CrystalLow), + (12, EmeraldSmall), + (5, Cobalt), + (40, Coal), + (70, Iron), + (10, RubySmall), +] diff --git a/assets/common/cave_scatter/shallow_ceiling.ron b/assets/common/cave_scatter/shallow_ceiling.ron new file mode 100644 index 0000000000..b5fcdefb86 --- /dev/null +++ b/assets/common/cave_scatter/shallow_ceiling.ron @@ -0,0 +1,4 @@ +[ + (3, Liana), + (1, CeilingMushroom), +] diff --git a/assets/common/cave_scatter/shallow_floor.ron b/assets/common/cave_scatter/shallow_floor.ron new file mode 100644 index 0000000000..290a476ac3 --- /dev/null +++ b/assets/common/cave_scatter/shallow_floor.ron @@ -0,0 +1,13 @@ +[ + (110, Stones), + (150, ShortGrass), + (50, CaveMushroom), + (50, Mushroom), + (30, AmethystSmall), + (15, TopazSmall), + (15, Tin), + (12, Copper), + (15, Iron), + (5, Chest), + (15, Crate), +] diff --git a/assets/common/cave_scatter/vein.ron b/assets/common/cave_scatter/vein.ron new file mode 100644 index 0000000000..16059e8771 --- /dev/null +++ b/assets/common/cave_scatter/vein.ron @@ -0,0 +1,9 @@ +[ + (10, Velorite), + (10, VeloriteFrag), + (15, Cobalt), + (10, Bloodstone), + (15, Silver), + (10, Gold), + (8, DiamondSmall), +] diff --git a/assets/common/item_price_calculation.ron b/assets/common/item_price_calculation.ron index c2825e5e7d..ebba8d45df 100644 --- a/assets/common/item_price_calculation.ron +++ b/assets/common/item_price_calculation.ron @@ -14,15 +14,11 @@ loot_tables: [ (0.04, false, "common.loot_tables.weapons.legendary"), // Armor (20.0, true, "common.loot_tables.armor.cloth"), - (6.0, true, "common.loot_tables.armor.agile"), - (3.0, true, "common.loot_tables.armor.swift"), - (6.0, true, "common.loot_tables.armor.druid"), + (6.0, true, "common.loot_tables.armor.rawhide"), + (3.0, true, "common.loot_tables.armor.leather"), (1.0, true, "common.loot_tables.armor.twigs"), (1.0, true, "common.loot_tables.armor.twigsflowers"), (1.0, true, "common.loot_tables.armor.twigsleaves"), - (0.5, true, "common.loot_tables.armor.plate"), - (0.25, false, "common.loot_tables.armor.steel"), - (0.075, false, "common.loot_tables.armor.cultist"), // Materials (7.5, true, "common.loot_tables.materials.common"), (8.0, true, "common.loot_tables.materials.underground"), @@ -32,7 +28,7 @@ loot_tables: [ (0.2, true, "common.loot_tables.food.prepared"), // TODO: Change consumables and split them up (1.0, true, "common.loot_tables.consumable.default"), - (0.5, false, "common.loot_tables.trading"), + (10.5, false, "common.loot_tables.trading"), ], // this is the amount of that good the most common item represents // so basically this table balances the goods against each other (higher=less valuable) diff --git a/assets/common/items/armor/agile/back.ron b/assets/common/items/armor/agile/back.ron deleted file mode 100644 index dc32fda209..0000000000 --- a/assets/common/items/armor/agile/back.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Agile Cape", - description: "\'Tightly packed pieces of leather to endure all weather.\'", - kind: Armor(( - kind: Back("Agile"), - stats: ( - protection: Normal(0.2), - poise_resilience: Normal(0.1), - ), - )), - quality: Common, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/agile/belt.ron b/assets/common/items/armor/agile/belt.ron deleted file mode 100644 index 60924fa1c3..0000000000 --- a/assets/common/items/armor/agile/belt.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Agile Belt", - description: "\'Tightly packed pieces of leather to endure all weather.\'", - kind: Armor(( - kind: Belt("Agile"), - stats: ( - protection: Normal(1.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/agile/chest.ron b/assets/common/items/armor/agile/chest.ron deleted file mode 100644 index cc53636533..0000000000 --- a/assets/common/items/armor/agile/chest.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Agile Chest", - description: "Tightly packed pieces of leather to endure all weather.", - kind: Armor(( - kind: Chest("Agile"), - stats: ( - protection: Normal(8.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/agile/foot.ron b/assets/common/items/armor/agile/foot.ron deleted file mode 100644 index 1c8d6f7318..0000000000 --- a/assets/common/items/armor/agile/foot.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Agile Kickers", - description: "\'Tightly packed pieces of leather to endure all weather.", - kind: Armor(( - kind: Foot("Agile"), - stats: ( - protection: Normal(2.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/agile/hand.ron b/assets/common/items/armor/agile/hand.ron deleted file mode 100644 index 304609dcf2..0000000000 --- a/assets/common/items/armor/agile/hand.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Agile Gauntlets", - description: "\'Tightly packed pieces of leather to endure all weather.\'", - kind: Armor(( - kind: Hand("Agile"), - stats: ( - protection: Normal(4.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/agile/pants.ron b/assets/common/items/armor/agile/pants.ron deleted file mode 100644 index 563da5f983..0000000000 --- a/assets/common/items/armor/agile/pants.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Agile Pantalons", - description: "\'Tightly packed pieces of leather to endure all weather.\'", - kind: Armor(( - kind: Pants("Agile"), - stats: ( - protection: Normal(6.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/agile/shoulder.ron b/assets/common/items/armor/agile/shoulder.ron deleted file mode 100644 index 9e09202fe5..0000000000 --- a/assets/common/items/armor/agile/shoulder.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Agile Guards", - description: "Tightly packed pieces of leather to endure all weather.", - kind: Armor(( - kind: Shoulder("Agile"), - stats: ( - protection: Normal(8.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/belt.ron b/assets/common/items/armor/assassin/belt.ron index c058f86b94..ae349434f9 100644 --- a/assets/common/items/armor/assassin/belt.ron +++ b/assets/common/items/armor/assassin/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("Assassin"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/chest.ron b/assets/common/items/armor/assassin/chest.ron index 25c95c4661..b96df379c6 100644 --- a/assets/common/items/armor/assassin/chest.ron +++ b/assets/common/items/armor/assassin/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("Assassin"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/foot.ron b/assets/common/items/armor/assassin/foot.ron index 0dd80a1cf2..7f1c68f901 100644 --- a/assets/common/items/armor/assassin/foot.ron +++ b/assets/common/items/armor/assassin/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("Assassin"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/hand.ron b/assets/common/items/armor/assassin/hand.ron index 7512d45b5d..ee044382c9 100644 --- a/assets/common/items/armor/assassin/hand.ron +++ b/assets/common/items/armor/assassin/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("Assassin"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/head.ron b/assets/common/items/armor/assassin/head.ron index a6cf805c34..a5e0bf6963 100644 --- a/assets/common/items/armor/assassin/head.ron +++ b/assets/common/items/armor/assassin/head.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/pants.ron b/assets/common/items/armor/assassin/pants.ron index 1d19d67ca9..44661d30c2 100644 --- a/assets/common/items/armor/assassin/pants.ron +++ b/assets/common/items/armor/assassin/pants.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/shoulder.ron b/assets/common/items/armor/assassin/shoulder.ron index 7a580f0bd3..64987aba53 100644 --- a/assets/common/items/armor/assassin/shoulder.ron +++ b/assets/common/items/armor/assassin/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("Assassin"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/belt.ron b/assets/common/items/armor/bonerattler/belt.ron index 1e341a5520..54208a6940 100644 --- a/assets/common/items/armor/bonerattler/belt.ron +++ b/assets/common/items/armor/bonerattler/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("Bonerattler"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/chest.ron b/assets/common/items/armor/bonerattler/chest.ron index 5b4d2e63ad..27988826c2 100644 --- a/assets/common/items/armor/bonerattler/chest.ron +++ b/assets/common/items/armor/bonerattler/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("Bonerattler"), stats: ( protection: Normal(25.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/foot.ron b/assets/common/items/armor/bonerattler/foot.ron index ed36219c54..e86f96cbea 100644 --- a/assets/common/items/armor/bonerattler/foot.ron +++ b/assets/common/items/armor/bonerattler/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("Bonerattler"), stats: ( protection: Normal(5.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/hand.ron b/assets/common/items/armor/bonerattler/hand.ron index 8c1632288b..b5f73984a5 100644 --- a/assets/common/items/armor/bonerattler/hand.ron +++ b/assets/common/items/armor/bonerattler/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("Bonerattler"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/pants.ron b/assets/common/items/armor/bonerattler/pants.ron index f56d23c742..93b3dcc961 100644 --- a/assets/common/items/armor/bonerattler/pants.ron +++ b/assets/common/items/armor/bonerattler/pants.ron @@ -1,13 +1,19 @@ ItemDef( name: "Bonerattler Chausses", - description: "Assorted bones and hide from a bonerattler provide protection around the wearer\'s legs.", + description: "Assorted bones and hide from a bonerattler provide protection around the wearer's legs.", kind: Armor(( kind: Pants("Bonerattler"), stats: ( protection: Normal(20.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/shoulder.ron b/assets/common/items/armor/bonerattler/shoulder.ron index 93f7a7c550..2970c9a351 100644 --- a/assets/common/items/armor/bonerattler/shoulder.ron +++ b/assets/common/items/armor/bonerattler/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("Bonerattler"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/back.ron b/assets/common/items/armor/cloth/druid/back.ron new file mode 100644 index 0000000000..08087cafea --- /dev/null +++ b/assets/common/items/armor/cloth/druid/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Druid Cape", + description: "Incredibly light, with the essence of nature.", + kind: Armor(( + kind: Back("Druid"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(0.0), + energy_max: 33, + energy_reward: 0.034, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Lifecloth), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/belt.ron b/assets/common/items/armor/cloth/druid/belt.ron new file mode 100644 index 0000000000..5a747d685a --- /dev/null +++ b/assets/common/items/armor/cloth/druid/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Druid Sash", + description: "Incredibly light, with the essence of nature.", + kind: Armor(( + kind: Belt("Druid"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(0.0), + energy_max: 33, + energy_reward: 0.034, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Lifecloth), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/chest.ron b/assets/common/items/armor/cloth/druid/chest.ron new file mode 100644 index 0000000000..44cd558182 --- /dev/null +++ b/assets/common/items/armor/cloth/druid/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Druid Chestguard", + description: "Incredibly light, with the essence of nature.", + kind: Armor(( + kind: Chest("Druid"), + stats: ( + protection: Normal(18.0), + poise_resilience: Normal(0.0), + energy_max: 198, + energy_reward: 0.2, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Lifecloth), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/foot.ron b/assets/common/items/armor/cloth/druid/foot.ron new file mode 100644 index 0000000000..5d8720c3fe --- /dev/null +++ b/assets/common/items/armor/cloth/druid/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Druid Kickers", + description: "Incredibly light, with the essence of nature.", + kind: Armor(( + kind: Foot("Druid"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(0.0), + energy_max: 66, + energy_reward: 0.067, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Lifecloth), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/hand.ron b/assets/common/items/armor/cloth/druid/hand.ron new file mode 100644 index 0000000000..bc5cecde74 --- /dev/null +++ b/assets/common/items/armor/cloth/druid/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Druid Handwraps", + description: "Incredibly light, with the essence of nature.", + kind: Armor(( + kind: Hand("Druid"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(0.0), + energy_max: 66, + energy_reward: 0.067, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Lifecloth), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/pants.ron b/assets/common/items/armor/cloth/druid/pants.ron new file mode 100644 index 0000000000..84a2155e69 --- /dev/null +++ b/assets/common/items/armor/cloth/druid/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Druid Leggings", + description: "Incredibly light, with the essence of nature.", + kind: Armor(( + kind: Pants("Druid"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(0.0), + energy_max: 132, + energy_reward: 0.134, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Lifecloth), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/shoulder.ron b/assets/common/items/armor/cloth/druid/shoulder.ron new file mode 100644 index 0000000000..ff4064d554 --- /dev/null +++ b/assets/common/items/armor/cloth/druid/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Druid Shoulderpads", + description: "Incredibly light, with the essence of nature.", + kind: Armor(( + kind: Shoulder("Druid"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(0.0), + energy_max: 132, + energy_reward: 0.134, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Lifecloth), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/back.ron b/assets/common/items/armor/cloth/linen/back.ron new file mode 100644 index 0000000000..50b30f320c --- /dev/null +++ b/assets/common/items/armor/cloth/linen/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Linen Shawl", + description: "Roughly stitched, but it seems to hold.", + kind: Armor(( + kind: Back("Linen"), + stats: ( + protection: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 8, + energy_reward: 0.009, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/belt.ron b/assets/common/items/armor/cloth/linen/belt.ron new file mode 100644 index 0000000000..0495dc29cb --- /dev/null +++ b/assets/common/items/armor/cloth/linen/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Linen Sash", + description: "Roughly stitched, but it seems to hold.", + kind: Armor(( + kind: Belt("Linen"), + stats: ( + protection: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 8, + energy_reward: 0.009, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/chest.ron b/assets/common/items/armor/cloth/linen/chest.ron new file mode 100644 index 0000000000..f4e386d26b --- /dev/null +++ b/assets/common/items/armor/cloth/linen/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Linen Vest", + description: "Roughly stitched, but it seems to hold.", + kind: Armor(( + kind: Chest("Linen"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 50, + energy_reward: 0.051, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/foot.ron b/assets/common/items/armor/cloth/linen/foot.ron new file mode 100644 index 0000000000..8712c18208 --- /dev/null +++ b/assets/common/items/armor/cloth/linen/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Linen Feet", + description: "Roughly stitched, but it seems to hold.", + kind: Armor(( + kind: Foot("Linen"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 17, + energy_reward: 0.017, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/hand.ron b/assets/common/items/armor/cloth/linen/hand.ron new file mode 100644 index 0000000000..77b8e9d35b --- /dev/null +++ b/assets/common/items/armor/cloth/linen/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Linen Handwraps", + description: "Roughly stitched, but it seems to hold.", + kind: Armor(( + kind: Hand("Linen"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 17, + energy_reward: 0.017, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/pants.ron b/assets/common/items/armor/cloth/linen/pants.ron new file mode 100644 index 0000000000..ea71095ca9 --- /dev/null +++ b/assets/common/items/armor/cloth/linen/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Linen Pants", + description: "Roughly stitched, but it seems to hold.", + kind: Armor(( + kind: Pants("Linen"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(0.0), + energy_max: 33, + energy_reward: 0.034, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/shoulder.ron b/assets/common/items/armor/cloth/linen/shoulder.ron new file mode 100644 index 0000000000..2db1b2b460 --- /dev/null +++ b/assets/common/items/armor/cloth/linen/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Linen Shoulders", + description: "Roughly stitched, but it seems to hold.", + kind: Armor(( + kind: Shoulder("Linen"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(0.0), + energy_max: 33, + energy_reward: 0.034, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/back.ron b/assets/common/items/armor/cloth/moonweave/back.ron new file mode 100644 index 0000000000..aca1662b22 --- /dev/null +++ b/assets/common/items/armor/cloth/moonweave/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Moonweave Cape", + description: "The fabric dances silently, like moonlight.", + kind: Armor(( + kind: Back("Moonweave"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.0), + energy_max: 41, + energy_reward: 0.042, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Moonweave), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/belt.ron b/assets/common/items/armor/cloth/moonweave/belt.ron new file mode 100644 index 0000000000..6c96fad42e --- /dev/null +++ b/assets/common/items/armor/cloth/moonweave/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Moonweave Belt", + description: "The fabric dances silently, like moonlight.", + kind: Armor(( + kind: Belt("Moonweave"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.0), + energy_max: 41, + energy_reward: 0.042, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Moonweave), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/chest.ron b/assets/common/items/armor/cloth/moonweave/chest.ron new file mode 100644 index 0000000000..e254605f7e --- /dev/null +++ b/assets/common/items/armor/cloth/moonweave/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Moonweave Vest", + description: "The fabric dances silently, like moonlight.", + kind: Armor(( + kind: Chest("Moonweave"), + stats: ( + protection: Normal(23.0), + poise_resilience: Normal(0.0), + energy_max: 248, + energy_reward: 0.252, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Moonweave), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/foot.ron b/assets/common/items/armor/cloth/moonweave/foot.ron new file mode 100644 index 0000000000..56d10545d9 --- /dev/null +++ b/assets/common/items/armor/cloth/moonweave/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Moonweave Boots", + description: "The fabric dances silently, like moonlight.", + kind: Armor(( + kind: Foot("Moonweave"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(0.0), + energy_max: 83, + energy_reward: 0.084, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Moonweave), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/hand.ron b/assets/common/items/armor/cloth/moonweave/hand.ron new file mode 100644 index 0000000000..a9e4ae8d00 --- /dev/null +++ b/assets/common/items/armor/cloth/moonweave/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Moonweave Gloves", + description: "The fabric dances silently, like moonlight.", + kind: Armor(( + kind: Hand("Moonweave"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(0.0), + energy_max: 83, + energy_reward: 0.084, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Moonweave), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/pants.ron b/assets/common/items/armor/cloth/moonweave/pants.ron new file mode 100644 index 0000000000..3a62c88d96 --- /dev/null +++ b/assets/common/items/armor/cloth/moonweave/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Moonweave Legs", + description: "The fabric dances silently, like moonlight.", + kind: Armor(( + kind: Pants("Moonweave"), + stats: ( + protection: Normal(17.0), + poise_resilience: Normal(0.0), + energy_max: 165, + energy_reward: 0.168, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Moonweave), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/shoulder.ron b/assets/common/items/armor/cloth/moonweave/shoulder.ron new file mode 100644 index 0000000000..7e66e648dd --- /dev/null +++ b/assets/common/items/armor/cloth/moonweave/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Moonweave Shoulders", + description: "The fabric dances silently, like moonlight.", + kind: Armor(( + kind: Shoulder("Moonweave"), + stats: ( + protection: Normal(17.0), + poise_resilience: Normal(0.0), + energy_max: 165, + energy_reward: 0.168, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Moonweave), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/back.ron b/assets/common/items/armor/cloth/silken/back.ron new file mode 100644 index 0000000000..e2a085d8da --- /dev/null +++ b/assets/common/items/armor/cloth/silken/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Silken Cape", + description: "Weaved with care by a skilled tailor.", + kind: Armor(( + kind: Back("Silken"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 25, + energy_reward: 0.025, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Silk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/belt.ron b/assets/common/items/armor/cloth/silken/belt.ron new file mode 100644 index 0000000000..e0c3e2909e --- /dev/null +++ b/assets/common/items/armor/cloth/silken/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Silken Sash", + description: "Weaved with care by a skilled tailor.", + kind: Armor(( + kind: Belt("Silken"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 25, + energy_reward: 0.025, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Silk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/chest.ron b/assets/common/items/armor/cloth/silken/chest.ron new file mode 100644 index 0000000000..5241cde002 --- /dev/null +++ b/assets/common/items/armor/cloth/silken/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Silken Robe", + description: "Weaved with care by a skilled tailor.", + kind: Armor(( + kind: Chest("Silken"), + stats: ( + protection: Normal(14.0), + poise_resilience: Normal(0.0), + energy_max: 149, + energy_reward: 0.15, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Silk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/foot.ron b/assets/common/items/armor/cloth/silken/foot.ron new file mode 100644 index 0000000000..faccd273dd --- /dev/null +++ b/assets/common/items/armor/cloth/silken/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Silken Feet", + description: "Weaved with care by a skilled tailor.", + kind: Armor(( + kind: Foot("Silken"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 50, + energy_reward: 0.05, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Silk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/hand.ron b/assets/common/items/armor/cloth/silken/hand.ron new file mode 100644 index 0000000000..58bfc16ae5 --- /dev/null +++ b/assets/common/items/armor/cloth/silken/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Silken Wraps", + description: "Weaved with care by a skilled tailor.", + kind: Armor(( + kind: Hand("Silken"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 50, + energy_reward: 0.05, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Silk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/pants.ron b/assets/common/items/armor/cloth/silken/pants.ron new file mode 100644 index 0000000000..c03f76a11c --- /dev/null +++ b/assets/common/items/armor/cloth/silken/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Silken Skirt", + description: "Weaved with care by a skilled tailor.", + kind: Armor(( + kind: Pants("Silken"), + stats: ( + protection: Normal(9.0), + poise_resilience: Normal(0.0), + energy_max: 99, + energy_reward: 0.1, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Silk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/shoulder.ron b/assets/common/items/armor/cloth/silken/shoulder.ron new file mode 100644 index 0000000000..9e56ffb2a8 --- /dev/null +++ b/assets/common/items/armor/cloth/silken/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Silken Shoulders", + description: "Weaved with care by a skilled tailor.", + kind: Armor(( + kind: Shoulder("Silken"), + stats: ( + protection: Normal(9.0), + poise_resilience: Normal(0.0), + energy_max: 99, + energy_reward: 0.1, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Silk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/back.ron b/assets/common/items/armor/cloth/sunsilk/back.ron new file mode 100644 index 0000000000..f1a17439ce --- /dev/null +++ b/assets/common/items/armor/cloth/sunsilk/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Sunsilk Cape", + description: "It radiates with the sun's power, and the grace to harness it.", + kind: Armor(( + kind: Back("Sunsilk"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 50, + energy_reward: 0.05, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Sunsilk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/belt.ron b/assets/common/items/armor/cloth/sunsilk/belt.ron new file mode 100644 index 0000000000..17081c0c0c --- /dev/null +++ b/assets/common/items/armor/cloth/sunsilk/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Sunsilk Sash", + description: "It radiates with the sun's power, and the grace to harness it.", + kind: Armor(( + kind: Belt("Sunsilk"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 50, + energy_reward: 0.05, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Sunsilk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/chest.ron b/assets/common/items/armor/cloth/sunsilk/chest.ron new file mode 100644 index 0000000000..a7ba1d00f0 --- /dev/null +++ b/assets/common/items/armor/cloth/sunsilk/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Sunsilk Tunic", + description: "It radiates with the sun's power, and the grace to harness it.", + kind: Armor(( + kind: Chest("Sunsilk"), + stats: ( + protection: Normal(90.0), + poise_resilience: Normal(0.0), + energy_max: 300, + energy_reward: 0.3, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Sunsilk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/foot.ron b/assets/common/items/armor/cloth/sunsilk/foot.ron new file mode 100644 index 0000000000..fd40390d1c --- /dev/null +++ b/assets/common/items/armor/cloth/sunsilk/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Sunsilk Footwraps", + description: "It radiates with the sun's power, and the grace to harness it.", + kind: Armor(( + kind: Foot("Sunsilk"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 100, + energy_reward: 0.1, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Sunsilk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/hand.ron b/assets/common/items/armor/cloth/sunsilk/hand.ron new file mode 100644 index 0000000000..8875e56749 --- /dev/null +++ b/assets/common/items/armor/cloth/sunsilk/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Sunsilk Handwraps", + description: "It radiates with the sun's power, and the grace to harness it.", + kind: Armor(( + kind: Hand("Sunsilk"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 100, + energy_reward: 0.1, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Sunsilk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/pants.ron b/assets/common/items/armor/cloth/sunsilk/pants.ron new file mode 100644 index 0000000000..4d6efad703 --- /dev/null +++ b/assets/common/items/armor/cloth/sunsilk/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Sunsilk Kilt", + description: "It radiates with the sun's power, and the grace to harness it.", + kind: Armor(( + kind: Pants("Sunsilk"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 200, + energy_reward: 0.2, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Sunsilk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/shoulder.ron b/assets/common/items/armor/cloth/sunsilk/shoulder.ron new file mode 100644 index 0000000000..1c25787340 --- /dev/null +++ b/assets/common/items/armor/cloth/sunsilk/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Sunsilk Shoulderwraps", + description: "It radiates with the sun's power, and the grace to harness it.", + kind: Armor(( + kind: Shoulder("Sunsilk"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 200, + energy_reward: 0.2, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Sunsilk), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/back.ron b/assets/common/items/armor/cloth/woolen/back.ron new file mode 100644 index 0000000000..2ce0b243c4 --- /dev/null +++ b/assets/common/items/armor/cloth/woolen/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Woolen Cloak", + description: "Thick and ready for the snow.", + kind: Armor(( + kind: Back("Woolen"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 17, + energy_reward: 0.017, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Wool), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/belt.ron b/assets/common/items/armor/cloth/woolen/belt.ron new file mode 100644 index 0000000000..6f345bbf6c --- /dev/null +++ b/assets/common/items/armor/cloth/woolen/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Woolen Belt", + description: "Thick and ready for the snow.", + kind: Armor(( + kind: Belt("Woolen"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 17, + energy_reward: 0.017, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Wool), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/chest.ron b/assets/common/items/armor/cloth/woolen/chest.ron new file mode 100644 index 0000000000..ca2205e2ae --- /dev/null +++ b/assets/common/items/armor/cloth/woolen/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Woolen Parka", + description: "Thick and ready for the snow.", + kind: Armor(( + kind: Chest("Woolen"), + stats: ( + protection: Normal(9.0), + poise_resilience: Normal(0.0), + energy_max: 99, + energy_reward: 0.099, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Wool), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/foot.ron b/assets/common/items/armor/cloth/woolen/foot.ron new file mode 100644 index 0000000000..ed6129ef15 --- /dev/null +++ b/assets/common/items/armor/cloth/woolen/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Woolen Boots", + description: "Thick and ready for the snow.", + kind: Armor(( + kind: Foot("Woolen"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(0.0), + energy_max: 33, + energy_reward: 0.033, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Wool), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/hand.ron b/assets/common/items/armor/cloth/woolen/hand.ron new file mode 100644 index 0000000000..45e9528e72 --- /dev/null +++ b/assets/common/items/armor/cloth/woolen/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Woolen Mittens", + description: "Thick and ready for the snow.", + kind: Armor(( + kind: Hand("Woolen"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(0.0), + energy_max: 33, + energy_reward: 0.033, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Wool), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/pants.ron b/assets/common/items/armor/cloth/woolen/pants.ron new file mode 100644 index 0000000000..4cf18467e1 --- /dev/null +++ b/assets/common/items/armor/cloth/woolen/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Woolen Pants", + description: "Thick and ready for the snow.", + kind: Armor(( + kind: Pants("Woolen"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(0.0), + energy_max: 66, + energy_reward: 0.066, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Wool), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/shoulder.ron b/assets/common/items/armor/cloth/woolen/shoulder.ron new file mode 100644 index 0000000000..bf9a0041f6 --- /dev/null +++ b/assets/common/items/armor/cloth/woolen/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Woolen Shoulders", + description: "Thick and ready for the snow.", + kind: Armor(( + kind: Shoulder("Woolen"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(0.0), + energy_max: 66, + energy_reward: 0.066, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Wool), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/belt.ron b/assets/common/items/armor/cloth_blue/belt.ron index 28ef54799c..0bdda2d7b6 100644 --- a/assets/common/items/armor/cloth_blue/belt.ron +++ b/assets/common/items/armor/cloth_blue/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("ClothBlue"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/chest.ron b/assets/common/items/armor/cloth_blue/chest.ron index 0f48e87d36..1629e7500e 100644 --- a/assets/common/items/armor/cloth_blue/chest.ron +++ b/assets/common/items/armor/cloth_blue/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("ClothBlue"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/foot.ron b/assets/common/items/armor/cloth_blue/foot.ron index dd15879046..8f42e6b97f 100644 --- a/assets/common/items/armor/cloth_blue/foot.ron +++ b/assets/common/items/armor/cloth_blue/foot.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/hand.ron b/assets/common/items/armor/cloth_blue/hand.ron index ddc21118b6..68cf2ed18b 100644 --- a/assets/common/items/armor/cloth_blue/hand.ron +++ b/assets/common/items/armor/cloth_blue/hand.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/pants.ron b/assets/common/items/armor/cloth_blue/pants.ron index 991a375a88..3bcdd35fb8 100644 --- a/assets/common/items/armor/cloth_blue/pants.ron +++ b/assets/common/items/armor/cloth_blue/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("ClothBlue"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/shoulder_0.ron b/assets/common/items/armor/cloth_blue/shoulder_0.ron index e871eb66e4..831819fe4c 100644 --- a/assets/common/items/armor/cloth_blue/shoulder_0.ron +++ b/assets/common/items/armor/cloth_blue/shoulder_0.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("ClothBlue0"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/shoulder_1.ron b/assets/common/items/armor/cloth_blue/shoulder_1.ron index b3cc1a9780..7d8dfdbad3 100644 --- a/assets/common/items/armor/cloth_blue/shoulder_1.ron +++ b/assets/common/items/armor/cloth_blue/shoulder_1.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("ClothBlue1"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/belt.ron b/assets/common/items/armor/cloth_green/belt.ron index 961dd4398c..e7f6f148c4 100644 --- a/assets/common/items/armor/cloth_green/belt.ron +++ b/assets/common/items/armor/cloth_green/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("ClothGreen"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/chest.ron b/assets/common/items/armor/cloth_green/chest.ron index 80e844b7cf..dc85c1d24c 100644 --- a/assets/common/items/armor/cloth_green/chest.ron +++ b/assets/common/items/armor/cloth_green/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("ClothGreen"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/foot.ron b/assets/common/items/armor/cloth_green/foot.ron index 6eaa31cef0..9191c48b75 100644 --- a/assets/common/items/armor/cloth_green/foot.ron +++ b/assets/common/items/armor/cloth_green/foot.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/hand.ron b/assets/common/items/armor/cloth_green/hand.ron index 330e942996..e67884c81f 100644 --- a/assets/common/items/armor/cloth_green/hand.ron +++ b/assets/common/items/armor/cloth_green/hand.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/pants.ron b/assets/common/items/armor/cloth_green/pants.ron index 66e02e82b7..6db606c17a 100644 --- a/assets/common/items/armor/cloth_green/pants.ron +++ b/assets/common/items/armor/cloth_green/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("ClothGreen"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/shoulder.ron b/assets/common/items/armor/cloth_green/shoulder.ron index f88213f29f..bcb610c6d6 100644 --- a/assets/common/items/armor/cloth_green/shoulder.ron +++ b/assets/common/items/armor/cloth_green/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("ClothGreen"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/belt.ron b/assets/common/items/armor/cloth_purple/belt.ron index db714546a9..69db3e70ae 100644 --- a/assets/common/items/armor/cloth_purple/belt.ron +++ b/assets/common/items/armor/cloth_purple/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("ClothPurple"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/chest.ron b/assets/common/items/armor/cloth_purple/chest.ron index 2212b075f5..65fa293261 100644 --- a/assets/common/items/armor/cloth_purple/chest.ron +++ b/assets/common/items/armor/cloth_purple/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("ClothPurple"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/foot.ron b/assets/common/items/armor/cloth_purple/foot.ron index 32adc3427c..db158a54ed 100644 --- a/assets/common/items/armor/cloth_purple/foot.ron +++ b/assets/common/items/armor/cloth_purple/foot.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/hand.ron b/assets/common/items/armor/cloth_purple/hand.ron index d57beebeba..d32a36f46b 100644 --- a/assets/common/items/armor/cloth_purple/hand.ron +++ b/assets/common/items/armor/cloth_purple/hand.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/pants.ron b/assets/common/items/armor/cloth_purple/pants.ron index 36888a2211..89faf32704 100644 --- a/assets/common/items/armor/cloth_purple/pants.ron +++ b/assets/common/items/armor/cloth_purple/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("ClothPurple"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/shoulder.ron b/assets/common/items/armor/cloth_purple/shoulder.ron index d4ab23ccab..244e5623ba 100644 --- a/assets/common/items/armor/cloth_purple/shoulder.ron +++ b/assets/common/items/armor/cloth_purple/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("ClothPurple"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/belt.ron b/assets/common/items/armor/cultist/belt.ron index 43421d8095..55d4758882 100644 --- a/assets/common/items/armor/cultist/belt.ron +++ b/assets/common/items/armor/cultist/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("Cultist"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [Cultist], -) + tags: [ + Cultist, + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/chest.ron b/assets/common/items/armor/cultist/chest.ron index be4e9f0040..acfc5dac59 100644 --- a/assets/common/items/armor/cultist/chest.ron +++ b/assets/common/items/armor/cultist/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("Cultist"), stats: ( protection: Normal(30.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [Cultist], -) + tags: [ + Cultist, + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/foot.ron b/assets/common/items/armor/cultist/foot.ron index ba5caedadc..41f4f572c7 100644 --- a/assets/common/items/armor/cultist/foot.ron +++ b/assets/common/items/armor/cultist/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("Cultist"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [Cultist], -) + tags: [ + Cultist, + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/hand.ron b/assets/common/items/armor/cultist/hand.ron index 0d7dc37e16..4b5939dafb 100644 --- a/assets/common/items/armor/cultist/hand.ron +++ b/assets/common/items/armor/cultist/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("Cultist"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [Cultist], -) + tags: [ + Cultist, + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/pants.ron b/assets/common/items/armor/cultist/pants.ron index 2a48813088..8461be9c53 100644 --- a/assets/common/items/armor/cultist/pants.ron +++ b/assets/common/items/armor/cultist/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("Cultist"), stats: ( protection: Normal(24.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [Cultist], -) + tags: [ + Cultist, + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/shoulder.ron b/assets/common/items/armor/cultist/shoulder.ron index 58a03db82d..d88bd22f51 100644 --- a/assets/common/items/armor/cultist/shoulder.ron +++ b/assets/common/items/armor/cultist/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("Cultist"), stats: ( protection: Normal(18.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [Cultist], -) + tags: [ + Cultist, + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/druid/belt.ron b/assets/common/items/armor/druid/belt.ron deleted file mode 100644 index 98f9893097..0000000000 --- a/assets/common/items/armor/druid/belt.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Belt", - description: "Twisted vines to keep everything secure.", - kind: Armor(( - kind: Belt("Druid"), - stats: ( - protection: Normal(2.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/chest.ron b/assets/common/items/armor/druid/chest.ron deleted file mode 100644 index 346e0e31aa..0000000000 --- a/assets/common/items/armor/druid/chest.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Vest", - description: "Vines and leaves formed into a tunic.", - kind: Armor(( - kind: Chest("Druid"), - stats: ( - protection: Normal(6.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/foot.ron b/assets/common/items/armor/druid/foot.ron deleted file mode 100644 index 9bc8abc377..0000000000 --- a/assets/common/items/armor/druid/foot.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Slippers", - description: "For treading softly through the woods.", - kind: Armor(( - kind: Foot("Druid"), - stats: ( - protection: Normal(1.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/hand.ron b/assets/common/items/armor/druid/hand.ron deleted file mode 100644 index abca18a39a..0000000000 --- a/assets/common/items/armor/druid/hand.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Gloves", - description: "Soft, strong, and flexible.", - kind: Armor(( - kind: Hand("Druid"), - stats: ( - protection: Normal(2.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/pants.ron b/assets/common/items/armor/druid/pants.ron deleted file mode 100644 index ce3a392812..0000000000 --- a/assets/common/items/armor/druid/pants.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Kilt", - description: "Feel the breeze!", - kind: Armor(( - kind: Pants("Druid"), - stats: ( - protection: Normal(4.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/shoulder.ron b/assets/common/items/armor/druid/shoulder.ron deleted file mode 100644 index e1cf6c0d1c..0000000000 --- a/assets/common/items/armor/druid/shoulder.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid Shoulders", - description: "Forged for protectors of the wild.", - kind: Armor(( - kind: Shoulder("Druid"), - stats: ( - protection: Normal(3.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [], -) diff --git a/assets/common/items/armor/ferocious/back.ron b/assets/common/items/armor/ferocious/back.ron index 2fe58fc063..b06908255d 100644 --- a/assets/common/items/armor/ferocious/back.ron +++ b/assets/common/items/armor/ferocious/back.ron @@ -5,9 +5,15 @@ ItemDef( kind: Back("Ferocious"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/ferocious/belt.ron b/assets/common/items/armor/ferocious/belt.ron index 4486641465..55bda41c7d 100644 --- a/assets/common/items/armor/ferocious/belt.ron +++ b/assets/common/items/armor/ferocious/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("Ferocious"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/ferocious/chest.ron b/assets/common/items/armor/ferocious/chest.ron index b39b5cfa60..97b08c3bc8 100644 --- a/assets/common/items/armor/ferocious/chest.ron +++ b/assets/common/items/armor/ferocious/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("Ferocious"), stats: ( protection: Normal(30.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/ferocious/foot.ron b/assets/common/items/armor/ferocious/foot.ron index 2d9e2667aa..291e01fc78 100644 --- a/assets/common/items/armor/ferocious/foot.ron +++ b/assets/common/items/armor/ferocious/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("Ferocious"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/ferocious/hand.ron b/assets/common/items/armor/ferocious/hand.ron index b7bb7cc90e..50432bffe5 100644 --- a/assets/common/items/armor/ferocious/hand.ron +++ b/assets/common/items/armor/ferocious/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("Ferocious"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/ferocious/pants.ron b/assets/common/items/armor/ferocious/pants.ron index fc1d0be115..f3cf907020 100644 --- a/assets/common/items/armor/ferocious/pants.ron +++ b/assets/common/items/armor/ferocious/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("Ferocious"), stats: ( protection: Normal(24.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/ferocious/shoulder.ron b/assets/common/items/armor/ferocious/shoulder.ron index b73b090e95..dc7fa8a236 100644 --- a/assets/common/items/armor/ferocious/shoulder.ron +++ b/assets/common/items/armor/ferocious/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("Ferocious"), stats: ( protection: Normal(18.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron new file mode 100644 index 0000000000..005a81d486 --- /dev/null +++ b/assets/common/items/armor/hide/carapace/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Carapace Cape", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Back("Carapace"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.067, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Carapace), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/belt.ron b/assets/common/items/armor/hide/carapace/belt.ron new file mode 100644 index 0000000000..f5e6b19499 --- /dev/null +++ b/assets/common/items/armor/hide/carapace/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Carapace Belt", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Belt("Carapace"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.067, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Carapace), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/chest.ron b/assets/common/items/armor/hide/carapace/chest.ron new file mode 100644 index 0000000000..a2adc469c5 --- /dev/null +++ b/assets/common/items/armor/hide/carapace/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Carapace Cuirass", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Chest("Carapace"), + stats: ( + protection: Normal(29.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.399, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Carapace), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/foot.ron b/assets/common/items/armor/hide/carapace/foot.ron new file mode 100644 index 0000000000..32433005d4 --- /dev/null +++ b/assets/common/items/armor/hide/carapace/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Carapace Treads", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Foot("Carapace"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.133, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Carapace), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/hand.ron b/assets/common/items/armor/hide/carapace/hand.ron new file mode 100644 index 0000000000..b22f659b34 --- /dev/null +++ b/assets/common/items/armor/hide/carapace/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Carapace Grips", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Hand("Carapace"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.133, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Carapace), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/pants.ron b/assets/common/items/armor/hide/carapace/pants.ron new file mode 100644 index 0000000000..e4c7c672b8 --- /dev/null +++ b/assets/common/items/armor/hide/carapace/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Carapace Leggings", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Pants("Carapace"), + stats: ( + protection: Normal(19.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.266, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Carapace), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/shoulder.ron b/assets/common/items/armor/hide/carapace/shoulder.ron new file mode 100644 index 0000000000..815471f5b7 --- /dev/null +++ b/assets/common/items/armor/hide/carapace/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Carapace Shoulderpads", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Shoulder("Carapace"), + stats: ( + protection: Normal(19.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.266, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Carapace), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/back.ron b/assets/common/items/armor/hide/dragonscale/back.ron new file mode 100644 index 0000000000..033b23e776 --- /dev/null +++ b/assets/common/items/armor/hide/dragonscale/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Dragonscale Cape", + description: "Power pulses through it.", + kind: Armor(( + kind: Back("Dragonscale"), + stats: ( + protection: Normal(7.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.1, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Dragonscale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/belt.ron b/assets/common/items/armor/hide/dragonscale/belt.ron new file mode 100644 index 0000000000..71d0da7170 --- /dev/null +++ b/assets/common/items/armor/hide/dragonscale/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Dragonscale Sash", + description: "Power pulses through it.", + kind: Armor(( + kind: Belt("Dragonscale"), + stats: ( + protection: Normal(7.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.1, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Dragonscale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/chest.ron b/assets/common/items/armor/hide/dragonscale/chest.ron new file mode 100644 index 0000000000..17644ee241 --- /dev/null +++ b/assets/common/items/armor/hide/dragonscale/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Dragonscale Chestplate", + description: "Power pulses through it.", + kind: Armor(( + kind: Chest("Dragonscale"), + stats: ( + protection: Normal(42.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.6, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Dragonscale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/foot.ron b/assets/common/items/armor/hide/dragonscale/foot.ron new file mode 100644 index 0000000000..fc047d7a0b --- /dev/null +++ b/assets/common/items/armor/hide/dragonscale/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Dragonscale Spurs", + description: "Power pulses through it.", + kind: Armor(( + kind: Foot("Dragonscale"), + stats: ( + protection: Normal(14.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.2, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Dragonscale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/hand.ron b/assets/common/items/armor/hide/dragonscale/hand.ron new file mode 100644 index 0000000000..86e690e2b4 --- /dev/null +++ b/assets/common/items/armor/hide/dragonscale/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Dragonscale Gloves", + description: "Power pulses through it.", + kind: Armor(( + kind: Hand("Dragonscale"), + stats: ( + protection: Normal(14.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.2, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Dragonscale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/pants.ron b/assets/common/items/armor/hide/dragonscale/pants.ron new file mode 100644 index 0000000000..977a9b5674 --- /dev/null +++ b/assets/common/items/armor/hide/dragonscale/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Dragonscale Leggings", + description: "Power pulses through it.", + kind: Armor(( + kind: Pants("Dragonscale"), + stats: ( + protection: Normal(28.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.4, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Dragonscale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/shoulder.ron b/assets/common/items/armor/hide/dragonscale/shoulder.ron new file mode 100644 index 0000000000..62147fb3b1 --- /dev/null +++ b/assets/common/items/armor/hide/dragonscale/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Dragonscale Mantle", + description: "Power pulses through it.", + kind: Armor(( + kind: Shoulder("Dragonscale"), + stats: ( + protection: Normal(28.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.4, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Dragonscale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/back.ron b/assets/common/items/armor/hide/leather/back.ron new file mode 100644 index 0000000000..4de72c0d67 --- /dev/null +++ b/assets/common/items/armor/hide/leather/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Leather Cloak", + description: "Swift like the wind.", + kind: Armor(( + kind: Back("Leather"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.034, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/belt.ron b/assets/common/items/armor/hide/leather/belt.ron new file mode 100644 index 0000000000..14f81b8e65 --- /dev/null +++ b/assets/common/items/armor/hide/leather/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Leather Belt", + description: "Swift like the wind.", + kind: Armor(( + kind: Belt("Leather"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.034, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/chest.ron b/assets/common/items/armor/hide/leather/chest.ron new file mode 100644 index 0000000000..811fdd7c86 --- /dev/null +++ b/assets/common/items/armor/hide/leather/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Leather Chestpiece", + description: "Swift like the wind.", + kind: Armor(( + kind: Chest("Leather"), + stats: ( + protection: Normal(14.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.201, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/foot.ron b/assets/common/items/armor/hide/leather/foot.ron new file mode 100644 index 0000000000..a6ac8a88c7 --- /dev/null +++ b/assets/common/items/armor/hide/leather/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Leather Boots", + description: "Swift like the wind.", + kind: Armor(( + kind: Foot("Leather"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.067, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/hand.ron b/assets/common/items/armor/hide/leather/hand.ron new file mode 100644 index 0000000000..79c12d1c10 --- /dev/null +++ b/assets/common/items/armor/hide/leather/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Leather Gloves", + description: "Swift like the wind.", + kind: Armor(( + kind: Hand("Leather"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.067, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/head.ron b/assets/common/items/armor/hide/leather/head.ron new file mode 100644 index 0000000000..335c7561e7 --- /dev/null +++ b/assets/common/items/armor/hide/leather/head.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Leather Cap", + description: "Swift like the wind.", + kind: Armor(( + kind: Head("Leather"), + stats: ( + protection: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/pants.ron b/assets/common/items/armor/hide/leather/pants.ron new file mode 100644 index 0000000000..6ff2ac8a48 --- /dev/null +++ b/assets/common/items/armor/hide/leather/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Leather Pants", + description: "Swift like the wind.", + kind: Armor(( + kind: Pants("Leather"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.134, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/shoulder.ron b/assets/common/items/armor/hide/leather/shoulder.ron new file mode 100644 index 0000000000..bf6cc6565e --- /dev/null +++ b/assets/common/items/armor/hide/leather/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Leather Shoulderpads", + description: "Swift like the wind.", + kind: Armor(( + kind: Shoulder("Leather"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.134, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/back.ron b/assets/common/items/armor/hide/primal/back.ron new file mode 100644 index 0000000000..16d24fdce7 --- /dev/null +++ b/assets/common/items/armor/hide/primal/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Primal Cape", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Back("Primal"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.084, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Plate), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/belt.ron b/assets/common/items/armor/hide/primal/belt.ron new file mode 100644 index 0000000000..cdc557df3d --- /dev/null +++ b/assets/common/items/armor/hide/primal/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Primal Sash", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Belt("Primal"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.084, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Plate), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/chest.ron b/assets/common/items/armor/hide/primal/chest.ron new file mode 100644 index 0000000000..45bbd7edd0 --- /dev/null +++ b/assets/common/items/armor/hide/primal/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Primal Cuirass", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Chest("Primal"), + stats: ( + protection: Normal(36.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.501, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Plate), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/foot.ron b/assets/common/items/armor/hide/primal/foot.ron new file mode 100644 index 0000000000..cd1ed43bf6 --- /dev/null +++ b/assets/common/items/armor/hide/primal/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Primal Boots", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Foot("Primal"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.167, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Plate), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/hand.ron b/assets/common/items/armor/hide/primal/hand.ron new file mode 100644 index 0000000000..4391547500 --- /dev/null +++ b/assets/common/items/armor/hide/primal/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Primal Gauntlets", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Hand("Primal"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.167, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Plate), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/pants.ron b/assets/common/items/armor/hide/primal/pants.ron new file mode 100644 index 0000000000..0ae4458161 --- /dev/null +++ b/assets/common/items/armor/hide/primal/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Primal Legs", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Pants("Primal"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.334, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Plate), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/shoulder.ron b/assets/common/items/armor/hide/primal/shoulder.ron new file mode 100644 index 0000000000..e82391403a --- /dev/null +++ b/assets/common/items/armor/hide/primal/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Primal Shoulders", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Shoulder("Primal"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.334, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Plate), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/back.ron b/assets/common/items/armor/hide/rawhide/back.ron new file mode 100644 index 0000000000..e814adacf5 --- /dev/null +++ b/assets/common/items/armor/hide/rawhide/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Rawhide Cloak", + description: "'Tightly packed pieces of leather to endure all weather.'", + kind: Armor(( + kind: Back("Rawhide"), + stats: ( + protection: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.017, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Rawhide), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/belt.ron b/assets/common/items/armor/hide/rawhide/belt.ron new file mode 100644 index 0000000000..330e09ac4d --- /dev/null +++ b/assets/common/items/armor/hide/rawhide/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Rawhide Belt", + description: "'Tightly packed pieces of leather to endure all weather.'", + kind: Armor(( + kind: Belt("Rawhide"), + stats: ( + protection: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.017, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Rawhide), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/chest.ron b/assets/common/items/armor/hide/rawhide/chest.ron new file mode 100644 index 0000000000..5b9e5f8c8e --- /dev/null +++ b/assets/common/items/armor/hide/rawhide/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Rawhide Chestpiece", + description: "Tightly packed pieces of leather to endure all weather.", + kind: Armor(( + kind: Chest("Rawhide"), + stats: ( + protection: Normal(7.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.099, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Rawhide), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/foot.ron b/assets/common/items/armor/hide/rawhide/foot.ron new file mode 100644 index 0000000000..d732487a38 --- /dev/null +++ b/assets/common/items/armor/hide/rawhide/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Rawhide Shoes", + description: "'Tightly packed pieces of leather to endure all weather.", + kind: Armor(( + kind: Foot("Rawhide"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.033, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Rawhide), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/hand.ron b/assets/common/items/armor/hide/rawhide/hand.ron new file mode 100644 index 0000000000..204d7e3729 --- /dev/null +++ b/assets/common/items/armor/hide/rawhide/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Rawhide Bracers", + description: "'Tightly packed pieces of leather to endure all weather.'", + kind: Armor(( + kind: Hand("Rawhide"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.033, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Rawhide), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/pants.ron b/assets/common/items/armor/hide/rawhide/pants.ron new file mode 100644 index 0000000000..29ae6f3b80 --- /dev/null +++ b/assets/common/items/armor/hide/rawhide/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Rawhide Pants", + description: "'Tightly packed pieces of leather to endure all weather.'", + kind: Armor(( + kind: Pants("Rawhide"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.066, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Rawhide), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/shoulder.ron b/assets/common/items/armor/hide/rawhide/shoulder.ron new file mode 100644 index 0000000000..b4a20b9fd1 --- /dev/null +++ b/assets/common/items/armor/hide/rawhide/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Rawhide Shoulderpads", + description: "Tightly packed pieces of leather to endure all weather.", + kind: Armor(( + kind: Shoulder("Rawhide"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.066, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Rawhide), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/back.ron b/assets/common/items/armor/hide/scale/back.ron new file mode 100644 index 0000000000..e473d11f5b --- /dev/null +++ b/assets/common/items/armor/hide/scale/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Scale Cape", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Back("Scale"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.05, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Scale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/belt.ron b/assets/common/items/armor/hide/scale/belt.ron new file mode 100644 index 0000000000..ebae5e1cfe --- /dev/null +++ b/assets/common/items/armor/hide/scale/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Scale Girdle", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Belt("Scale"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.05, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Scale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/chest.ron b/assets/common/items/armor/hide/scale/chest.ron new file mode 100644 index 0000000000..a4af17b97c --- /dev/null +++ b/assets/common/items/armor/hide/scale/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Scale Chestpiece", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Chest("Scale"), + stats: ( + protection: Normal(72.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.3, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Scale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/foot.ron b/assets/common/items/armor/hide/scale/foot.ron new file mode 100644 index 0000000000..f4f5e85bc2 --- /dev/null +++ b/assets/common/items/armor/hide/scale/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Scale Sabatons", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Foot("Scale"), + stats: ( + protection: Normal(7.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.1, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Scale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/hand.ron b/assets/common/items/armor/hide/scale/hand.ron new file mode 100644 index 0000000000..2aa5ffc13f --- /dev/null +++ b/assets/common/items/armor/hide/scale/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Scale Fists", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Hand("Scale"), + stats: ( + protection: Normal(7.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.1, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Scale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/pants.ron b/assets/common/items/armor/hide/scale/pants.ron new file mode 100644 index 0000000000..cb5571f857 --- /dev/null +++ b/assets/common/items/armor/hide/scale/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Scale Leggings", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Pants("Scale"), + stats: ( + protection: Normal(14.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.2, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Scale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/shoulder.ron b/assets/common/items/armor/hide/scale/shoulder.ron new file mode 100644 index 0000000000..a5ebd61c0e --- /dev/null +++ b/assets/common/items/armor/hide/scale/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Scale Shoulderguards", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Shoulder("Scale"), + stats: ( + protection: Normal(14.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.2, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Scale), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/belt.ron b/assets/common/items/armor/leather_plate/belt.ron index b12866f6d7..e3fe38f8ed 100644 --- a/assets/common/items/armor/leather_plate/belt.ron +++ b/assets/common/items/armor/leather_plate/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("LeatherPlate"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/chest.ron b/assets/common/items/armor/leather_plate/chest.ron index cabc5893b9..03a91dbee8 100644 --- a/assets/common/items/armor/leather_plate/chest.ron +++ b/assets/common/items/armor/leather_plate/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("LeatherPlate"), stats: ( protection: Normal(25.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/foot.ron b/assets/common/items/armor/leather_plate/foot.ron index 77cda34ff7..022d487b8f 100644 --- a/assets/common/items/armor/leather_plate/foot.ron +++ b/assets/common/items/armor/leather_plate/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("LeatherPlate"), stats: ( protection: Normal(5.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/hand.ron b/assets/common/items/armor/leather_plate/hand.ron index b6db1b6e81..e63d9b9c6a 100644 --- a/assets/common/items/armor/leather_plate/hand.ron +++ b/assets/common/items/armor/leather_plate/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("LeatherPlate"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/pants.ron b/assets/common/items/armor/leather_plate/pants.ron index 93a245d686..938774f1a8 100644 --- a/assets/common/items/armor/leather_plate/pants.ron +++ b/assets/common/items/armor/leather_plate/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("LeatherPlate"), stats: ( protection: Normal(20.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/shoulder.ron b/assets/common/items/armor/leather_plate/shoulder.ron index a2a194c5f7..a536b4d2f3 100644 --- a/assets/common/items/armor/leather_plate/shoulder.ron +++ b/assets/common/items/armor/leather_plate/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("LeatherPlate"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/back.ron b/assets/common/items/armor/mail/bloodsteel/back.ron new file mode 100644 index 0000000000..c0195f2586 --- /dev/null +++ b/assets/common/items/armor/mail/bloodsteel/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bloodsteel Cape", + description: "Forged to preserve life, at the cost of another.", + kind: Armor(( + kind: Back("Bloodsteel"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(2.5), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Bloodsteel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/belt.ron b/assets/common/items/armor/mail/bloodsteel/belt.ron new file mode 100644 index 0000000000..23c0b1ab91 --- /dev/null +++ b/assets/common/items/armor/mail/bloodsteel/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bloodsteel Girdle", + description: "Forged to preserve life, at the cost of another.", + kind: Armor(( + kind: Belt("Bloodsteel"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(2.5), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Bloodsteel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/chest.ron b/assets/common/items/armor/mail/bloodsteel/chest.ron new file mode 100644 index 0000000000..4d6c3581f7 --- /dev/null +++ b/assets/common/items/armor/mail/bloodsteel/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bloodsteel Chest", + description: "Forged to preserve life, at the cost of another.", + kind: Armor(( + kind: Chest("Bloodsteel"), + stats: ( + protection: Normal(60.0), + poise_resilience: Normal(15.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Bloodsteel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/foot.ron b/assets/common/items/armor/mail/bloodsteel/foot.ron new file mode 100644 index 0000000000..e96d1ec562 --- /dev/null +++ b/assets/common/items/armor/mail/bloodsteel/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bloodsteel Sabatons", + description: "Forged to preserve life, at the cost of another.", + kind: Armor(( + kind: Foot("Bloodsteel"), + stats: ( + protection: Normal(20.0), + poise_resilience: Normal(5.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Bloodsteel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/hand.ron b/assets/common/items/armor/mail/bloodsteel/hand.ron new file mode 100644 index 0000000000..f6bfa3d8d7 --- /dev/null +++ b/assets/common/items/armor/mail/bloodsteel/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bloodsteel Gauntlets", + description: "Forged to preserve life, at the cost of another.", + kind: Armor(( + kind: Hand("Bloodsteel"), + stats: ( + protection: Normal(20.0), + poise_resilience: Normal(5.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Bloodsteel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/pants.ron b/assets/common/items/armor/mail/bloodsteel/pants.ron new file mode 100644 index 0000000000..6493d17f44 --- /dev/null +++ b/assets/common/items/armor/mail/bloodsteel/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bloodsteel Legs", + description: "Forged to preserve life, at the cost of another.", + kind: Armor(( + kind: Pants("Bloodsteel"), + stats: ( + protection: Normal(40.0), + poise_resilience: Normal(10.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Bloodsteel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/shoulder.ron b/assets/common/items/armor/mail/bloodsteel/shoulder.ron new file mode 100644 index 0000000000..78680d5ce4 --- /dev/null +++ b/assets/common/items/armor/mail/bloodsteel/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bloodsteel Pauldrons", + description: "Forged to preserve life, at the cost of another.", + kind: Armor(( + kind: Shoulder("Bloodsteel"), + stats: ( + protection: Normal(40.0), + poise_resilience: Normal(10.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + Material(Bloodsteel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/back.ron b/assets/common/items/armor/mail/bronze/back.ron new file mode 100644 index 0000000000..5b28331710 --- /dev/null +++ b/assets/common/items/armor/mail/bronze/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bronze Cloak", + description: "'Heavy and dull, but it can take a punch.'", + kind: Armor(( + kind: Back("Bronze"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.5), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Bronze), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/belt.ron b/assets/common/items/armor/mail/bronze/belt.ron new file mode 100644 index 0000000000..37ae6dc5e9 --- /dev/null +++ b/assets/common/items/armor/mail/bronze/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bronze Girdle", + description: "'Heavy and dull, but it can take a punch.'", + kind: Armor(( + kind: Belt("Bronze"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.5), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Bronze), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/chest.ron b/assets/common/items/armor/mail/bronze/chest.ron new file mode 100644 index 0000000000..a4d454ccf7 --- /dev/null +++ b/assets/common/items/armor/mail/bronze/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bronze Chestguard", + description: "Heavy and dull, but it can take a punch.", + kind: Armor(( + kind: Chest("Bronze"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(3.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Bronze), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/foot.ron b/assets/common/items/armor/mail/bronze/foot.ron new file mode 100644 index 0000000000..c438c13284 --- /dev/null +++ b/assets/common/items/armor/mail/bronze/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bronze Shoes", + description: "'Heavy and dull, but it can take a punch.", + kind: Armor(( + kind: Foot("Bronze"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Bronze), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/hand.ron b/assets/common/items/armor/mail/bronze/hand.ron new file mode 100644 index 0000000000..45f9adc7c3 --- /dev/null +++ b/assets/common/items/armor/mail/bronze/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bronze Gauntlets", + description: "'Heavy and dull, but it can take a punch.'", + kind: Armor(( + kind: Hand("Bronze"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Bronze), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/pants.ron b/assets/common/items/armor/mail/bronze/pants.ron new file mode 100644 index 0000000000..b98511295e --- /dev/null +++ b/assets/common/items/armor/mail/bronze/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bronze Pantalons", + description: "'Heavy and dull, but it can take a punch.'", + kind: Armor(( + kind: Pants("Bronze"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(2.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Bronze), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/shoulder.ron b/assets/common/items/armor/mail/bronze/shoulder.ron new file mode 100644 index 0000000000..2e8b2f6990 --- /dev/null +++ b/assets/common/items/armor/mail/bronze/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Bronze Guards", + description: "Heavy and dull, but it can take a punch.", + kind: Armor(( + kind: Shoulder("Bronze"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(2.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Low, + tags: [ + Material(Bronze), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/back.ron b/assets/common/items/armor/mail/cobalt/back.ron new file mode 100644 index 0000000000..d84d650df7 --- /dev/null +++ b/assets/common/items/armor/mail/cobalt/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Cobalt Cape", + description: "Ornamental and impenetrable, the metal will never dull.", + kind: Armor(( + kind: Back("Cobalt"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(2.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Cobalt), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/belt.ron b/assets/common/items/armor/mail/cobalt/belt.ron new file mode 100644 index 0000000000..8987f85843 --- /dev/null +++ b/assets/common/items/armor/mail/cobalt/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Cobalt Girdle", + description: "Ornamental and impenetrable, the metal will never dull.", + kind: Armor(( + kind: Belt("Cobalt"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(2.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Cobalt), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/chest.ron b/assets/common/items/armor/mail/cobalt/chest.ron new file mode 100644 index 0000000000..ddaa397476 --- /dev/null +++ b/assets/common/items/armor/mail/cobalt/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Cobalt Chestpiece", + description: "Ornamental and impenetrable, the metal will never dull.", + kind: Armor(( + kind: Chest("Cobalt"), + stats: ( + protection: Normal(48.0), + poise_resilience: Normal(12.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Cobalt), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/foot.ron b/assets/common/items/armor/mail/cobalt/foot.ron new file mode 100644 index 0000000000..c10e58eb3d --- /dev/null +++ b/assets/common/items/armor/mail/cobalt/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Cobalt Footguards", + description: "Ornamental and impenetrable, the metal will never dull.", + kind: Armor(( + kind: Foot("Cobalt"), + stats: ( + protection: Normal(16.0), + poise_resilience: Normal(4.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Cobalt), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/hand.ron b/assets/common/items/armor/mail/cobalt/hand.ron new file mode 100644 index 0000000000..077d554aaf --- /dev/null +++ b/assets/common/items/armor/mail/cobalt/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Cobalt Gauntlets", + description: "Ornamental and impenetrable, the metal will never dull.", + kind: Armor(( + kind: Hand("Cobalt"), + stats: ( + protection: Normal(16.0), + poise_resilience: Normal(4.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Cobalt), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/pants.ron b/assets/common/items/armor/mail/cobalt/pants.ron new file mode 100644 index 0000000000..1a3f02c809 --- /dev/null +++ b/assets/common/items/armor/mail/cobalt/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Cobalt Leggings", + description: "Ornamental and impenetrable, the metal will never dull.", + kind: Armor(( + kind: Pants("Cobalt"), + stats: ( + protection: Normal(32.0), + poise_resilience: Normal(8.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Cobalt), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/shoulder.ron b/assets/common/items/armor/mail/cobalt/shoulder.ron new file mode 100644 index 0000000000..abca8ae263 --- /dev/null +++ b/assets/common/items/armor/mail/cobalt/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Cobalt Shoulderguards", + description: "Ornamental and impenetrable, the metal will never dull.", + kind: Armor(( + kind: Shoulder("Cobalt"), + stats: ( + protection: Normal(32.0), + poise_resilience: Normal(8.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Cobalt), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/back.ron b/assets/common/items/armor/mail/iron/back.ron new file mode 100644 index 0000000000..1371644b2c --- /dev/null +++ b/assets/common/items/armor/mail/iron/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Iron Cloak", + description: "Sturdy and unyielding, across ages of war.", + kind: Armor(( + kind: Back("Iron"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Iron), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/belt.ron b/assets/common/items/armor/mail/iron/belt.ron new file mode 100644 index 0000000000..28f67c5a69 --- /dev/null +++ b/assets/common/items/armor/mail/iron/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Iron Belt", + description: "Sturdy and unyielding, across ages of war.", + kind: Armor(( + kind: Belt("Iron"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Iron), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/chest.ron b/assets/common/items/armor/mail/iron/chest.ron new file mode 100644 index 0000000000..8222e2217a --- /dev/null +++ b/assets/common/items/armor/mail/iron/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Iron Chestguard", + description: "Sturdy and unyielding, across ages of war.", + kind: Armor(( + kind: Chest("Iron"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(6.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Iron), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/foot.ron b/assets/common/items/armor/mail/iron/foot.ron new file mode 100644 index 0000000000..1e54414573 --- /dev/null +++ b/assets/common/items/armor/mail/iron/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Iron Footguards", + description: "Sturdy and unyielding, across ages of war.", + kind: Armor(( + kind: Foot("Iron"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(2.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Iron), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/hand.ron b/assets/common/items/armor/mail/iron/hand.ron new file mode 100644 index 0000000000..69db4edc60 --- /dev/null +++ b/assets/common/items/armor/mail/iron/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Iron Fists", + description: "Sturdy and unyielding, across ages of war.", + kind: Armor(( + kind: Hand("Iron"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(2.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Iron), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/pants.ron b/assets/common/items/armor/mail/iron/pants.ron new file mode 100644 index 0000000000..ccdd8a6dde --- /dev/null +++ b/assets/common/items/armor/mail/iron/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Iron Pants", + description: "Sturdy and unyielding, across ages of war.", + kind: Armor(( + kind: Pants("Iron"), + stats: ( + protection: Normal(16.0), + poise_resilience: Normal(4.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Iron), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/shoulder.ron b/assets/common/items/armor/mail/iron/shoulder.ron new file mode 100644 index 0000000000..e900f11a8a --- /dev/null +++ b/assets/common/items/armor/mail/iron/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Iron Shoulderpads", + description: "Sturdy and unyielding, across ages of war.", + kind: Armor(( + kind: Shoulder("Iron"), + stats: ( + protection: Normal(16.0), + poise_resilience: Normal(4.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [ + Material(Iron), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/back.ron b/assets/common/items/armor/mail/orichalcum/back.ron new file mode 100644 index 0000000000..da999fbcfc --- /dev/null +++ b/assets/common/items/armor/mail/orichalcum/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Orichalcum Cape", + description: "An ancient alloy. Myths remain of heroes who wore this metal.", + kind: Armor(( + kind: Back("Orichalcum"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(3.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Orichalcum), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/belt.ron b/assets/common/items/armor/mail/orichalcum/belt.ron new file mode 100644 index 0000000000..df4fb55a6c --- /dev/null +++ b/assets/common/items/armor/mail/orichalcum/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Orichalcum Belt", + description: "An ancient alloy. Myths remain of heroes who wore this metal.", + kind: Armor(( + kind: Belt("Orichalcum"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(3.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Orichalcum), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/chest.ron b/assets/common/items/armor/mail/orichalcum/chest.ron new file mode 100644 index 0000000000..d301351799 --- /dev/null +++ b/assets/common/items/armor/mail/orichalcum/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Orichalcum Chestguard", + description: "An ancient alloy. Myths remain of heroes who wore this metal.", + kind: Armor(( + kind: Chest("Orichalcum"), + stats: ( + protection: Normal(72.0), + poise_resilience: Normal(18.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Orichalcum), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/foot.ron b/assets/common/items/armor/mail/orichalcum/foot.ron new file mode 100644 index 0000000000..2c4b61d588 --- /dev/null +++ b/assets/common/items/armor/mail/orichalcum/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Orichalcum Warboots", + description: "An ancient alloy. Myths remain of heroes who wore this metal.", + kind: Armor(( + kind: Foot("Orichalcum"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(6.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Orichalcum), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/hand.ron b/assets/common/items/armor/mail/orichalcum/hand.ron new file mode 100644 index 0000000000..3031fedda3 --- /dev/null +++ b/assets/common/items/armor/mail/orichalcum/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Orichalcum Gloves", + description: "An ancient alloy. Myths remain of heroes who wore this metal.", + kind: Armor(( + kind: Hand("Orichalcum"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(6.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Orichalcum), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/pants.ron b/assets/common/items/armor/mail/orichalcum/pants.ron new file mode 100644 index 0000000000..fcc4010dd4 --- /dev/null +++ b/assets/common/items/armor/mail/orichalcum/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Orichalcum Legplates", + description: "An ancient alloy. Myths remain of heroes who wore this metal.", + kind: Armor(( + kind: Pants("Orichalcum"), + stats: ( + protection: Normal(48.0), + poise_resilience: Normal(12.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Orichalcum), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/shoulder.ron b/assets/common/items/armor/mail/orichalcum/shoulder.ron new file mode 100644 index 0000000000..6bfcd85816 --- /dev/null +++ b/assets/common/items/armor/mail/orichalcum/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Orichalcum Mantle", + description: "An ancient alloy. Myths remain of heroes who wore this armor.", + kind: Armor(( + kind: Shoulder("Orichalcum"), + stats: ( + protection: Normal(48.0), + poise_resilience: Normal(12.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Legendary, + tags: [ + Material(Orichalcum), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/back.ron b/assets/common/items/armor/mail/steel/back.ron new file mode 100644 index 0000000000..3c1888970e --- /dev/null +++ b/assets/common/items/armor/mail/steel/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Steel Cape", + description: "Metal alloy interlocking plates to improve protection.", + kind: Armor(( + kind: Back("Steel"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(1.5), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Steel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/belt.ron b/assets/common/items/armor/mail/steel/belt.ron new file mode 100644 index 0000000000..c93be72068 --- /dev/null +++ b/assets/common/items/armor/mail/steel/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Steel Belt", + description: "Metal alloy interlocking plates to improve protection.", + kind: Armor(( + kind: Belt("Steel"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(1.5), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Steel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/chest.ron b/assets/common/items/armor/mail/steel/chest.ron new file mode 100644 index 0000000000..90840998dd --- /dev/null +++ b/assets/common/items/armor/mail/steel/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Steel Cuirass", + description: "The metal alloy provides a somewhat lighter and stronger cuirass.", + kind: Armor(( + kind: Chest("Steel"), + stats: ( + protection: Normal(36.0), + poise_resilience: Normal(9.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Steel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/foot.ron b/assets/common/items/armor/mail/steel/foot.ron new file mode 100644 index 0000000000..53fda973e6 --- /dev/null +++ b/assets/common/items/armor/mail/steel/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Steel Boots", + description: "Metal alloy boots providing a more comfortable and durable protection.", + kind: Armor(( + kind: Foot("Steel"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(3.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Steel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/steel/hand.ron b/assets/common/items/armor/mail/steel/hand.ron similarity index 51% rename from assets/common/items/armor/steel/hand.ron rename to assets/common/items/armor/mail/steel/hand.ron index 8d10229c5b..02f0e33828 100644 --- a/assets/common/items/armor/steel/hand.ron +++ b/assets/common/items/armor/mail/steel/hand.ron @@ -4,10 +4,16 @@ ItemDef( kind: Armor(( kind: Hand("Steel"), stats: ( - protection: Normal(10.0), - poise_resilience: Normal(1.0), + protection: Normal(12.0), + poise_resilience: Normal(3.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Steel), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/pants.ron b/assets/common/items/armor/mail/steel/pants.ron new file mode 100644 index 0000000000..01c3a20fcb --- /dev/null +++ b/assets/common/items/armor/mail/steel/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Steel Chausses", + description: "The metal alloy provides improvements to fit, durability, and lightness.", + kind: Armor(( + kind: Pants("Steel"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(6.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Steel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/shoulder.ron b/assets/common/items/armor/mail/steel/shoulder.ron new file mode 100644 index 0000000000..f08a3d481c --- /dev/null +++ b/assets/common/items/armor/mail/steel/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Steel Shoulders", + description: "The metal alloy plates provide better protection and comfort.", + kind: Armor(( + kind: Shoulder("Steel"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(6.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Steel), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/back/admin.ron b/assets/common/items/armor/misc/back/admin.ron index cacbdc1610..56b66711eb 100644 --- a/assets/common/items/armor/misc/back/admin.ron +++ b/assets/common/items/armor/misc/back/admin.ron @@ -1,13 +1,17 @@ ItemDef( - name: "Admin\'s Cape", + name: "Admin's Cape", description: "With great power comes\ngreat responsibility.", kind: Armor(( kind: Back("Admin"), stats: ( protection: Invincible, poise_resilience: Invincible, + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Debug, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/back/backpack.ron b/assets/common/items/armor/misc/back/backpack.ron index f5fdd69b7a..9cf37a20f7 100644 --- a/assets/common/items/armor/misc/back/backpack.ron +++ b/assets/common/items/armor/misc/back/backpack.ron @@ -1,14 +1,19 @@ ItemDef( - name: "Traveler\'s Backpack", + name: "Traveler's Backpack", description: "Comfort and capacity united.", kind: Armor(( kind: Back("Backpack"), stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [Bag], - slots: 18, -) + tags: [ + Bag, + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/back/dungeon_purple.ron b/assets/common/items/armor/misc/back/dungeon_purple.ron index 84a341127c..e143979c07 100644 --- a/assets/common/items/armor/misc/back/dungeon_purple.ron +++ b/assets/common/items/armor/misc/back/dungeon_purple.ron @@ -5,7 +5,11 @@ ItemDef( kind: Back("DungeonPurple"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/armor/misc/back/short_0.ron b/assets/common/items/armor/misc/back/short_0.ron index de02121abe..8379e24a46 100644 --- a/assets/common/items/armor/misc/back/short_0.ron +++ b/assets/common/items/armor/misc/back/short_0.ron @@ -5,7 +5,11 @@ ItemDef( kind: Back("Short0"), stats: ( protection: Normal(0.3), - poise_resilience: Normal(0.5), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/back/short_1.ron b/assets/common/items/armor/misc/back/short_1.ron index c8e66b21b2..88eb5c7fb7 100644 --- a/assets/common/items/armor/misc/back/short_1.ron +++ b/assets/common/items/armor/misc/back/short_1.ron @@ -5,9 +5,15 @@ ItemDef( kind: Back("Short1"), stats: ( protection: Normal(0.1), - poise_resilience: Normal(0.2), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ 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 df86faff5e..709f8ca2ef 100644 --- a/assets/common/items/armor/misc/bag/heavy_seabag.ron +++ b/assets/common/items/armor/misc/bag/heavy_seabag.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Moderate, 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 633ec19a9d..2daf4866b7 100644 --- a/assets/common/items/armor/misc/bag/knitted_red_pouch.ron +++ b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/misc/bag/liana_kit.ron b/assets/common/items/armor/misc/bag/liana_kit.ron index 642e60b75b..7ee81953bd 100644 --- a/assets/common/items/armor/misc/bag/liana_kit.ron +++ b/assets/common/items/armor/misc/bag/liana_kit.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron index ec0f3c0ba0..01608362bd 100644 --- a/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron +++ b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/misc/bag/reliable_backpack.ron b/assets/common/items/armor/misc/bag/reliable_backpack.ron index c5275ae386..c55bfd609f 100644 --- a/assets/common/items/armor/misc/bag/reliable_backpack.ron +++ b/assets/common/items/armor/misc/bag/reliable_backpack.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: High, diff --git a/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron b/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron index 2e8d7cd43b..3c2ef07ab2 100644 --- a/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron +++ b/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Legendary, diff --git a/assets/common/items/armor/misc/bag/soulkeeper_pure.ron b/assets/common/items/armor/misc/bag/soulkeeper_pure.ron index 911e9ab18c..2a8dd54ebb 100644 --- a/assets/common/items/armor/misc/bag/soulkeeper_pure.ron +++ b/assets/common/items/armor/misc/bag/soulkeeper_pure.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Legendary, 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 a075a8b0a3..70aecf4fd2 100644 --- a/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron +++ b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: High, 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 3b2c2e935e..a804fe1126 100644 --- a/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron +++ b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Common, 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 fd4c808ec6..4e23f2e189 100644 --- a/assets/common/items/armor/misc/bag/tiny_red_pouch.ron +++ b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Common, 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 a708aa157b..611cbbbc2a 100644 --- a/assets/common/items/armor/misc/bag/troll_hide_pack.ron +++ b/assets/common/items/armor/misc/bag/troll_hide_pack.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: High, 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 a41101896e..10f95c82bf 100644 --- a/assets/common/items/armor/misc/bag/woven_red_bag.ron +++ b/assets/common/items/armor/misc/bag/woven_red_bag.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/misc/chest/worker_green_0.ron b/assets/common/items/armor/misc/chest/worker_green_0.ron index 4a1d1ae231..14cd0c0ccc 100644 --- a/assets/common/items/armor/misc/chest/worker_green_0.ron +++ b/assets/common/items/armor/misc/chest/worker_green_0.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerGreen0"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_green_1.ron b/assets/common/items/armor/misc/chest/worker_green_1.ron index dc1c542a21..0d18b5dc3d 100644 --- a/assets/common/items/armor/misc/chest/worker_green_1.ron +++ b/assets/common/items/armor/misc/chest/worker_green_1.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerGreen1"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_orange_0.ron b/assets/common/items/armor/misc/chest/worker_orange_0.ron index 8dc5fd089f..c3b1c043d4 100644 --- a/assets/common/items/armor/misc/chest/worker_orange_0.ron +++ b/assets/common/items/armor/misc/chest/worker_orange_0.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerOrange0"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_orange_1.ron b/assets/common/items/armor/misc/chest/worker_orange_1.ron index f9d9bbd3fa..e7e5a2f40f 100644 --- a/assets/common/items/armor/misc/chest/worker_orange_1.ron +++ b/assets/common/items/armor/misc/chest/worker_orange_1.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerOrange1"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_0.ron b/assets/common/items/armor/misc/chest/worker_purple_0.ron index b1d751d491..0aac60fdde 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_0.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_0.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerPurple0"), stats: ( protection: Normal(0.1), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_1.ron b/assets/common/items/armor/misc/chest/worker_purple_1.ron index 7aa9707e76..e363f315e2 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_1.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_1.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerPurple1"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_brown.ron b/assets/common/items/armor/misc/chest/worker_purple_brown.ron index 3a27853c09..5208c32ff3 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_brown.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_brown.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerPurpBrown"), stats: ( protection: Normal(0.1), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_red_0.ron b/assets/common/items/armor/misc/chest/worker_red_0.ron index ef4e370099..2336f9c58b 100644 --- a/assets/common/items/armor/misc/chest/worker_red_0.ron +++ b/assets/common/items/armor/misc/chest/worker_red_0.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerRed0"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_red_1.ron b/assets/common/items/armor/misc/chest/worker_red_1.ron index bc0b028678..1c09588620 100644 --- a/assets/common/items/armor/misc/chest/worker_red_1.ron +++ b/assets/common/items/armor/misc/chest/worker_red_1.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerRed1"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_yellow_0.ron b/assets/common/items/armor/misc/chest/worker_yellow_0.ron index e23862382f..6da0dfcb59 100644 --- a/assets/common/items/armor/misc/chest/worker_yellow_0.ron +++ b/assets/common/items/armor/misc/chest/worker_yellow_0.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerYellow0"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_yellow_1.ron b/assets/common/items/armor/misc/chest/worker_yellow_1.ron index 0b8de82a4e..5b000afb90 100644 --- a/assets/common/items/armor/misc/chest/worker_yellow_1.ron +++ b/assets/common/items/armor/misc/chest/worker_yellow_1.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("WorkerYellow1"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/foot/jackalope_slippers.ron b/assets/common/items/armor/misc/foot/jackalope_slippers.ron index eafb03b174..6f57e44c96 100644 --- a/assets/common/items/armor/misc/foot/jackalope_slippers.ron +++ b/assets/common/items/armor/misc/foot/jackalope_slippers.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("Jackalope"), stats: ( protection: Normal(0.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Linen) + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/foot/sandals.ron b/assets/common/items/armor/misc/foot/sandals.ron index 065daef9db..3640a4b569 100644 --- a/assets/common/items/armor/misc/foot/sandals.ron +++ b/assets/common/items/armor/misc/foot/sandals.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("Sandal"), stats: ( protection: Normal(0.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [], + tags: [ + Material(Linen) + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/plain_0.ron b/assets/common/items/armor/misc/neck/plain_0.ron index 48c00bce48..49ae7b5b2d 100644 --- a/assets/common/items/armor/misc/neck/plain_0.ron +++ b/assets/common/items/armor/misc/neck/plain_0.ron @@ -1,13 +1,19 @@ ItemDef( name: "Plain Necklace", - description: "It\'s become tarnished with age.", + description: "It's become tarnished with age.", kind: Armor(( kind: Neck("Plain0"), stats: ( protection: Normal(1.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [], + tags: [ + Material(Iron) + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/plain_1.ron b/assets/common/items/armor/misc/neck/plain_1.ron index dacfa55d06..65c91c6f1a 100644 --- a/assets/common/items/armor/misc/neck/plain_1.ron +++ b/assets/common/items/armor/misc/neck/plain_1.ron @@ -6,8 +6,14 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Steel) + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/shell.ron b/assets/common/items/armor/misc/neck/shell.ron index 423cbe3520..af0bcbf75f 100644 --- a/assets/common/items/armor/misc/neck/shell.ron +++ b/assets/common/items/armor/misc/neck/shell.ron @@ -6,8 +6,12 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/pants/hunting.ron b/assets/common/items/armor/misc/pants/hunting.ron index 4103ccf476..dbd2e21f85 100644 --- a/assets/common/items/armor/misc/pants/hunting.ron +++ b/assets/common/items/armor/misc/pants/hunting.ron @@ -5,7 +5,11 @@ ItemDef( kind: Pants("Hunting"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/pants/worker_blue.ron b/assets/common/items/armor/misc/pants/worker_blue.ron index 15b555ab2a..dd767d3594 100644 --- a/assets/common/items/armor/misc/pants/worker_blue.ron +++ b/assets/common/items/armor/misc/pants/worker_blue.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("WorkerBlue"), stats: ( protection: Normal(0.1), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/pants/worker_brown.ron b/assets/common/items/armor/misc/pants/worker_brown.ron index c11762da0e..566874c1bd 100644 --- a/assets/common/items/armor/misc/pants/worker_brown.ron +++ b/assets/common/items/armor/misc/pants/worker_brown.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("WorkerBrown"), stats: ( protection: Normal(0.1), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/gold.ron b/assets/common/items/armor/misc/ring/gold.ron index 8acae0e3e1..77bfc0c7d8 100644 --- a/assets/common/items/armor/misc/ring/gold.ron +++ b/assets/common/items/armor/misc/ring/gold.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(0.5), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/ring/scratched.ron b/assets/common/items/armor/misc/ring/scratched.ron index fed0e9d2df..6ea5fdb31e 100644 --- a/assets/common/items/armor/misc/ring/scratched.ron +++ b/assets/common/items/armor/misc/ring/scratched.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(0.1), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/armor/misc/ring/skull.ron b/assets/common/items/armor/misc/ring/skull.ron index b8fef3c40a..14ee6113b3 100644 --- a/assets/common/items/armor/misc/ring/skull.ron +++ b/assets/common/items/armor/misc/ring/skull.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(3.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, diff --git a/assets/common/items/armor/misc/shoulder/iron_spikes.ron b/assets/common/items/armor/misc/shoulder/iron_spikes.ron index 559303a8f5..466ae7c618 100644 --- a/assets/common/items/armor/misc/shoulder/iron_spikes.ron +++ b/assets/common/items/armor/misc/shoulder/iron_spikes.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("IronSpikes"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Iron), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron index cd6d05e18d..3f7824848b 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("IronLeather0"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron index 752c3886f5..12af395560 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("IronLeather1"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron index fb4dd1c7a0..dcf5a19b13 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("IronLeather2"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron index 94e747cc09..991590a958 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("IronLeather3"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [], + tags: [ + Material(Leather), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_strip.ron b/assets/common/items/armor/misc/shoulder/leather_strip.ron index d771916b4e..30cbd21712 100644 --- a/assets/common/items/armor/misc/shoulder/leather_strip.ron +++ b/assets/common/items/armor/misc/shoulder/leather_strip.ron @@ -5,7 +5,11 @@ ItemDef( kind: Shoulder("LeatherStrip"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/armor/misc/tabard/admin.ron b/assets/common/items/armor/misc/tabard/admin.ron index 2f638df69b..70a7865a78 100644 --- a/assets/common/items/armor/misc/tabard/admin.ron +++ b/assets/common/items/armor/misc/tabard/admin.ron @@ -1,11 +1,15 @@ ItemDef( - name: "Admin\'s Tabard", + name: "Admin's Tabard", description: "With great power comes great responsibility.", kind: Armor(( kind: Tabard("Admin"), stats: ( protection: Invincible, poise_resilience: Invincible, + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Debug, diff --git a/assets/common/items/armor/plate/belt.ron b/assets/common/items/armor/plate/belt.ron deleted file mode 100644 index 5b9c4372df..0000000000 --- a/assets/common/items/armor/plate/belt.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Plate Belt", - description: "A tanned leather belt with a forged iron buckle.", - kind: Armor(( - kind: Belt("Plate"), - stats: ( - protection: Normal(3.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/chest.ron b/assets/common/items/armor/plate/chest.ron deleted file mode 100644 index 41007c6815..0000000000 --- a/assets/common/items/armor/plate/chest.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Chestplate", - description: "Formed iron plate resulting in very heavy but solid protection, worn over a simple rough linen shirt, dyed green.", - kind: Armor(( - kind: Chest("Plate"), - stats: ( - protection: Normal(20.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/foot.ron b/assets/common/items/armor/plate/foot.ron deleted file mode 100644 index 0ac2599e95..0000000000 --- a/assets/common/items/armor/plate/foot.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Feet", - description: "Quickly shaped iron plates, forming boots that are uncomfortable but durable.", - kind: Armor(( - kind: Foot("Plate"), - stats: ( - protection: Normal(4.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/hand.ron b/assets/common/items/armor/plate/hand.ron deleted file mode 100644 index aaf1ec66ef..0000000000 --- a/assets/common/items/armor/plate/hand.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Handguards", - description: "Heavy chunks of metal plate, not the most comfortable but keeps the wearer safe.", - kind: Armor(( - kind: Hand("Plate"), - stats: ( - protection: Normal(8.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/pants.ron b/assets/common/items/armor/plate/pants.ron deleted file mode 100644 index 906543ec56..0000000000 --- a/assets/common/items/armor/plate/pants.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Legguards", - description: "Heavy iron plate formed into protective greaves, decorated with rough green fabric.", - kind: Armor(( - kind: Pants("Plate"), - stats: ( - protection: Normal(16.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/shoulder.ron b/assets/common/items/armor/plate/shoulder.ron deleted file mode 100644 index c7657ca136..0000000000 --- a/assets/common/items/armor/plate/shoulder.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Shoulderguards", - description: "Heavy iron shoulder protection.", - kind: Armor(( - kind: Shoulder("Plate"), - stats: ( - protection: Normal(12.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/rugged/chest.ron b/assets/common/items/armor/rugged/chest.ron index d007ab2822..2318127dec 100644 --- a/assets/common/items/armor/rugged/chest.ron +++ b/assets/common/items/armor/rugged/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("Rugged"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], -) + tags: [ + Material(Linen), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/rugged/pants.ron b/assets/common/items/armor/rugged/pants.ron index c2b4cfc71f..28162eda55 100644 --- a/assets/common/items/armor/rugged/pants.ron +++ b/assets/common/items/armor/rugged/pants.ron @@ -1,13 +1,19 @@ ItemDef( - name: "Rugged Commoner\'s Pants", + name: "Rugged Commoner's Pants", description: "They remind you of the old days.", kind: Armor(( kind: Pants("Rugged"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, - tags: [ClothItem], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/back.ron b/assets/common/items/armor/savage/back.ron new file mode 100644 index 0000000000..d54a50e977 --- /dev/null +++ b/assets/common/items/armor/savage/back.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Savage Cape", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Back("Savage"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/belt.ron b/assets/common/items/armor/savage/belt.ron new file mode 100644 index 0000000000..a5ce6d028e --- /dev/null +++ b/assets/common/items/armor/savage/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Savage Belt", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Belt("Savage"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/chest.ron b/assets/common/items/armor/savage/chest.ron new file mode 100644 index 0000000000..1ac98e24d2 --- /dev/null +++ b/assets/common/items/armor/savage/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Savage Cuirass", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Chest("Savage"), + stats: ( + protection: Normal(25.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/foot.ron b/assets/common/items/armor/savage/foot.ron new file mode 100644 index 0000000000..9577564894 --- /dev/null +++ b/assets/common/items/armor/savage/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Savage Boots", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Foot("Savage"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/hand.ron b/assets/common/items/armor/savage/hand.ron new file mode 100644 index 0000000000..d7e73d3451 --- /dev/null +++ b/assets/common/items/armor/savage/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Savage Gauntlets", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Hand("Savage"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/pants.ron b/assets/common/items/armor/savage/pants.ron new file mode 100644 index 0000000000..3c9880a925 --- /dev/null +++ b/assets/common/items/armor/savage/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Savage Chausses", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Pants("Savage"), + stats: ( + protection: Normal(20.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/shoulder.ron b/assets/common/items/armor/savage/shoulder.ron new file mode 100644 index 0000000000..91a58b2ad3 --- /dev/null +++ b/assets/common/items/armor/savage/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Savage Shoulder Pad", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Shoulder("Savage"), + stats: ( + protection: Normal(15.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/steel/belt.ron b/assets/common/items/armor/steel/belt.ron deleted file mode 100644 index dd7e11190a..0000000000 --- a/assets/common/items/armor/steel/belt.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Steel Belt", - description: "Metal alloy interlocking plates to improve protection.", - kind: Armor(( - kind: Belt("Steel"), - stats: ( - protection: Normal(4.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/steel/chest.ron b/assets/common/items/armor/steel/chest.ron deleted file mode 100644 index 1dd633855b..0000000000 --- a/assets/common/items/armor/steel/chest.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Steel Cuirass", - description: "The metal alloy provides a somewhat lighter and stronger cuirass.", - kind: Armor(( - kind: Chest("Steel"), - stats: ( - protection: Normal(25.0), - poise_resilience: Normal(1.0), - ), - )), - quality: High, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/steel/foot.ron b/assets/common/items/armor/steel/foot.ron deleted file mode 100644 index e623f939ce..0000000000 --- a/assets/common/items/armor/steel/foot.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Steel Boots", - description: "Metal alloy boots providing a more comfortable and durable protection.", - kind: Armor(( - kind: Foot("Steel"), - stats: ( - protection: Normal(5.0), - poise_resilience: Normal(1.0), - ), - )), - quality: High, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/steel/pants.ron b/assets/common/items/armor/steel/pants.ron deleted file mode 100644 index ed7e917509..0000000000 --- a/assets/common/items/armor/steel/pants.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Steel Chausses", - description: "The metal alloy provides improvements to fit, durability, and lightness.", - kind: Armor(( - kind: Pants("Steel"), - stats: ( - protection: Normal(20.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/steel/shoulder.ron b/assets/common/items/armor/steel/shoulder.ron deleted file mode 100644 index 09eb152149..0000000000 --- a/assets/common/items/armor/steel/shoulder.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Steel Shoulder Pad", - description: "The metal alloy plates provide better protection and comfort.", - kind: Armor(( - kind: Shoulder("Steel"), - stats: ( - protection: Normal(15.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/swift/belt.ron b/assets/common/items/armor/swift/belt.ron deleted file mode 100644 index 26dc51c308..0000000000 --- a/assets/common/items/armor/swift/belt.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Swift Belt", - description: "Swift like the wind.", - kind: Armor(( - kind: Belt("Swift"), - stats: ( - protection: Normal(1.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/swift/chest.ron b/assets/common/items/armor/swift/chest.ron deleted file mode 100644 index 1d72079492..0000000000 --- a/assets/common/items/armor/swift/chest.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Swift Chest", - description: "Swift like the wind.", - kind: Armor(( - kind: Chest("Swift"), - stats: ( - protection: Normal(10.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/swift/foot.ron b/assets/common/items/armor/swift/foot.ron deleted file mode 100644 index 9a66903375..0000000000 --- a/assets/common/items/armor/swift/foot.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Swift Boots", - description: "Swift like the wind.", - kind: Armor(( - kind: Foot("Swift"), - stats: ( - protection: Normal(2.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/swift/hand.ron b/assets/common/items/armor/swift/hand.ron deleted file mode 100644 index b4c93f4f5a..0000000000 --- a/assets/common/items/armor/swift/hand.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Swift Gloves", - description: "Swift like the wind.", - kind: Armor(( - kind: Hand("Swift"), - stats: ( - protection: Normal(4.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/swift/head.ron b/assets/common/items/armor/swift/head.ron deleted file mode 100644 index 61ddec127f..0000000000 --- a/assets/common/items/armor/swift/head.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Swift Leather Cap", - description: "Swift like the wind.", - kind: Armor(( - kind: Head("Swift"), - stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), - ), - )), - quality: Common, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/swift/pants.ron b/assets/common/items/armor/swift/pants.ron deleted file mode 100644 index 0520fcf154..0000000000 --- a/assets/common/items/armor/swift/pants.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Swift Pants", - description: "Swift like the wind.", - kind: Armor(( - kind: Pants("Swift"), - stats: ( - protection: Normal(8.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/swift/shoulder.ron b/assets/common/items/armor/swift/shoulder.ron deleted file mode 100644 index af5ed206fb..0000000000 --- a/assets/common/items/armor/swift/shoulder.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Swift Shoulderpads", - description: "Swift like the wind.", - kind: Armor(( - kind: Shoulder("Swift"), - stats: ( - protection: Normal(6.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [LeatherItem], -) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/belt.ron b/assets/common/items/armor/tarasque/belt.ron index f965815af7..9dd2290c1e 100644 --- a/assets/common/items/armor/tarasque/belt.ron +++ b/assets/common/items/armor/tarasque/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("Tarasque"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Carapace), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/chest.ron b/assets/common/items/armor/tarasque/chest.ron index 5bceb6b86a..d075ea7962 100644 --- a/assets/common/items/armor/tarasque/chest.ron +++ b/assets/common/items/armor/tarasque/chest.ron @@ -1,13 +1,19 @@ ItemDef( name: "Tarasque Cuirass", - description: "The rough protective underbelly and back of a tarasque\'s shell, formed to fit humanoid proportions.", + description: "The rough protective underbelly and back of a tarasque's shell, formed to fit humanoid proportions.", kind: Armor(( kind: Chest("Tarasque"), stats: ( protection: Normal(25.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Carapace), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/foot.ron b/assets/common/items/armor/tarasque/foot.ron index c4f696faf9..33d2b389e4 100644 --- a/assets/common/items/armor/tarasque/foot.ron +++ b/assets/common/items/armor/tarasque/foot.ron @@ -1,13 +1,19 @@ ItemDef( name: "Tarasque Boots", - description: "Tarasque claws form the outside of these boots, protecting the wearer\'s feet.", + description: "Tarasque claws form the outside of these boots, protecting the wearer's feet.", kind: Armor(( kind: Foot("Tarasque"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Carapace), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/hand.ron b/assets/common/items/armor/tarasque/hand.ron index 38475cb546..21c4cf4ac7 100644 --- a/assets/common/items/armor/tarasque/hand.ron +++ b/assets/common/items/armor/tarasque/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("Tarasque"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Carapace), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/pants.ron b/assets/common/items/armor/tarasque/pants.ron index c73ba0b3c7..5b7abebe5b 100644 --- a/assets/common/items/armor/tarasque/pants.ron +++ b/assets/common/items/armor/tarasque/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("Tarasque"), stats: ( protection: Normal(20.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Carapace), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/shoulder.ron b/assets/common/items/armor/tarasque/shoulder.ron index f95305f0b5..4cb7080f5c 100644 --- a/assets/common/items/armor/tarasque/shoulder.ron +++ b/assets/common/items/armor/tarasque/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("Tarasque"), stats: ( protection: Normal(16.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Carapace), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/belt.ron b/assets/common/items/armor/twigs/belt.ron index 334f8619b1..3bb3d93d3e 100644 --- a/assets/common/items/armor/twigs/belt.ron +++ b/assets/common/items/armor/twigs/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("Twigs"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/chest.ron b/assets/common/items/armor/twigs/chest.ron index f1e3031611..33e1ea0fb4 100644 --- a/assets/common/items/armor/twigs/chest.ron +++ b/assets/common/items/armor/twigs/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("Twigs"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/foot.ron b/assets/common/items/armor/twigs/foot.ron index e3e8d814bd..607ee84b37 100644 --- a/assets/common/items/armor/twigs/foot.ron +++ b/assets/common/items/armor/twigs/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("Twigs"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/hand.ron b/assets/common/items/armor/twigs/hand.ron index 75d178e928..9a2ee57308 100644 --- a/assets/common/items/armor/twigs/hand.ron +++ b/assets/common/items/armor/twigs/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("Twigs"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/pants.ron b/assets/common/items/armor/twigs/pants.ron index a91d51cc8a..8a260b6ace 100644 --- a/assets/common/items/armor/twigs/pants.ron +++ b/assets/common/items/armor/twigs/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("Twigs"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/shoulder.ron b/assets/common/items/armor/twigs/shoulder.ron index f2e009647f..ee4475ffd4 100644 --- a/assets/common/items/armor/twigs/shoulder.ron +++ b/assets/common/items/armor/twigs/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("Twigs"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/belt.ron b/assets/common/items/armor/twigsflowers/belt.ron index fd32d9d2d0..15c869ce7f 100644 --- a/assets/common/items/armor/twigsflowers/belt.ron +++ b/assets/common/items/armor/twigsflowers/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("TwigsFlowers"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/chest.ron b/assets/common/items/armor/twigsflowers/chest.ron index 353c728fe2..73f1b19667 100644 --- a/assets/common/items/armor/twigsflowers/chest.ron +++ b/assets/common/items/armor/twigsflowers/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("TwigsFlowers"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/foot.ron b/assets/common/items/armor/twigsflowers/foot.ron index 72c15a29ce..4fd775a043 100644 --- a/assets/common/items/armor/twigsflowers/foot.ron +++ b/assets/common/items/armor/twigsflowers/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("TwigsFlowers"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/hand.ron b/assets/common/items/armor/twigsflowers/hand.ron index a3e4e3e4ee..9d8020c3ae 100644 --- a/assets/common/items/armor/twigsflowers/hand.ron +++ b/assets/common/items/armor/twigsflowers/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("TwigsFlowers"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/pants.ron b/assets/common/items/armor/twigsflowers/pants.ron index 4466db33c8..49117dc528 100644 --- a/assets/common/items/armor/twigsflowers/pants.ron +++ b/assets/common/items/armor/twigsflowers/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("TwigsFlowers"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/shoulder.ron b/assets/common/items/armor/twigsflowers/shoulder.ron index 7da48e689d..12bf7c7fc6 100644 --- a/assets/common/items/armor/twigsflowers/shoulder.ron +++ b/assets/common/items/armor/twigsflowers/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("TwigsFlowers"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/belt.ron b/assets/common/items/armor/twigsleaves/belt.ron index ad6c15161d..b386a7d5b2 100644 --- a/assets/common/items/armor/twigsleaves/belt.ron +++ b/assets/common/items/armor/twigsleaves/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("TwigsLeaves"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/chest.ron b/assets/common/items/armor/twigsleaves/chest.ron index 587c4bb46a..70791c46b4 100644 --- a/assets/common/items/armor/twigsleaves/chest.ron +++ b/assets/common/items/armor/twigsleaves/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("TwigsLeaves"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/foot.ron b/assets/common/items/armor/twigsleaves/foot.ron index 8e1ca3c682..ebd64969bc 100644 --- a/assets/common/items/armor/twigsleaves/foot.ron +++ b/assets/common/items/armor/twigsleaves/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("TwigsLeaves"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/hand.ron b/assets/common/items/armor/twigsleaves/hand.ron index aff4f77101..f4890938db 100644 --- a/assets/common/items/armor/twigsleaves/hand.ron +++ b/assets/common/items/armor/twigsleaves/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("TwigsLeaves"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/pants.ron b/assets/common/items/armor/twigsleaves/pants.ron index 10660afefa..70d1ee3c34 100644 --- a/assets/common/items/armor/twigsleaves/pants.ron +++ b/assets/common/items/armor/twigsleaves/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("TwigsLeaves"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/shoulder.ron b/assets/common/items/armor/twigsleaves/shoulder.ron index ad1e8e2a32..255211ea59 100644 --- a/assets/common/items/armor/twigsleaves/shoulder.ron +++ b/assets/common/items/armor/twigsleaves/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("TwigsLeaves"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, - tags: [], + tags: [ + Material(Linen), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/back.ron b/assets/common/items/armor/velorite_mage/back.ron index 0851567820..bc990aece5 100644 --- a/assets/common/items/armor/velorite_mage/back.ron +++ b/assets/common/items/armor/velorite_mage/back.ron @@ -5,9 +5,15 @@ ItemDef( kind: Back("VeloriteMage"), stats: ( protection: Normal(2.8), - poise_resilience: Normal(0.5), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Velorite), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/belt.ron b/assets/common/items/armor/velorite_mage/belt.ron index 1363ece7bb..e970ff7395 100644 --- a/assets/common/items/armor/velorite_mage/belt.ron +++ b/assets/common/items/armor/velorite_mage/belt.ron @@ -5,9 +5,15 @@ ItemDef( kind: Belt("VeloriteMage"), stats: ( protection: Normal(5.8), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Velorite), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/chest.ron b/assets/common/items/armor/velorite_mage/chest.ron index a487eaac83..4370139477 100644 --- a/assets/common/items/armor/velorite_mage/chest.ron +++ b/assets/common/items/armor/velorite_mage/chest.ron @@ -5,9 +5,15 @@ ItemDef( kind: Chest("VeloriteMage"), stats: ( protection: Normal(28.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Velorite), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/foot.ron b/assets/common/items/armor/velorite_mage/foot.ron index b02d3ca62c..df61036ecd 100644 --- a/assets/common/items/armor/velorite_mage/foot.ron +++ b/assets/common/items/armor/velorite_mage/foot.ron @@ -5,9 +5,15 @@ ItemDef( kind: Foot("VeloriteMage"), stats: ( protection: Normal(5.9), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Velorite), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/hand.ron b/assets/common/items/armor/velorite_mage/hand.ron index 08f83f358d..58c748d28a 100644 --- a/assets/common/items/armor/velorite_mage/hand.ron +++ b/assets/common/items/armor/velorite_mage/hand.ron @@ -5,9 +5,15 @@ ItemDef( kind: Hand("VeloriteMage"), stats: ( protection: Normal(11.5), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Velorite), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/pants.ron b/assets/common/items/armor/velorite_mage/pants.ron index 9dbf71b02a..e03c7fce6c 100644 --- a/assets/common/items/armor/velorite_mage/pants.ron +++ b/assets/common/items/armor/velorite_mage/pants.ron @@ -5,9 +5,15 @@ ItemDef( kind: Pants("VeloriteMage"), stats: ( protection: Normal(23.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Velorite), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/shoulder.ron b/assets/common/items/armor/velorite_mage/shoulder.ron index da41eb6f2c..97b72ce2e6 100644 --- a/assets/common/items/armor/velorite_mage/shoulder.ron +++ b/assets/common/items/armor/velorite_mage/shoulder.ron @@ -5,9 +5,15 @@ ItemDef( kind: Shoulder("VeloriteMage"), stats: ( protection: Normal(17.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: High, - tags: [], + tags: [ + Material(Velorite), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/warlock/back.ron b/assets/common/items/armor/warlock/back.ron index 868bd9c57b..8f71921ef1 100644 --- a/assets/common/items/armor/warlock/back.ron +++ b/assets/common/items/armor/warlock/back.ron @@ -5,7 +5,11 @@ ItemDef( kind: Back("Warlock"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(0.2), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/belt.ron b/assets/common/items/armor/warlock/belt.ron index 0a773cead4..571cf5f704 100644 --- a/assets/common/items/armor/warlock/belt.ron +++ b/assets/common/items/armor/warlock/belt.ron @@ -5,7 +5,11 @@ ItemDef( kind: Belt("Warlock"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/chest.ron b/assets/common/items/armor/warlock/chest.ron index 3b297b8070..83879ed7b8 100644 --- a/assets/common/items/armor/warlock/chest.ron +++ b/assets/common/items/armor/warlock/chest.ron @@ -5,7 +5,11 @@ ItemDef( kind: Chest("Warlock"), stats: ( protection: Normal(40.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/foot.ron b/assets/common/items/armor/warlock/foot.ron index ffa18349a2..6d94314cea 100644 --- a/assets/common/items/armor/warlock/foot.ron +++ b/assets/common/items/armor/warlock/foot.ron @@ -5,7 +5,11 @@ ItemDef( kind: Foot("Warlock"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/hand.ron b/assets/common/items/armor/warlock/hand.ron index 2637362601..95a430624d 100644 --- a/assets/common/items/armor/warlock/hand.ron +++ b/assets/common/items/armor/warlock/hand.ron @@ -5,7 +5,11 @@ ItemDef( kind: Hand("Warlock"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, diff --git a/assets/common/items/armor/warlock/head.ron b/assets/common/items/armor/warlock/head.ron index 49e1c592ee..5efede3c7e 100644 --- a/assets/common/items/armor/warlock/head.ron +++ b/assets/common/items/armor/warlock/head.ron @@ -5,7 +5,11 @@ ItemDef( kind: Head("Warlock"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, diff --git a/assets/common/items/armor/warlock/pants.ron b/assets/common/items/armor/warlock/pants.ron index 985f6cdd1c..6140b196af 100644 --- a/assets/common/items/armor/warlock/pants.ron +++ b/assets/common/items/armor/warlock/pants.ron @@ -5,7 +5,11 @@ ItemDef( kind: Pants("Warlock"), stats: ( protection: Normal(30.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/shoulder.ron b/assets/common/items/armor/warlock/shoulder.ron index 5ce674fd49..105a3458c6 100644 --- a/assets/common/items/armor/warlock/shoulder.ron +++ b/assets/common/items/armor/warlock/shoulder.ron @@ -5,7 +5,11 @@ ItemDef( kind: Shoulder("Warlock"), stats: ( protection: Normal(22.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, diff --git a/assets/common/items/armor/warlord/back.ron b/assets/common/items/armor/warlord/back.ron index 509d315e8c..2cd9450e7e 100644 --- a/assets/common/items/armor/warlord/back.ron +++ b/assets/common/items/armor/warlord/back.ron @@ -5,7 +5,11 @@ ItemDef( kind: Back("Warlord"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(0.5), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/belt.ron b/assets/common/items/armor/warlord/belt.ron index b8e30034dc..ae60e2fcd2 100644 --- a/assets/common/items/armor/warlord/belt.ron +++ b/assets/common/items/armor/warlord/belt.ron @@ -5,7 +5,11 @@ ItemDef( kind: Belt("Warlord"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/chest.ron b/assets/common/items/armor/warlord/chest.ron index 91a79c9a6e..dbaee7548f 100644 --- a/assets/common/items/armor/warlord/chest.ron +++ b/assets/common/items/armor/warlord/chest.ron @@ -5,7 +5,11 @@ ItemDef( kind: Chest("Warlord"), stats: ( protection: Normal(40.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/foot.ron b/assets/common/items/armor/warlord/foot.ron index 7451a44a61..993cd6d067 100644 --- a/assets/common/items/armor/warlord/foot.ron +++ b/assets/common/items/armor/warlord/foot.ron @@ -5,7 +5,11 @@ ItemDef( kind: Foot("Warlord"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/hand.ron b/assets/common/items/armor/warlord/hand.ron index cfb7f7442a..36f79edf77 100644 --- a/assets/common/items/armor/warlord/hand.ron +++ b/assets/common/items/armor/warlord/hand.ron @@ -5,7 +5,11 @@ ItemDef( kind: Hand("Warlord"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, diff --git a/assets/common/items/armor/warlord/head.ron b/assets/common/items/armor/warlord/head.ron index c6a9cc1067..ba518e0cdf 100644 --- a/assets/common/items/armor/warlord/head.ron +++ b/assets/common/items/armor/warlord/head.ron @@ -5,7 +5,11 @@ ItemDef( kind: Head("Warlord"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, diff --git a/assets/common/items/armor/warlord/pants.ron b/assets/common/items/armor/warlord/pants.ron index 26281bd21e..b896347aa2 100644 --- a/assets/common/items/armor/warlord/pants.ron +++ b/assets/common/items/armor/warlord/pants.ron @@ -5,7 +5,11 @@ ItemDef( kind: Pants("Warlord"), stats: ( protection: Normal(30.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/shoulder.ron b/assets/common/items/armor/warlord/shoulder.ron index 4261113d21..c38f423aff 100644 --- a/assets/common/items/armor/warlord/shoulder.ron +++ b/assets/common/items/armor/warlord/shoulder.ron @@ -5,7 +5,11 @@ ItemDef( kind: Shoulder("Warlord"), stats: ( protection: Normal(22.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Common, diff --git a/assets/common/items/crafting_ing/bone.ron b/assets/common/items/crafting_ing/animal_misc/bone.ron similarity index 100% rename from assets/common/items/crafting_ing/bone.ron rename to assets/common/items/crafting_ing/animal_misc/bone.ron diff --git a/assets/common/items/crafting_ing/claw.ron b/assets/common/items/crafting_ing/animal_misc/claw.ron similarity index 100% rename from assets/common/items/crafting_ing/claw.ron rename to assets/common/items/crafting_ing/animal_misc/claw.ron diff --git a/assets/common/items/crafting_ing/ember.ron b/assets/common/items/crafting_ing/animal_misc/ember.ron similarity index 100% rename from assets/common/items/crafting_ing/ember.ron rename to assets/common/items/crafting_ing/animal_misc/ember.ron diff --git a/assets/common/items/crafting_ing/feather.ron b/assets/common/items/crafting_ing/animal_misc/feather.ron similarity index 100% rename from assets/common/items/crafting_ing/feather.ron rename to assets/common/items/crafting_ing/animal_misc/feather.ron diff --git a/assets/common/items/crafting_ing/fur.ron b/assets/common/items/crafting_ing/animal_misc/fur.ron similarity index 100% rename from assets/common/items/crafting_ing/fur.ron rename to assets/common/items/crafting_ing/animal_misc/fur.ron diff --git a/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron b/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron new file mode 100644 index 0000000000..5aedf2afa1 --- /dev/null +++ b/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Grim Eyeball", + description: "Casts a petrifying gaze.", + kind: Ingredient( + kind: "GrimEyeball", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/crafting_ing/icy_fang.ron b/assets/common/items/crafting_ing/animal_misc/icy_fang.ron similarity index 100% rename from assets/common/items/crafting_ing/icy_fang.ron rename to assets/common/items/crafting_ing/animal_misc/icy_fang.ron diff --git a/assets/common/items/crafting_ing/animal_misc/large_horn.ron b/assets/common/items/crafting_ing/animal_misc/large_horn.ron new file mode 100644 index 0000000000..1751ded592 --- /dev/null +++ b/assets/common/items/crafting_ing/animal_misc/large_horn.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Large Horn", + description: "A huge sharp horn from an animal.", + kind: Ingredient( + kind: "LargeHorn", + ), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/animal_misc/lively_vine.ron b/assets/common/items/crafting_ing/animal_misc/lively_vine.ron new file mode 100644 index 0000000000..bd43fa1316 --- /dev/null +++ b/assets/common/items/crafting_ing/animal_misc/lively_vine.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Lively Vine", + description: "I think it just moved.", + kind: Ingredient( + kind: "LivelyVine", + ), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron b/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron new file mode 100644 index 0000000000..bf6a1fcba1 --- /dev/null +++ b/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Phoenix Feather", + description: "Said to have magical properties.", + kind: Ingredient( + kind: "PhoenixFeather", + ), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/raptor_feather.ron b/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron similarity index 100% rename from assets/common/items/crafting_ing/raptor_feather.ron rename to assets/common/items/crafting_ing/animal_misc/raptor_feather.ron diff --git a/assets/common/items/crafting_ing/fang.ron b/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron similarity index 73% rename from assets/common/items/crafting_ing/fang.ron rename to assets/common/items/crafting_ing/animal_misc/sharp_fang.ron index 2accdeb1ad..c181eb3dc2 100644 --- a/assets/common/items/crafting_ing/fang.ron +++ b/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Predator Fang", + name: "Sharp Fang", description: "Incredibly sharp tooth from a predatory animal.", kind: Ingredient( - kind: "Fang", + kind: "SharpFang", ), quality: Common, tags: [], diff --git a/assets/common/items/crafting_ing/venomsac.ron b/assets/common/items/crafting_ing/animal_misc/venom_sac.ron similarity index 100% rename from assets/common/items/crafting_ing/venomsac.ron rename to assets/common/items/crafting_ing/animal_misc/venom_sac.ron diff --git a/assets/common/items/crafting_ing/viscous_ooze.ron b/assets/common/items/crafting_ing/animal_misc/viscous_ooze.ron similarity index 100% rename from assets/common/items/crafting_ing/viscous_ooze.ron rename to assets/common/items/crafting_ing/animal_misc/viscous_ooze.ron diff --git a/assets/common/items/crafting_ing/cloth/cotton.ron b/assets/common/items/crafting_ing/cloth/cotton.ron new file mode 100644 index 0000000000..243e4e2f38 --- /dev/null +++ b/assets/common/items/crafting_ing/cloth/cotton.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Cotton", + description: "Easy to work with and multi-functional.", + kind: Ingredient( + kind: "Cotton", + ), + quality: Low, + tags: [Textile], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/lifecoth.ron b/assets/common/items/crafting_ing/cloth/lifecloth.ron similarity index 88% rename from assets/common/items/crafting_ing/lifecoth.ron rename to assets/common/items/crafting_ing/cloth/lifecloth.ron index f697021012..f19cdd8e9c 100644 --- a/assets/common/items/crafting_ing/lifecoth.ron +++ b/assets/common/items/crafting_ing/cloth/lifecloth.ron @@ -5,5 +5,5 @@ ItemDef( kind: "Lifecloth", ), quality: High, - tags: [], + tags: [Textile], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/linen.ron b/assets/common/items/crafting_ing/cloth/linen.ron similarity index 55% rename from assets/common/items/crafting_ing/linen.ron rename to assets/common/items/crafting_ing/cloth/linen.ron index 60373574c7..897f7e1cc6 100644 --- a/assets/common/items/crafting_ing/linen.ron +++ b/assets/common/items/crafting_ing/cloth/linen.ron @@ -1,9 +1,9 @@ ItemDef( name: "Linen", - description: "A textile made from the fibers of a plant.", + description: "A textile made from flax fibers.", kind: Ingredient( kind: "Linen", ), quality: Low, - tags: [], + tags: [Textile], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/cloth/linen_red.ron b/assets/common/items/crafting_ing/cloth/linen_red.ron new file mode 100644 index 0000000000..d2b5692f7e --- /dev/null +++ b/assets/common/items/crafting_ing/cloth/linen_red.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Red Linen", + description: "A flax fiber textile, dyed to stand out.", + kind: Ingredient( + kind: "LinenRed", + ), + quality: Low, + tags: [Textile], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/moonweave.ron b/assets/common/items/crafting_ing/cloth/moonweave.ron similarity index 87% rename from assets/common/items/crafting_ing/moonweave.ron rename to assets/common/items/crafting_ing/cloth/moonweave.ron index 8e0d07334a..0a822f1328 100644 --- a/assets/common/items/crafting_ing/moonweave.ron +++ b/assets/common/items/crafting_ing/cloth/moonweave.ron @@ -5,5 +5,5 @@ ItemDef( kind: "Moonweave", ), quality: Epic, - tags: [], + tags: [Textile], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/silk.ron b/assets/common/items/crafting_ing/cloth/silk.ron similarity index 53% rename from assets/common/items/crafting_ing/silk.ron rename to assets/common/items/crafting_ing/cloth/silk.ron index b5708cacb9..c4e1a0598a 100644 --- a/assets/common/items/crafting_ing/silk.ron +++ b/assets/common/items/crafting_ing/cloth/silk.ron @@ -1,9 +1,9 @@ ItemDef( name: "Silk", - description: "A fine and strong fibre produced by silkworms.", + description: "A fine and strong fibre produced by spiders.", kind: Ingredient( kind: "Silk", ), quality: Moderate, - tags: [], + tags: [Textile], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/sunsilk.ron b/assets/common/items/crafting_ing/cloth/sunsilk.ron similarity index 87% rename from assets/common/items/crafting_ing/sunsilk.ron rename to assets/common/items/crafting_ing/cloth/sunsilk.ron index 9422b96370..3d063eb955 100644 --- a/assets/common/items/crafting_ing/sunsilk.ron +++ b/assets/common/items/crafting_ing/cloth/sunsilk.ron @@ -5,5 +5,5 @@ ItemDef( kind: "Sunsilk", ), quality: Legendary, - tags: [], + tags: [Textile], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/wool.ron b/assets/common/items/crafting_ing/cloth/wool.ron similarity index 87% rename from assets/common/items/crafting_ing/wool.ron rename to assets/common/items/crafting_ing/cloth/wool.ron index 38c055d8b4..e1cf55c706 100644 --- a/assets/common/items/crafting_ing/wool.ron +++ b/assets/common/items/crafting_ing/cloth/wool.ron @@ -5,5 +5,5 @@ ItemDef( kind: "Wool", ), quality: Common, - tags: [], + tags: [Textile], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/cloth_scraps.ron b/assets/common/items/crafting_ing/cloth_scraps.ron deleted file mode 100644 index 06e32164c6..0000000000 --- a/assets/common/items/crafting_ing/cloth_scraps.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Cloth Scraps", - description: "Looted from humanoids and their houses.", - kind: Ingredient( - kind: "ClothScraps", - ), - quality: Common, - tags: [BaseMaterial], -) diff --git a/assets/common/items/crafting_ing/cloth_scraps_red.ron b/assets/common/items/crafting_ing/cloth_scraps_red.ron deleted file mode 100644 index dbb1373f50..0000000000 --- a/assets/common/items/crafting_ing/cloth_scraps_red.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Red Cloth Scraps", - description: "Dyed red with flower pigments.", - kind: Ingredient( - kind: "ClothScrapsRed", - ), - quality: Common, - tags: [BaseMaterial], -) diff --git a/assets/common/items/crafting_ing/cotton_boll.ron b/assets/common/items/crafting_ing/cotton_boll.ron new file mode 100644 index 0000000000..fb46d92f60 --- /dev/null +++ b/assets/common/items/crafting_ing/cotton_boll.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Cotton Boll", + description: "Plucked from a common cotton plant.", + kind: Ingredient( + kind: "CottonBoll", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/crafting_ing/animal_pelt.ron b/assets/common/items/crafting_ing/hide/animal_hide.ron similarity index 54% rename from assets/common/items/crafting_ing/animal_pelt.ron rename to assets/common/items/crafting_ing/hide/animal_hide.ron index 45aa54da92..d6d68e6264 100644 --- a/assets/common/items/crafting_ing/animal_pelt.ron +++ b/assets/common/items/crafting_ing/hide/animal_hide.ron @@ -1,9 +1,11 @@ ItemDef( - name: "Animal Pelt", + name: "Animal Hide", description: "A pelt from an animal. Becomes leather.", kind: Ingredient( - kind: "AnimalPelt", + kind: "AnimalHide", ), quality: Common, - tags: [], + tags: [ + Material(Leather) + ], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/carapace.ron b/assets/common/items/crafting_ing/hide/carapace.ron similarity index 100% rename from assets/common/items/crafting_ing/carapace.ron rename to assets/common/items/crafting_ing/hide/carapace.ron diff --git a/assets/common/items/crafting_ing/dragon_scale.ron b/assets/common/items/crafting_ing/hide/dragon_scale.ron similarity index 100% rename from assets/common/items/crafting_ing/dragon_scale.ron rename to assets/common/items/crafting_ing/hide/dragon_scale.ron diff --git a/assets/common/items/crafting_ing/leather_troll.ron b/assets/common/items/crafting_ing/hide/leather_troll.ron similarity index 100% rename from assets/common/items/crafting_ing/leather_troll.ron rename to assets/common/items/crafting_ing/hide/leather_troll.ron diff --git a/assets/common/items/crafting_ing/plate.ron b/assets/common/items/crafting_ing/hide/plate.ron similarity index 100% rename from assets/common/items/crafting_ing/plate.ron rename to assets/common/items/crafting_ing/hide/plate.ron diff --git a/assets/common/items/crafting_ing/hide/rugged_hide.ron b/assets/common/items/crafting_ing/hide/rugged_hide.ron new file mode 100644 index 0000000000..0c8bcc29d7 --- /dev/null +++ b/assets/common/items/crafting_ing/hide/rugged_hide.ron @@ -0,0 +1,11 @@ +ItemDef( + name: "Rugged Hide", + description: "A durable pelt, favored by leatherworkers.", + kind: Ingredient( + kind: "RuggedHide", + ), + quality: Common, + tags: [ + Material(Leather) + ], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/scales.ron b/assets/common/items/crafting_ing/hide/scales.ron similarity index 100% rename from assets/common/items/crafting_ing/scales.ron rename to assets/common/items/crafting_ing/hide/scales.ron diff --git a/assets/common/items/crafting_ing/hide/tough_hide.ron b/assets/common/items/crafting_ing/hide/tough_hide.ron new file mode 100644 index 0000000000..c9c1c4d5c7 --- /dev/null +++ b/assets/common/items/crafting_ing/hide/tough_hide.ron @@ -0,0 +1,11 @@ +ItemDef( + name: "Tough Hide", + description: "A pelt from something fierce. Becomes leather.", + kind: Ingredient( + kind: "ToughHide", + ), + quality: Common, + tags: [ + Material(Leather) + ], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/horn.ron b/assets/common/items/crafting_ing/horn.ron deleted file mode 100644 index cc14fdc450..0000000000 --- a/assets/common/items/crafting_ing/horn.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Sharp Horn", - description: "A sharp horn from an animal.", - kind: Ingredient( - kind: "Horn", - ), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/leather.ron b/assets/common/items/crafting_ing/leather.ron deleted file mode 100644 index f4ab458650..0000000000 --- a/assets/common/items/crafting_ing/leather.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Leather", - description: "A fabric made from animal hides or skins.", - kind: Ingredient( - kind: "Leather", - ), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/leather/leather_strips.ron b/assets/common/items/crafting_ing/leather/leather_strips.ron new file mode 100644 index 0000000000..fa14bd6756 --- /dev/null +++ b/assets/common/items/crafting_ing/leather/leather_strips.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Leather Strips", + description: "Simple and versatile.", + kind: Ingredient( + kind: "LeatherStrips", + ), + quality: Common, + tags: [BaseMaterial], +) diff --git a/assets/common/items/crafting_ing/leather/rigid_leather.ron b/assets/common/items/crafting_ing/leather/rigid_leather.ron new file mode 100644 index 0000000000..87a6a96584 --- /dev/null +++ b/assets/common/items/crafting_ing/leather/rigid_leather.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Rigid Leather", + description: "Light but layered, perfect for protection.", + kind: Ingredient( + kind: "RigidLeather", + ), + quality: Common, + tags: [BaseMaterial, Leather], +) diff --git a/assets/common/items/crafting_ing/leather/simple_leather.ron b/assets/common/items/crafting_ing/leather/simple_leather.ron new file mode 100644 index 0000000000..9e4de8d810 --- /dev/null +++ b/assets/common/items/crafting_ing/leather/simple_leather.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Simple Leather", + description: "Light and flexible.", + kind: Ingredient( + kind: "SimpleLeather", + ), + quality: Common, + tags: [BaseMaterial, Leather], +) diff --git a/assets/common/items/crafting_ing/leather/thick_leather.ron b/assets/common/items/crafting_ing/leather/thick_leather.ron new file mode 100644 index 0000000000..cd4e63bdba --- /dev/null +++ b/assets/common/items/crafting_ing/leather/thick_leather.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Thick Leather", + description: "Strong and durable.", + kind: Ingredient( + kind: "ThickLeather", + ), + quality: Common, + tags: [BaseMaterial, Leather], +) diff --git a/assets/common/items/crafting_ing/leather_scraps.ron b/assets/common/items/crafting_ing/leather_scraps.ron deleted file mode 100644 index 187a77935a..0000000000 --- a/assets/common/items/crafting_ing/leather_scraps.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Leather Scraps", - description: "Looted from animals.", - kind: Ingredient( - kind: "LeatherScraps", - ), - quality: Common, - tags: [BaseMaterial], -) diff --git a/assets/common/items/crafting_ing/rawhide.ron b/assets/common/items/crafting_ing/rawhide.ron deleted file mode 100644 index ce406dbf45..0000000000 --- a/assets/common/items/crafting_ing/rawhide.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Rawhide", - description: "A hide that has not been exposed to tanning.", - kind: Ingredient( - kind: "Rawhide", - ), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/sticky_thread.ron b/assets/common/items/crafting_ing/sticky_thread.ron new file mode 100644 index 0000000000..b3d7b463d2 --- /dev/null +++ b/assets/common/items/crafting_ing/sticky_thread.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Sticky Thread", + description: "A messy spider extract, but a tailor may have use for it.", + kind: Ingredient( + kind: "StickyThread", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/crafting_ing/vine.ron b/assets/common/items/crafting_ing/vine.ron deleted file mode 100644 index b776d818b1..0000000000 --- a/assets/common/items/crafting_ing/vine.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Vine", - description: "A strong vine.", - kind: Ingredient( - kind: "Vine", - ), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/debug/admin.ron b/assets/common/items/debug/admin.ron index 3eeed622c8..218bd3b3b8 100644 --- a/assets/common/items/debug/admin.ron +++ b/assets/common/items/debug/admin.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Invincible, poise_resilience: Invincible, + energy_max: 9000, + energy_reward: 9.0, + crit_power: 1000.0, + stealth: 1000.0, ), ) ), diff --git a/assets/common/items/debug/admin_back.ron b/assets/common/items/debug/admin_back.ron index 807aa10fee..daaf2f8ce7 100644 --- a/assets/common/items/debug/admin_back.ron +++ b/assets/common/items/debug/admin_back.ron @@ -6,7 +6,11 @@ ItemDef( kind: Back("Admin"), stats: ( protection: Normal(0.0), - poise_resilience: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/debug/admin_black_hole.ron b/assets/common/items/debug/admin_black_hole.ron index 3b43673794..6fc2cb1cb0 100644 --- a/assets/common/items/debug/admin_black_hole.ron +++ b/assets/common/items/debug/admin_black_hole.ron @@ -6,8 +6,12 @@ ItemDef( kind: Bag("BlackHole"), stats: ( protection: Normal(0.0), - poise_resilience: Normal(0.0) - ), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/cultist_belt.ron b/assets/common/items/debug/cultist_belt.ron index 9557ca7e9a..8ddc43d420 100644 --- a/assets/common/items/debug/cultist_belt.ron +++ b/assets/common/items/debug/cultist_belt.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/debug/cultist_boots.ron b/assets/common/items/debug/cultist_boots.ron index 3f354d647d..1bfa1eae73 100644 --- a/assets/common/items/debug/cultist_boots.ron +++ b/assets/common/items/debug/cultist_boots.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/debug/cultist_chest_blue.ron b/assets/common/items/debug/cultist_chest_blue.ron index 80bc2d2483..d41907f95d 100644 --- a/assets/common/items/debug/cultist_chest_blue.ron +++ b/assets/common/items/debug/cultist_chest_blue.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/debug/cultist_hands_blue.ron b/assets/common/items/debug/cultist_hands_blue.ron index 5461404080..26befa8285 100644 --- a/assets/common/items/debug/cultist_hands_blue.ron +++ b/assets/common/items/debug/cultist_hands_blue.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/debug/cultist_legs_blue.ron b/assets/common/items/debug/cultist_legs_blue.ron index e180a45a17..ad30bda619 100644 --- a/assets/common/items/debug/cultist_legs_blue.ron +++ b/assets/common/items/debug/cultist_legs_blue.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/debug/cultist_shoulder_blue.ron b/assets/common/items/debug/cultist_shoulder_blue.ron index 4d635b0a6d..518931b87e 100644 --- a/assets/common/items/debug/cultist_shoulder_blue.ron +++ b/assets/common/items/debug/cultist_shoulder_blue.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/debug/dungeon_purple.ron b/assets/common/items/debug/dungeon_purple.ron index b5e12e5624..6ba28284fe 100644 --- a/assets/common/items/debug/dungeon_purple.ron +++ b/assets/common/items/debug/dungeon_purple.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/flowers/moonbell.ron b/assets/common/items/flowers/moonbell.ron new file mode 100644 index 0000000000..f5d3c93247 --- /dev/null +++ b/assets/common/items/flowers/moonbell.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Moonbell", + description: "It glistens brilliantly, but only under moonlight.", + kind: Ingredient( + kind: "Moonbell", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/crafting_ing/plant_fiber.ron b/assets/common/items/flowers/plant_fiber.ron similarity index 100% rename from assets/common/items/crafting_ing/plant_fiber.ron rename to assets/common/items/flowers/plant_fiber.ron diff --git a/assets/common/items/flowers/pyrebloom.ron b/assets/common/items/flowers/pyrebloom.ron new file mode 100644 index 0000000000..085c91405f --- /dev/null +++ b/assets/common/items/flowers/pyrebloom.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Pyrebloom", + description: "Warm to the touch, long after picking.", + kind: Ingredient( + kind: "Pyrebloom", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/flowers/wild_flax.ron b/assets/common/items/flowers/wild_flax.ron new file mode 100644 index 0000000000..42994ffcd0 --- /dev/null +++ b/assets/common/items/flowers/wild_flax.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Wild Flax", + description: "Could be used to spin some simple cloth.", + kind: Ingredient( + kind: "WildFlax", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/food/fish.ron b/assets/common/items/food/meat/beast_large_cooked.ron similarity index 74% rename from assets/common/items/food/fish.ron rename to assets/common/items/food/meat/beast_large_cooked.ron index 77041dbb32..862ab6a9c2 100644 --- a/assets/common/items/food/fish.ron +++ b/assets/common/items/food/meat/beast_large_cooked.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Fish", - description: "A fresh seafood steak, chopped from a fish.", + name: "Cooked Meat Slab", + description: "Medium Rare.", kind: Consumable( - kind: "Fish", + kind: "BeastLargeCooked", effect: [ Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 25.0, duration: Some(( secs: 10, nanos: 0, diff --git a/assets/common/items/food/meat/beast_large_raw.ron b/assets/common/items/food/meat/beast_large_raw.ron new file mode 100644 index 0000000000..ab6ef40fcf --- /dev/null +++ b/assets/common/items/food/meat/beast_large_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Meat Slab", + description: "Chunk of beastly animal meat, best after cooking.", + kind: Consumable( + kind: "BeastLargeRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 15.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/beast_small_cooked.ron b/assets/common/items/food/meat/beast_small_cooked.ron new file mode 100644 index 0000000000..1091b9bcee --- /dev/null +++ b/assets/common/items/food/meat/beast_small_cooked.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Cooked Meat Sliver", + description: "Medium Rare.", + kind: Consumable( + kind: "BeastSmallCooked", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 15.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/beast_small_raw.ron b/assets/common/items/food/meat/beast_small_raw.ron new file mode 100644 index 0000000000..c4c53f7399 --- /dev/null +++ b/assets/common/items/food/meat/beast_small_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Meat Sliver", + description: "Small hunk of beastly animal meat, best after cooking.", + kind: Consumable( + kind: "BeastSmallRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 9.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/bird_cooked.ron b/assets/common/items/food/meat/bird_cooked.ron new file mode 100644 index 0000000000..d6ebe34157 --- /dev/null +++ b/assets/common/items/food/meat/bird_cooked.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Cooked Bird Meat", + description: "Best enjoyed with one in each hand.", + kind: Consumable( + kind: "BirdCooked", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 25.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/bird_large_cooked.ron b/assets/common/items/food/meat/bird_large_cooked.ron new file mode 100644 index 0000000000..a1c94aa038 --- /dev/null +++ b/assets/common/items/food/meat/bird_large_cooked.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Huge Cooked Drumstick", + description: "Makes for a legendary meal.", + kind: Consumable( + kind: "BirdLargeCooked", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 80.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/bird_large_raw.ron b/assets/common/items/food/meat/bird_large_raw.ron new file mode 100644 index 0000000000..2bd8afc6d1 --- /dev/null +++ b/assets/common/items/food/meat/bird_large_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Huge Raw Drumstick", + description: "It's magificent.", + kind: Consumable( + kind: "BirdLargeRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 30.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/bird_raw.ron b/assets/common/items/food/meat/bird_raw.ron new file mode 100644 index 0000000000..252cb1fd63 --- /dev/null +++ b/assets/common/items/food/meat/bird_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Bird Meat", + description: "A hefty drumstick.", + kind: Consumable( + kind: "BirdRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 15.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/fish_cooked.ron b/assets/common/items/food/meat/fish_cooked.ron new file mode 100644 index 0000000000..9ed8777a41 --- /dev/null +++ b/assets/common/items/food/meat/fish_cooked.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Cooked Fish", + description: "A fresh cooked seafood steak.", + kind: Consumable( + kind: "FishCooked", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 25.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/fish_raw.ron b/assets/common/items/food/meat/fish_raw.ron new file mode 100644 index 0000000000..ef5515e91c --- /dev/null +++ b/assets/common/items/food/meat/fish_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Fish", + description: "A steak chopped from a fish, best after cooking.", + kind: Consumable( + kind: "FishRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 15.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/tough_cooked.ron b/assets/common/items/food/meat/tough_cooked.ron new file mode 100644 index 0000000000..0d437ebef1 --- /dev/null +++ b/assets/common/items/food/meat/tough_cooked.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Cooked Tough Meat", + description: "Tastes exotic.", + kind: Consumable( + kind: "ToughCooked", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 20.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/tough_raw.ron b/assets/common/items/food/meat/tough_raw.ron new file mode 100644 index 0000000000..a158d36faa --- /dev/null +++ b/assets/common/items/food/meat/tough_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Tough Meat", + description: "Peculiar bit of meat, best after cooking.", + kind: Consumable( + kind: "ToughRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 12.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/crafting_ing/bamboo.ron b/assets/common/items/log/bamboo.ron similarity index 100% rename from assets/common/items/crafting_ing/bamboo.ron rename to assets/common/items/log/bamboo.ron diff --git a/assets/common/items/crafting_ing/eldwood_logs.ron b/assets/common/items/log/eldwood.ron similarity index 100% rename from assets/common/items/crafting_ing/eldwood_logs.ron rename to assets/common/items/log/eldwood.ron diff --git a/assets/common/items/crafting_ing/frostwood_logs.ron b/assets/common/items/log/frostwood.ron similarity index 100% rename from assets/common/items/crafting_ing/frostwood_logs.ron rename to assets/common/items/log/frostwood.ron diff --git a/assets/common/items/crafting_ing/hardwood_logs.ron b/assets/common/items/log/hardwood.ron similarity index 100% rename from assets/common/items/crafting_ing/hardwood_logs.ron rename to assets/common/items/log/hardwood.ron diff --git a/assets/common/items/crafting_ing/ironwood_logs.ron b/assets/common/items/log/ironwood.ron similarity index 100% rename from assets/common/items/crafting_ing/ironwood_logs.ron rename to assets/common/items/log/ironwood.ron diff --git a/assets/common/items/crafting_ing/wood_logs.ron b/assets/common/items/log/wood.ron similarity index 100% rename from assets/common/items/crafting_ing/wood_logs.ron rename to assets/common/items/log/wood.ron diff --git a/assets/common/items/crafting_ing/amethyst.ron b/assets/common/items/mineral/gem/amethyst.ron similarity index 100% rename from assets/common/items/crafting_ing/amethyst.ron rename to assets/common/items/mineral/gem/amethyst.ron diff --git a/assets/common/items/crafting_ing/diamond.ron b/assets/common/items/mineral/gem/diamond.ron similarity index 100% rename from assets/common/items/crafting_ing/diamond.ron rename to assets/common/items/mineral/gem/diamond.ron diff --git a/assets/common/items/crafting_ing/emerald.ron b/assets/common/items/mineral/gem/emerald.ron similarity index 100% rename from assets/common/items/crafting_ing/emerald.ron rename to assets/common/items/mineral/gem/emerald.ron diff --git a/assets/common/items/crafting_ing/ruby.ron b/assets/common/items/mineral/gem/ruby.ron similarity index 100% rename from assets/common/items/crafting_ing/ruby.ron rename to assets/common/items/mineral/gem/ruby.ron diff --git a/assets/common/items/crafting_ing/sapphire.ron b/assets/common/items/mineral/gem/sapphire.ron similarity index 100% rename from assets/common/items/crafting_ing/sapphire.ron rename to assets/common/items/mineral/gem/sapphire.ron diff --git a/assets/common/items/crafting_ing/topaz.ron b/assets/common/items/mineral/gem/topaz.ron similarity index 100% rename from assets/common/items/crafting_ing/topaz.ron rename to assets/common/items/mineral/gem/topaz.ron diff --git a/assets/common/items/crafting_ing/bloodsteel_ingot.ron b/assets/common/items/mineral/ingot/bloodsteel.ron similarity index 100% rename from assets/common/items/crafting_ing/bloodsteel_ingot.ron rename to assets/common/items/mineral/ingot/bloodsteel.ron diff --git a/assets/common/items/crafting_ing/bronze_ingot.ron b/assets/common/items/mineral/ingot/bronze.ron similarity index 100% rename from assets/common/items/crafting_ing/bronze_ingot.ron rename to assets/common/items/mineral/ingot/bronze.ron diff --git a/assets/common/items/crafting_ing/cobalt_ingot.ron b/assets/common/items/mineral/ingot/cobalt.ron similarity index 100% rename from assets/common/items/crafting_ing/cobalt_ingot.ron rename to assets/common/items/mineral/ingot/cobalt.ron diff --git a/assets/common/items/crafting_ing/copper_ingot.ron b/assets/common/items/mineral/ingot/copper.ron similarity index 100% rename from assets/common/items/crafting_ing/copper_ingot.ron rename to assets/common/items/mineral/ingot/copper.ron diff --git a/assets/common/items/crafting_ing/gold_ingot.ron b/assets/common/items/mineral/ingot/gold.ron similarity index 87% rename from assets/common/items/crafting_ing/gold_ingot.ron rename to assets/common/items/mineral/ingot/gold.ron index 6f4b138fb8..00ddddc849 100644 --- a/assets/common/items/crafting_ing/gold_ingot.ron +++ b/assets/common/items/mineral/ingot/gold.ron @@ -5,5 +5,5 @@ ItemDef( kind: "GoldIngot", ), quality: Epic, - tags: [], + tags: [MetalIngot], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/iron_ingot.ron b/assets/common/items/mineral/ingot/iron.ron similarity index 100% rename from assets/common/items/crafting_ing/iron_ingot.ron rename to assets/common/items/mineral/ingot/iron.ron diff --git a/assets/common/items/crafting_ing/orichalcum_ingot.ron b/assets/common/items/mineral/ingot/orichalcum.ron similarity index 87% rename from assets/common/items/crafting_ing/orichalcum_ingot.ron rename to assets/common/items/mineral/ingot/orichalcum.ron index cbf39356ec..34dc75db78 100644 --- a/assets/common/items/crafting_ing/orichalcum_ingot.ron +++ b/assets/common/items/mineral/ingot/orichalcum.ron @@ -5,5 +5,5 @@ ItemDef( kind: "OrichalcumIngot", ), quality: Epic, - tags: [], + tags: [MetalIngot], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/silver_ingot.ron b/assets/common/items/mineral/ingot/silver.ron similarity index 87% rename from assets/common/items/crafting_ing/silver_ingot.ron rename to assets/common/items/mineral/ingot/silver.ron index 4993010da9..54dae5a7ea 100644 --- a/assets/common/items/crafting_ing/silver_ingot.ron +++ b/assets/common/items/mineral/ingot/silver.ron @@ -5,5 +5,5 @@ ItemDef( kind: "SilverIngot", ), quality: Epic, - tags: [], + tags: [MetalIngot], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/steel_ingot.ron b/assets/common/items/mineral/ingot/steel.ron similarity index 100% rename from assets/common/items/crafting_ing/steel_ingot.ron rename to assets/common/items/mineral/ingot/steel.ron diff --git a/assets/common/items/crafting_ing/tin_ingot.ron b/assets/common/items/mineral/ingot/tin.ron similarity index 100% rename from assets/common/items/crafting_ing/tin_ingot.ron rename to assets/common/items/mineral/ingot/tin.ron diff --git a/assets/common/items/crafting_ing/bloodstone_ore.ron b/assets/common/items/mineral/ore/bloodstone.ron similarity index 100% rename from assets/common/items/crafting_ing/bloodstone_ore.ron rename to assets/common/items/mineral/ore/bloodstone.ron diff --git a/assets/common/items/mineral/ore/coal.ron b/assets/common/items/mineral/ore/coal.ron new file mode 100644 index 0000000000..d3740f0a2f --- /dev/null +++ b/assets/common/items/mineral/ore/coal.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Coal", + description: "A dark, combustible energy source.", + kind: Ingredient( + kind: "Coal", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/crafting_ing/cobalt_ore.ron b/assets/common/items/mineral/ore/cobalt.ron similarity index 100% rename from assets/common/items/crafting_ing/cobalt_ore.ron rename to assets/common/items/mineral/ore/cobalt.ron diff --git a/assets/common/items/crafting_ing/copper_ore.ron b/assets/common/items/mineral/ore/copper.ron similarity index 100% rename from assets/common/items/crafting_ing/copper_ore.ron rename to assets/common/items/mineral/ore/copper.ron diff --git a/assets/common/items/crafting_ing/gold_ore.ron b/assets/common/items/mineral/ore/gold.ron similarity index 100% rename from assets/common/items/crafting_ing/gold_ore.ron rename to assets/common/items/mineral/ore/gold.ron diff --git a/assets/common/items/crafting_ing/iron_ore.ron b/assets/common/items/mineral/ore/iron.ron similarity index 100% rename from assets/common/items/crafting_ing/iron_ore.ron rename to assets/common/items/mineral/ore/iron.ron diff --git a/assets/common/items/crafting_ing/silver_ore.ron b/assets/common/items/mineral/ore/silver.ron similarity index 100% rename from assets/common/items/crafting_ing/silver_ore.ron rename to assets/common/items/mineral/ore/silver.ron diff --git a/assets/common/items/crafting_ing/tin_ore.ron b/assets/common/items/mineral/ore/tin.ron similarity index 100% rename from assets/common/items/crafting_ing/tin_ore.ron rename to assets/common/items/mineral/ore/tin.ron diff --git a/assets/common/items/ore/velorite.ron b/assets/common/items/mineral/ore/velorite.ron similarity index 100% rename from assets/common/items/ore/velorite.ron rename to assets/common/items/mineral/ore/velorite.ron diff --git a/assets/common/items/ore/veloritefrag.ron b/assets/common/items/mineral/ore/veloritefrag.ron similarity index 100% rename from assets/common/items/ore/veloritefrag.ron rename to assets/common/items/mineral/ore/veloritefrag.ron diff --git a/assets/common/items/crafting_ing/basalt.ron b/assets/common/items/mineral/stone/basalt.ron similarity index 100% rename from assets/common/items/crafting_ing/basalt.ron rename to assets/common/items/mineral/stone/basalt.ron diff --git a/assets/common/items/crafting_ing/coal.ron b/assets/common/items/mineral/stone/coal.ron similarity index 100% rename from assets/common/items/crafting_ing/coal.ron rename to assets/common/items/mineral/stone/coal.ron diff --git a/assets/common/items/crafting_ing/granite.ron b/assets/common/items/mineral/stone/granite.ron similarity index 100% rename from assets/common/items/crafting_ing/granite.ron rename to assets/common/items/mineral/stone/granite.ron diff --git a/assets/common/items/crafting_ing/obsidian.ron b/assets/common/items/mineral/stone/obsidian.ron similarity index 100% rename from assets/common/items/crafting_ing/obsidian.ron rename to assets/common/items/mineral/stone/obsidian.ron diff --git a/assets/common/items/npc_armor/back/backpack_blue.ron b/assets/common/items/npc_armor/back/backpack_blue.ron index 070dcbb5b9..61a2e4f855 100644 --- a/assets/common/items/npc_armor/back/backpack_blue.ron +++ b/assets/common/items/npc_armor/back/backpack_blue.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/npc_armor/back/leather_blue.ron b/assets/common/items/npc_armor/back/leather_blue.ron index aa658b190a..f36d53a553 100644 --- a/assets/common/items/npc_armor/back/leather_blue.ron +++ b/assets/common/items/npc_armor/back/leather_blue.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(1.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/npc_armor/biped_large/harvester.ron b/assets/common/items/npc_armor/biped_large/harvester.ron index d2aa76d312..216e11c90c 100644 --- a/assets/common/items/npc_armor/biped_large/harvester.ron +++ b/assets/common/items/npc_armor/biped_large/harvester.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_large/mindflayer.ron b/assets/common/items/npc_armor/biped_large/mindflayer.ron index 27e4035a44..cfddaadbfa 100644 --- a/assets/common/items/npc_armor/biped_large/mindflayer.ron +++ b/assets/common/items/npc_armor/biped_large/mindflayer.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(60.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_large/minotaur.ron b/assets/common/items/npc_armor/biped_large/minotaur.ron index f57629d868..bb46a70501 100644 --- a/assets/common/items/npc_armor/biped_large/minotaur.ron +++ b/assets/common/items/npc_armor/biped_large/minotaur.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_large/tidal_warrior.ron b/assets/common/items/npc_armor/biped_large/tidal_warrior.ron index 2e7980bbac..bd20f7bb7f 100644 --- a/assets/common/items/npc_armor/biped_large/tidal_warrior.ron +++ b/assets/common/items/npc_armor/biped_large/tidal_warrior.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(20.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_large/yeti.ron b/assets/common/items/npc_armor/biped_large/yeti.ron index 65918a3686..b2e07d74d2 100644 --- a/assets/common/items/npc_armor/biped_large/yeti.ron +++ b/assets/common/items/npc_armor/biped_large/yeti.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron index 8f9d7b1e3c..80f79ba5ed 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(12.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron index 32e9cf138e..cc8792d375 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(12.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron index 238195dfd2..93ee43dd6a 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron index f4dea6f36b..cfc26410ab 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron index 6176a32a5e..99defb895d 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron index a3e444510e..7b997e8db7 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron index 88e0597aee..4ad3b24a4e 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron index 1f1db8648e..f0586feb2f 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron index 89caf74ba7..ee87368054 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron index 514356d9a1..82138763fb 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron index 33e0a3f95d..312a683788 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron index e8e8930a9f..b6ab6405ba 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(1.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron index 517bf843d2..87d3f691b2 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(1.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron index f92c5ae5c7..8757f8b287 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(1.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron index 8faadbde6c..268a3c44e3 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(1.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron index e35e45d7f2..e80c2c6fd8 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(1.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron index f1c8cae036..084a1b5237 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(23.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron index 9184b2f94a..35079dc965 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(17.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron index f4a9dba2fd..f6f36c417d 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(17.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron index 482d9566b2..55ef9ea2ab 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(17.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron index 0cd5e96f71..acbecaa0fd 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(17.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron b/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron index 52f348aa4d..f2c6c73e7e 100644 --- a/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(18.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron b/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron index 26d36b1654..b599017688 100644 --- a/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron b/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron index 4bd37ed64c..a4d7dd6e75 100644 --- a/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/husk/head/husk.ron b/assets/common/items/npc_armor/biped_small/husk/head/husk.ron index d6bdea23b0..e0bfa0b995 100644 --- a/assets/common/items/npc_armor/biped_small/husk/head/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/head/husk.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron b/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron index bfd787e8f5..b85c4b153d 100644 --- a/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron b/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron index 023f942a7b..7f6448cfd5 100644 --- a/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron index b0f700ea5b..9a5c77e3d7 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron index 45f99913ce..dc7fc5fa79 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron index bf3f6a9cb1..6bea288438 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron index ad80961c42..d9b3adcfbd 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron index 8dd3fe9087..ea9114e6e4 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron index a05d85356d..2dc5ea0977 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron index 06ec1ec5ef..5a693f5595 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(36.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron index 4c78a77279..16bd298e4d 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(25.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron index 87506fe835..5fc02c5840 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(25.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron index de64307376..6ba6dd071a 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(25.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron index e6e5eaacb8..b21efaa619 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(25.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron index 9662f9291d..9641725934 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(25.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron index 7792d4a6b4..5169dfd141 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(18.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron index 3583b1055b..ede72b9e11 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron index b2ee494ea7..377555f351 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron index e6c8e5b94a..647cda4baa 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron index a63f3b0b7e..4a7928e7aa 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron index 3ea6c9515f..40a6babc5a 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_armor/chest/leather_blue.ron b/assets/common/items/npc_armor/chest/leather_blue.ron index 0d002e5998..d779fb5b88 100644 --- a/assets/common/items/npc_armor/chest/leather_blue.ron +++ b/assets/common/items/npc_armor/chest/leather_blue.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(5.0), poise_resilience: Normal(5.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/npc_armor/chest/plate_red.ron b/assets/common/items/npc_armor/chest/plate_red.ron index ee8a80a515..d244f68926 100644 --- a/assets/common/items/npc_armor/chest/plate_red.ron +++ b/assets/common/items/npc_armor/chest/plate_red.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(5.0), poise_resilience: Normal(5.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/npc_armor/golem/claygolem.ron b/assets/common/items/npc_armor/golem/claygolem.ron index 8ba9a70e4c..c391d592d0 100644 --- a/assets/common/items/npc_armor/golem/claygolem.ron +++ b/assets/common/items/npc_armor/golem/claygolem.ron @@ -6,6 +6,10 @@ ItemDef( stats: ( protection: Normal(180.0), poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/pants/leather_blue.ron b/assets/common/items/npc_armor/pants/leather_blue.ron index 18da3a7fe9..ee1cf3e87f 100644 --- a/assets/common/items/npc_armor/pants/leather_blue.ron +++ b/assets/common/items/npc_armor/pants/leather_blue.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(10.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/npc_armor/pants/plate_red.ron b/assets/common/items/npc_armor/pants/plate_red.ron index c43c6ae91d..1280de6e9d 100644 --- a/assets/common/items/npc_armor/pants/plate_red.ron +++ b/assets/common/items/npc_armor/pants/plate_red.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(10.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron index db469f4d84..3b307c40ff 100644 --- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron +++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1, - crit_mult: 1.5, )), )), quality: Legendary, diff --git a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron index 69f5603f81..614490369c 100644 --- a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron +++ b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.18, - crit_mult: 2.8, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron index 1fc2e8128e..70e2f3d9d6 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.3, crit_chance: 0.08406594, - crit_mult: 2.4565825, )), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron index 470c6c1b16..f19d562a03 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.5, crit_chance: 0.05059524, - crit_mult: 2.6134453, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron index 5d8820d0a1..aa25f365e6 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.07589286, - crit_mult: 2.0756302, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron index 9f4f63787f..21270bce1a 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.7, crit_chance: 0.26764706, - crit_mult: 2.067504, )), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron index 223ddcc8e9..8ce4997b21 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.8, crit_chance: 0.12037037, - crit_mult: 2.5824175, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron index 8b30fc8db1..9e54bb2f4d 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13541667, - crit_mult: 2.4065933, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron index 0c7c5b1436..1d3b7fe37c 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.3, crit_chance: 0.05625, - crit_mult: 1.9523809, )), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron index 2b89c18728..703415f5cc 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.6, crit_chance: 0.036458332, - crit_mult: 1.8707483, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron index 198ae821e5..a8bf353341 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.05357143, - crit_mult: 1.7619047, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron index 093ebe1738..4e703aebbb 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.5, crit_chance: 0.095454544, - crit_mult: 1.8163265, )), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron index 6b9d087103..22653938ec 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.7, crit_chance: 0.040873703, - crit_mult: 1.8223734, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron index e7999ec7a5..a7f86c1eef 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.04963235, - crit_mult: 1.6772487, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron index e8c0071784..274abbf225 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.3, crit_chance: 0.066083916, - crit_mult: 2.1791384, )), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron index 5e36c96f1f..b37e61a5c1 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.8, crit_chance: 0.053030305, - crit_mult: 1.9795918, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron index 25666476e9..009c76f0ec 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.05965909, - crit_mult: 1.8707483, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index 7734132b1a..8f3591097e 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 59677e5b2c..333d70e043 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron index af2d18be18..7156218a30 100644 --- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron +++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.05078125, - crit_mult: 1.7032967, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index f2c9833b3a..4f3de99ff1 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron index 66bca833bb..b0e48e8b92 100644 --- a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1, - crit_mult: 2.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index 8ebc9d63aa..d73f107045 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index a8423fc01f..7f099b8efa 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron index 602926451b..ba131033ff 100644 --- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.046875, - crit_mult: 1.6095238, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index ee542d5083..619d4b25fa 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0, - crit_mult: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 5ce9ee2ebc..0790507924 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index e70a880eef..3b93585192 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index 53c197754f..069dcb56d3 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index 8c53250630..785de51e2b 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/basilisk.ron b/assets/common/items/npc_weapons/unique/basilisk.ron new file mode 100644 index 0000000000..8855209c54 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/basilisk.ron @@ -0,0 +1,18 @@ +ItemDef( + name: "Basilisk", + description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.0625, + )), + )), + quality: Low, + tags: [], + ability_spec: Some(Custom("Basilisk")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index b67fa33ecb..b16c0b8d6d 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron index e42004cb1d..9a5bf83800 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/birdlargefire.ron b/assets/common/items/npc_weapons/unique/birdlargefire.ron index 0a44fcd156..d4891eb3d8 100644 --- a/assets/common/items/npc_weapons/unique/birdlargefire.ron +++ b/assets/common/items/npc_weapons/unique/birdlargefire.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron index 2ea42a3744..f27b438868 100644 --- a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1, - crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron index 572c4fc9c6..55a1e188ef 100644 --- a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron +++ b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/husk.ron b/assets/common/items/npc_weapons/unique/husk.ron index 9f1df18b35..ca5b38716a 100644 --- a/assets/common/items/npc_weapons/unique/husk.ron +++ b/assets/common/items/npc_weapons/unique/husk.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index a91fbcb7ed..d620826182 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron index ff0207d024..4ffcd18f9e 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index a05dad74ad..a683f253b5 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index 70ba06f701..49f43c1817 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron index 3c2b3c66aa..2f4bcf2464 100644 --- a/assets/common/items/npc_weapons/unique/quadlowranged.ron +++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index 1d1d6d2e49..3c3e3c51f3 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index 49c86239b2..ce74915ed5 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron index d4f81fab07..b7604de52f 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.00, crit_chance: 0.09375, - crit_mult: 2.2190476, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index b108b02a6c..2a39eab347 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index 314897c0c3..59ecc3e51a 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index 7d0d3c16d9..63fb6f2d1f 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index bcfc305637..0bcefba5dc 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index 12b0d5820e..f749e77721 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron index a88bb5c254..1347f986b6 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index 5e01b1e229..487bcad91e 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index 7c11a98e86..178a080562 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodcharge.ron b/assets/common/items/npc_weapons/unique/theropodcharge.ron index c8d40e60d8..7d210f2463 100644 --- a/assets/common/items/npc_weapons/unique/theropodcharge.ron +++ b/assets/common/items/npc_weapons/unique/theropodcharge.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1, - crit_mult: 2.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron index 0d2f505bd8..ffa400d083 100644 --- a/assets/common/items/npc_weapons/unique/tidal_claws.ron +++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tidal_totem.ron b/assets/common/items/npc_weapons/unique/tidal_totem.ron index 06bd8017df..8d51a0a8d7 100644 --- a/assets/common/items/npc_weapons/unique/tidal_totem.ron +++ b/assets/common/items/npc_weapons/unique/tidal_totem.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron index fb23f8c049..933cba1688 100644 --- a/assets/common/items/npc_weapons/unique/turret.ron +++ b/assets/common/items/npc_weapons/unique/turret.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron index 2640198224..0c9ef13b4c 100644 --- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron +++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/tag_examples/leather.ron b/assets/common/items/tag_examples/leather.ron new file mode 100644 index 0000000000..a551d4a638 --- /dev/null +++ b/assets/common/items/tag_examples/leather.ron @@ -0,0 +1,15 @@ +ItemDef( + name: "Any leather", + description: "Leathers tanned from hides.", + kind: TagExamples( + item_ids: [ + "common.items.crafting_ing.leather.rigid_leather", + "common.items.crafting_ing.leather.thick_leather", + "common.items.crafting_ing.leather.simple_leather", + ], + ), + quality: Common, + tags: [], +) + + diff --git a/assets/common/items/tag_examples/leather_item.ron b/assets/common/items/tag_examples/leather_item.ron index 4bbd0e217c..cf8914346d 100644 --- a/assets/common/items/tag_examples/leather_item.ron +++ b/assets/common/items/tag_examples/leather_item.ron @@ -3,18 +3,18 @@ ItemDef( description: "Various leather armors.", kind: TagExamples( item_ids: [ - "common.items.armor.agile.back", - "common.items.armor.agile.belt", - "common.items.armor.agile.chest", - "common.items.armor.agile.foot", - "common.items.armor.agile.hand", - "common.items.armor.agile.pants", - "common.items.armor.agile.shoulder", - "common.items.armor.swift.belt", - "common.items.armor.swift.chest", - "common.items.armor.swift.foot", - "common.items.armor.swift.hand", - "common.items.armor.swift.pants", + "common.items.armor.hide.rawhide.back", + "common.items.armor.hide.rawhide.belt", + "common.items.armor.hide.rawhide.chest", + "common.items.armor.hide.rawhide.foot", + "common.items.armor.hide.rawhide.hand", + "common.items.armor.hide.rawhide.pants", + "common.items.armor.hide.rawhide.shoulder", + "common.items.armor.hide.leather.belt", + "common.items.armor.hide.leather.chest", + "common.items.armor.hide.leather.foot", + "common.items.armor.hide.leather.hand", + "common.items.armor.hide.leather.pants", ], ), diff --git a/assets/common/items/tag_examples/metal_ingot.ron b/assets/common/items/tag_examples/metal_ingot.ron index fe90564b6f..7c2fbaba64 100644 --- a/assets/common/items/tag_examples/metal_ingot.ron +++ b/assets/common/items/tag_examples/metal_ingot.ron @@ -3,13 +3,13 @@ ItemDef( description: "Ingots made from various metals.", kind: TagExamples( item_ids: [ - "common.items.crafting_ing.bloodsteel_ingot", - "common.items.crafting_ing.bronze_ingot", - "common.items.crafting_ing.cobalt_ingot", - "common.items.crafting_ing.copper_ingot", - "common.items.crafting_ing.iron_ingot", - "common.items.crafting_ing.steel_ingot", - "common.items.crafting_ing.tin_ingot", + "common.items.mineral.ingot.bloodsteel", + "common.items.mineral.ingot.bronze", + "common.items.mineral.ingot.cobalt", + "common.items.mineral.ingot.copper", + "common.items.mineral.ingot.iron", + "common.items.mineral.ingot.steel", + "common.items.mineral.ingot.tin", ], ), quality: Common, diff --git a/assets/common/items/tag_examples/textile.ron b/assets/common/items/tag_examples/textile.ron new file mode 100644 index 0000000000..3b86a1ebaa --- /dev/null +++ b/assets/common/items/tag_examples/textile.ron @@ -0,0 +1,18 @@ +ItemDef( + name: "Any woven cloth", + description: "Cloths spun from plant material.", + kind: TagExamples( + item_ids: [ + "common.items.crafting_ing.cloth.linen", + "common.items.crafting_ing.cloth.wool", + "common.items.crafting_ing.cloth.silk", + "common.items.crafting_ing.cloth.lifecloth", + "common.items.crafting_ing.cloth.moonweave", + "common.items.crafting_ing.cloth.sunsilk", + ], + ), + quality: Common, + tags: [], +) + + diff --git a/assets/common/items/testing/test_bag_18_slot.ron b/assets/common/items/testing/test_bag_18_slot.ron index c33cc51a40..a560f6e76a 100644 --- a/assets/common/items/testing/test_bag_18_slot.ron +++ b/assets/common/items/testing/test_bag_18_slot.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/testing/test_bag_9_slot.ron b/assets/common/items/testing/test_bag_9_slot.ron index bea076ce70..2608fb0738 100644 --- a/assets/common/items/testing/test_bag_9_slot.ron +++ b/assets/common/items/testing/test_bag_9_slot.ron @@ -7,6 +7,10 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, ), ) ), diff --git a/assets/common/items/testing/test_boots.ron b/assets/common/items/testing/test_boots.ron index ecc6cf63b5..c54800f09e 100644 --- a/assets/common/items/testing/test_boots.ron +++ b/assets/common/items/testing/test_boots.ron @@ -7,7 +7,11 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - ), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), ) ), quality: Low, diff --git a/assets/common/items/tool/craftsman_hammer.ron b/assets/common/items/tool/craftsman_hammer.ron index 599a308d0d..1f0d9e808d 100644 --- a/assets/common/items/tool/craftsman_hammer.ron +++ b/assets/common/items/tool/craftsman_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.25, speed: 1.5, crit_chance: 0.0, - crit_mult: 0.0, )), )), quality: Common, diff --git a/assets/common/items/tool/pickaxe_steel.ron b/assets/common/items/tool/pickaxe_steel.ron new file mode 100644 index 0000000000..8ecdf77867 --- /dev/null +++ b/assets/common/items/tool/pickaxe_steel.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Steel Pickaxe", + description: "Strike the earth!", + kind: Tool(( + kind: Pick, + hands: Two, + stats: Direct(( + equip_time_secs: 0.25, + power: 0.75, + poise_strength: 0.25, + speed: 1.3, + crit_chance: 0.0, + )), + )), + quality: Moderate, + tags: [CraftingTool], +) diff --git a/assets/common/items/tool/pick.ron b/assets/common/items/tool/pickaxe_stone.ron similarity index 80% rename from assets/common/items/tool/pick.ron rename to assets/common/items/tool/pickaxe_stone.ron index e853548c8e..274396d086 100644 --- a/assets/common/items/tool/pick.ron +++ b/assets/common/items/tool/pickaxe_stone.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Iron Pickaxe", + name: "Stone Pickaxe", description: "Strike the earth!", kind: Tool(( kind: Pick, @@ -8,9 +8,8 @@ ItemDef( equip_time_secs: 0.25, power: 0.75, poise_strength: 0.25, - speed: 0.75, + speed: 0.5, crit_chance: 0.0, - crit_mult: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index e7119f89c3..72071fcf60 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, - crit_mult: 1.4395604, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index eb623e23ea..eb95fa4e8e 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, - crit_mult: 1.4395604, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index e373f6db35..7c150a81f4 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, - crit_mult: 1.4395604, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index 61fd3b2656..ee68c70856 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, - crit_mult: 1.5714285, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index f911742faa..50eaabf04a 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, - crit_mult: 1.5714285, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron index df31b93d5b..f61cc16861 100644 --- a/assets/common/items/weapons/axe/bronze_axe-2.ron +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, - crit_mult: 1.5714285, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron index 56c5aeb820..8105a6b2ae 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, - crit_mult: 1.4081633, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/cobalt_axe-1.ron b/assets/common/items/weapons/axe/cobalt_axe-1.ron index 6bb57664a5..1ecee6d56f 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-1.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, - crit_mult: 1.4081633, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index de1c6b000a..057848c743 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index dd27cd78a9..408aae4a97 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index 27b60587a9..e1f93d90c0 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index fd7a82ed07..995eaf4daa 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index 1480cfea5f..3e802da32a 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index e52641bfd4..caf7919e7b 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index 60af0abb88..ecd5d50bc0 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index 39b995fc54..5bee0b4ea5 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index 9c0e2d60ff..12827bcc25 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index b9ee7a66b1..744218538f 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index a6f5b2ffaf..dd4dc2bcb1 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index e4955c1a45..d433aeaa96 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.083333336, - crit_mult: 2.142857, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index 26f88d65fa..d63d22f36f 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.11666667, - crit_mult: 1.3918368, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 6812184161..f301d96426 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index 85ac3995d8..084adeca48 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index c8b6e3d128..b639f528a9 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index b5431b0e6b..6817b2f736 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index f2a2b0f328..beb3e64eda 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index 64d72ead18..f97577c524 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index 14743ee9fc..b715737bdc 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index c45c6aea9e..477c807fa1 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron index bac117004a..5a07d6964d 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.3, crit_chance: 0.16485508, - crit_mult: 1.4043956, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron index 597253e97d..611d3a8536 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.11666667, - crit_mult: 1.4285715, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/bronze-0.ron b/assets/common/items/weapons/axe_1h/bronze-0.ron index bcee330ef5..c938d407ad 100644 --- a/assets/common/items/weapons/axe_1h/bronze-0.ron +++ b/assets/common/items/weapons/axe_1h/bronze-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.15714286, - crit_mult: 1.5454545, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/bronze-1.ron b/assets/common/items/weapons/axe_1h/bronze-1.ron index 1052605550..a1344ff0dd 100644 --- a/assets/common/items/weapons/axe_1h/bronze-1.ron +++ b/assets/common/items/weapons/axe_1h/bronze-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.14318182, - crit_mult: 1.5442177, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/cobalt-0.ron b/assets/common/items/weapons/axe_1h/cobalt-0.ron index f44656e288..2a8010d7fe 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-0.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, - crit_mult: 1.4395604, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/cobalt-1.ron b/assets/common/items/weapons/axe_1h/cobalt-1.ron index 5b4d9dac8f..db1df91344 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-1.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.85, crit_chance: 0.12635136, - crit_mult: 1.4522536, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/iron-0.ron b/assets/common/items/weapons/axe_1h/iron-0.ron index e34a9e9bd1..5a75726ac0 100644 --- a/assets/common/items/weapons/axe_1h/iron-0.ron +++ b/assets/common/items/weapons/axe_1h/iron-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.15, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-1.ron b/assets/common/items/weapons/axe_1h/iron-1.ron index 418358d782..c171943ac2 100644 --- a/assets/common/items/weapons/axe_1h/iron-1.ron +++ b/assets/common/items/weapons/axe_1h/iron-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.1257085, - crit_mult: 1.5244997, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-2.ron b/assets/common/items/weapons/axe_1h/iron-2.ron index 4c60063496..8e580e7419 100644 --- a/assets/common/items/weapons/axe_1h/iron-2.ron +++ b/assets/common/items/weapons/axe_1h/iron-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.16363636, - crit_mult: 1.5238096, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-3.ron b/assets/common/items/weapons/axe_1h/iron-3.ron index 3f35fd9160..4005e00d47 100644 --- a/assets/common/items/weapons/axe_1h/iron-3.ron +++ b/assets/common/items/weapons/axe_1h/iron-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/orichalcum-0.ron b/assets/common/items/weapons/axe_1h/orichalcum-0.ron index 139fbfbb3f..a9be1d5024 100644 --- a/assets/common/items/weapons/axe_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/axe_1h/orichalcum-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/axe_1h/steel-0.ron b/assets/common/items/weapons/axe_1h/steel-0.ron index 806e52b864..103daa9fe8 100644 --- a/assets/common/items/weapons/axe_1h/steel-0.ron +++ b/assets/common/items/weapons/axe_1h/steel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.118421055, - crit_mult: 1.4825397, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/steel-1.ron b/assets/common/items/weapons/axe_1h/steel-1.ron index fc31c6d29a..0cb64201b1 100644 --- a/assets/common/items/weapons/axe_1h/steel-1.ron +++ b/assets/common/items/weapons/axe_1h/steel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/steel-2.ron b/assets/common/items/weapons/axe_1h/steel-2.ron index 501503a19a..207e6d1c0f 100644 --- a/assets/common/items/weapons/axe_1h/steel-2.ron +++ b/assets/common/items/weapons/axe_1h/steel-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.139011, - crit_mult: 1.4743083, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/stone-0.ron b/assets/common/items/weapons/axe_1h/stone-0.ron index cc75d4703c..1587a3b214 100644 --- a/assets/common/items/weapons/axe_1h/stone-0.ron +++ b/assets/common/items/weapons/axe_1h/stone-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1265625, - crit_mult: 1.7054673, )), )), quality: Common, diff --git a/assets/common/items/weapons/axe_1h/stone-1.ron b/assets/common/items/weapons/axe_1h/stone-1.ron index fbd51a6574..446c71ca30 100644 --- a/assets/common/items/weapons/axe_1h/stone-1.ron +++ b/assets/common/items/weapons/axe_1h/stone-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.14311224, - crit_mult: 1.7130125, )), )), quality: Common, diff --git a/assets/common/items/weapons/axe_1h/wood-0.ron b/assets/common/items/weapons/axe_1h/wood-0.ron index 870ee80ed4..d6b6d8afdc 100644 --- a/assets/common/items/weapons/axe_1h/wood-0.ron +++ b/assets/common/items/weapons/axe_1h/wood-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.0625, - crit_mult: 2.142857, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe_1h/wood-1.ron b/assets/common/items/weapons/axe_1h/wood-1.ron index 7e10e7d091..e99b87339d 100644 --- a/assets/common/items/weapons/axe_1h/wood-1.ron +++ b/assets/common/items/weapons/axe_1h/wood-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.09821428, - crit_mult: 2.1636364, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/bone-0.ron b/assets/common/items/weapons/bow/bone-0.ron index 0d883844f2..f3e306bd84 100644 --- a/assets/common/items/weapons/bow/bone-0.ron +++ b/assets/common/items/weapons/bow/bone-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.1, crit_chance: 0.16587302, - crit_mult: 1.5741627, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-1.ron b/assets/common/items/weapons/bow/bone-1.ron index 14b317cb75..1f54e07a31 100644 --- a/assets/common/items/weapons/bow/bone-1.ron +++ b/assets/common/items/weapons/bow/bone-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.8, crit_chance: 0.12222222, - crit_mult: 1.5844156, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-2.ron b/assets/common/items/weapons/bow/bone-2.ron index b5cefe5326..0979e619e9 100644 --- a/assets/common/items/weapons/bow/bone-2.ron +++ b/assets/common/items/weapons/bow/bone-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.0, crit_chance: 0.15, - crit_mult: 1.5714285, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-3.ron b/assets/common/items/weapons/bow/bone-3.ron index f5de95bd96..1e126ffc55 100644 --- a/assets/common/items/weapons/bow/bone-3.ron +++ b/assets/common/items/weapons/bow/bone-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.9, crit_chance: 0.13564593, - crit_mult: 1.574452, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/eldwood-0.ron b/assets/common/items/weapons/bow/eldwood-0.ron index 50a2cc71df..5702dc5700 100644 --- a/assets/common/items/weapons/bow/eldwood-0.ron +++ b/assets/common/items/weapons/bow/eldwood-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.0, crit_chance: 0.13611111, - crit_mult: 1.4081633, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/eldwood-1.ron b/assets/common/items/weapons/bow/eldwood-1.ron index f4aafb476c..798eda59c9 100644 --- a/assets/common/items/weapons/bow/eldwood-1.ron +++ b/assets/common/items/weapons/bow/eldwood-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.2, crit_chance: 0.15511364, - crit_mult: 1.4029304, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/eldwood-2.ron b/assets/common/items/weapons/bow/eldwood-2.ron index eed0ee14d1..9db2eee8e5 100644 --- a/assets/common/items/weapons/bow/eldwood-2.ron +++ b/assets/common/items/weapons/bow/eldwood-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.8, crit_chance: 0.11666667, - crit_mult: 1.4285715, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-0.ron b/assets/common/items/weapons/bow/frostwood-0.ron index e3b975332d..1752b4861a 100644 --- a/assets/common/items/weapons/bow/frostwood-0.ron +++ b/assets/common/items/weapons/bow/frostwood-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.2, crit_chance: 0.16363636, - crit_mult: 1.4365079, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-1.ron b/assets/common/items/weapons/bow/frostwood-1.ron index 84a1c86da1..f432fa922d 100644 --- a/assets/common/items/weapons/bow/frostwood-1.ron +++ b/assets/common/items/weapons/bow/frostwood-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.0, crit_chance: 0.1421875, - crit_mult: 1.4395604, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-2.ron b/assets/common/items/weapons/bow/frostwood-2.ron index 2d8f704603..41ec4312e1 100644 --- a/assets/common/items/weapons/bow/frostwood-2.ron +++ b/assets/common/items/weapons/bow/frostwood-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.9, crit_chance: 0.13165635, - crit_mult: 1.4467961, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/hardwood-0.ron b/assets/common/items/weapons/bow/hardwood-0.ron index 60639c86ea..d5d7c96517 100644 --- a/assets/common/items/weapons/bow/hardwood-0.ron +++ b/assets/common/items/weapons/bow/hardwood-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-1.ron b/assets/common/items/weapons/bow/hardwood-1.ron index f4afdabc55..f87d8f0a51 100644 --- a/assets/common/items/weapons/bow/hardwood-1.ron +++ b/assets/common/items/weapons/bow/hardwood-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.8, crit_chance: 0.114285715, - crit_mult: 1.5357143, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-2.ron b/assets/common/items/weapons/bow/hardwood-2.ron index c972db1ae6..4813101ffe 100644 --- a/assets/common/items/weapons/bow/hardwood-2.ron +++ b/assets/common/items/weapons/bow/hardwood-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.1, crit_chance: 0.15, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-3.ron b/assets/common/items/weapons/bow/hardwood-3.ron index 7668554163..75407c781c 100644 --- a/assets/common/items/weapons/bow/hardwood-3.ron +++ b/assets/common/items/weapons/bow/hardwood-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.3, crit_chance: 0.1789855, - crit_mult: 1.5320995, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-4.ron b/assets/common/items/weapons/bow/hardwood-4.ron index 8222e3dbce..3984a975fd 100644 --- a/assets/common/items/weapons/bow/hardwood-4.ron +++ b/assets/common/items/weapons/bow/hardwood-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.2, crit_chance: 0.16363636, - crit_mult: 1.5238096, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-5.ron b/assets/common/items/weapons/bow/hardwood-5.ron index 4acb8514e2..c18fef9bce 100644 --- a/assets/common/items/weapons/bow/hardwood-5.ron +++ b/assets/common/items/weapons/bow/hardwood-5.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.9, crit_chance: 0.1257085, - crit_mult: 1.5244997, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-0.ron b/assets/common/items/weapons/bow/metal-0.ron index 5fbdd37fe7..d433134754 100644 --- a/assets/common/items/weapons/bow/metal-0.ron +++ b/assets/common/items/weapons/bow/metal-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-1.ron b/assets/common/items/weapons/bow/metal-1.ron index 9ad9192228..5550a20e6e 100644 --- a/assets/common/items/weapons/bow/metal-1.ron +++ b/assets/common/items/weapons/bow/metal-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.2, crit_chance: 0.15, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-2.ron b/assets/common/items/weapons/bow/metal-2.ron index d4beb858ac..f6dcc40148 100644 --- a/assets/common/items/weapons/bow/metal-2.ron +++ b/assets/common/items/weapons/bow/metal-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.1, crit_chance: 0.139011, - crit_mult: 1.4743083, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-3.ron b/assets/common/items/weapons/bow/metal-3.ron index 4f7007bdab..8862df6dae 100644 --- a/assets/common/items/weapons/bow/metal-3.ron +++ b/assets/common/items/weapons/bow/metal-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.9, crit_chance: 0.118421055, - crit_mult: 1.4825397, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-4.ron b/assets/common/items/weapons/bow/metal-4.ron index c66abeeee8..1deaa4e3a6 100644 --- a/assets/common/items/weapons/bow/metal-4.ron +++ b/assets/common/items/weapons/bow/metal-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.8, crit_chance: 0.108333334, - crit_mult: 1.4945055, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/rawwood-0.ron b/assets/common/items/weapons/bow/rawwood-0.ron index da5ec9ba3b..8d3d5467ae 100644 --- a/assets/common/items/weapons/bow/rawwood-0.ron +++ b/assets/common/items/weapons/bow/rawwood-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.9, crit_chance: 0.0718985, - crit_mult: 2.1353874, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/rawwood-1.ron b/assets/common/items/weapons/bow/rawwood-1.ron index e76baf06b2..f1863b39cf 100644 --- a/assets/common/items/weapons/bow/rawwood-1.ron +++ b/assets/common/items/weapons/bow/rawwood-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.0, crit_chance: 0.083333336, - crit_mult: 2.142857, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron index 46586c2264..22199a6eba 100644 --- a/assets/common/items/weapons/bow/sagitta.ron +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.8, crit_chance: 0.11666667, - crit_mult: 1.3918368, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron index 96cf3af1ac..ce5931ae19 100644 --- a/assets/common/items/weapons/bow/starter.ron +++ b/assets/common/items/weapons/bow/starter.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.3, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron index 0560073830..c04eb1a6dc 100644 --- a/assets/common/items/weapons/bow/velorite.ron +++ b/assets/common/items/weapons/bow/velorite.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.1, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/bow/wood-0.ron b/assets/common/items/weapons/bow/wood-0.ron index b2eedd0251..ef90149cc8 100644 --- a/assets/common/items/weapons/bow/wood-0.ron +++ b/assets/common/items/weapons/bow/wood-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.9, crit_chance: 0.0625, - crit_mult: 2.015873, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-1.ron b/assets/common/items/weapons/bow/wood-1.ron index 010e68354f..31afce2446 100644 --- a/assets/common/items/weapons/bow/wood-1.ron +++ b/assets/common/items/weapons/bow/wood-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.1, crit_chance: 0.0795068, - crit_mult: 2.026738, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-2.ron b/assets/common/items/weapons/bow/wood-2.ron index f9ba117316..d579323e11 100644 --- a/assets/common/items/weapons/bow/wood-2.ron +++ b/assets/common/items/weapons/bow/wood-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.0, crit_chance: 0.0703125, - crit_mult: 2.015873, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-3.ron b/assets/common/items/weapons/bow/wood-3.ron index 7d70b8b9d6..3a4ab777f3 100644 --- a/assets/common/items/weapons/bow/wood-3.ron +++ b/assets/common/items/weapons/bow/wood-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 0.8, crit_chance: 0.055555556, - crit_mult: 2.0285714, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-4.ron b/assets/common/items/weapons/bow/wood-4.ron index c55217cbb8..b67eb12327 100644 --- a/assets/common/items/weapons/bow/wood-4.ron +++ b/assets/common/items/weapons/bow/wood-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.8, speed: 1.2, crit_chance: 0.09090909, - crit_mult: 2.047619, )), )), quality: Low, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index b71682b99b..542749fa11 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 2.0, speed: 1.0, crit_chance: 0.13611111, - crit_mult: 1.4081633, )), )), quality: High, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index fb89b4d114..0d4f960629 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 9aafcdef34..abcb3ae9be 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.5, speed: 1.0, crit_chance: 0.15, - crit_mult: 1.5714285, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index fe107cebfa..63128668ff 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0625, - crit_mult: 1.9142857, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index 1a7b47a357..d9e321e06e 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron index 3130d6306c..5ccc45e301 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/burnt_drumstick.ron b/assets/common/items/weapons/hammer/burnt_drumstick.ron new file mode 100644 index 0000000000..c381899237 --- /dev/null +++ b/assets/common/items/weapons/hammer/burnt_drumstick.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Burnt Drumstick", + description: "Might need more practice...", + kind: Tool(( + kind: Hammer, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 0.5, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.09375, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index d1f3b4abdf..d059e46fc9 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.121875, - crit_mult: 1.4395604, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index 3238bf08b3..e903894101 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.121875, - crit_mult: 1.4395604, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron index a83d76d85b..34945956bf 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index a34be22bb7..178fe6c2a9 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 53a3fb5242..677816e836 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index 2e09ac6219..493159c1e5 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 546e636e0d..c478de7e6e 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index c8f42fbc8b..de5092a3d8 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index 462fba0963..ada59ff373 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index 4fbe1141f0..785af299e7 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index 4bb9c91459..2f34366c66 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index 844f188e28..4ae906961b 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index baa6094fba..8412684598 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index 2561792269..bfb9351d15 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, - crit_mult: 1.5772005, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index cd812ba36a..840103d505 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.078125, - crit_mult: 1.3657143, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index 68d29e8dd6..0574ef62eb 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, - crit_mult: 1.4081633, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index 5ae5ba8bc0..be55b1e0c4 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, - crit_mult: 1.4081633, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index c6fcef84a5..7daaf9ee8d 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index 1f35a09234..b0cefa97c7 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index 5155717fb5..30b1104f95 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index 7900da36fc..41957d11cb 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index a0d3749f6a..fc1bbd882e 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index 977c389ea8..c6399b73cf 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index 614c5c0b1e..741372a33d 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index 8962c74407..2d6e33bbf2 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.07589286, - crit_mult: 2.0756302, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index d30122ff3c..416cdafb0b 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.07589286, - crit_mult: 2.0756302, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index 9700086d48..fd17acc7b0 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.07589286, - crit_mult: 2.0756302, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index 85debbe94a..54bcf0c834 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.07589286, - crit_mult: 2.0756302, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index 6db1eb0258..fff231d21c 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.083333336, - crit_mult: 2.142857, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron index f804afc650..b4c4b417f6 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.15511364, - crit_mult: 1.4029304, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron index aef1e3b911..80c3b29343 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, - crit_mult: 1.4081633, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/bronze-0.ron b/assets/common/items/weapons/hammer_1h/bronze-0.ron index 8217a342e6..5eab1d3d15 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-0.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.12222222, - crit_mult: 1.5844156, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/bronze-1.ron b/assets/common/items/weapons/hammer_1h/bronze-1.ron index 4caab46aea..e8f036ad28 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-1.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, - crit_mult: 1.5714285, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-0.ron b/assets/common/items/weapons/hammer_1h/cobalt-0.ron index 1d8107132e..cca11c6d2a 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-0.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, - crit_mult: 1.4395604, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-1.ron b/assets/common/items/weapons/hammer_1h/cobalt-1.ron index 6302c95890..443788f7d5 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-1.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.15277778, - crit_mult: 1.4363636, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/iron-0.ron b/assets/common/items/weapons/hammer_1h/iron-0.ron index f46369fa25..91ddc5343e 100644 --- a/assets/common/items/weapons/hammer_1h/iron-0.ron +++ b/assets/common/items/weapons/hammer_1h/iron-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.114285715, - crit_mult: 1.5357143, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/iron-1.ron b/assets/common/items/weapons/hammer_1h/iron-1.ron index 1029f7c244..d1e9838df6 100644 --- a/assets/common/items/weapons/hammer_1h/iron-1.ron +++ b/assets/common/items/weapons/hammer_1h/iron-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.1257085, - crit_mult: 1.5244997, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/iron-2.ron b/assets/common/items/weapons/hammer_1h/iron-2.ron index 423f3923f9..2b9be64b41 100644 --- a/assets/common/items/weapons/hammer_1h/iron-2.ron +++ b/assets/common/items/weapons/hammer_1h/iron-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.15, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron index e9fdcbb5ca..5ada9501c8 100644 --- a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/hammer_1h/steel-0.ron b/assets/common/items/weapons/hammer_1h/steel-0.ron index 27e1afd921..7eae425c6f 100644 --- a/assets/common/items/weapons/hammer_1h/steel-0.ron +++ b/assets/common/items/weapons/hammer_1h/steel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.118421055, - crit_mult: 1.4825397, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/steel-1.ron b/assets/common/items/weapons/hammer_1h/steel-1.ron index cd17a85033..305b4819ae 100644 --- a/assets/common/items/weapons/hammer_1h/steel-1.ron +++ b/assets/common/items/weapons/hammer_1h/steel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/steel-2.ron b/assets/common/items/weapons/hammer_1h/steel-2.ron index c9db5704a4..c4079c4da2 100644 --- a/assets/common/items/weapons/hammer_1h/steel-2.ron +++ b/assets/common/items/weapons/hammer_1h/steel-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.15, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/stone-0.ron b/assets/common/items/weapons/hammer_1h/stone-0.ron index 38934fefe6..b3229fbc20 100644 --- a/assets/common/items/weapons/hammer_1h/stone-0.ron +++ b/assets/common/items/weapons/hammer_1h/stone-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.14311224, - crit_mult: 1.7130125, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer_1h/stone-1.ron b/assets/common/items/weapons/hammer_1h/stone-1.ron index 92dcc31ab7..1c0c89c54f 100644 --- a/assets/common/items/weapons/hammer_1h/stone-1.ron +++ b/assets/common/items/weapons/hammer_1h/stone-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.1, - crit_mult: 1.7142857, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer_1h/wood-0.ron b/assets/common/items/weapons/hammer_1h/wood-0.ron index af37f2cbae..ae2042accb 100644 --- a/assets/common/items/weapons/hammer_1h/wood-0.ron +++ b/assets/common/items/weapons/hammer_1h/wood-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.0625, - crit_mult: 2.142857, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer_1h/wood-1.ron b/assets/common/items/weapons/hammer_1h/wood-1.ron index add7ab2a07..7d0b0e0c59 100644 --- a/assets/common/items/weapons/hammer_1h/wood-1.ron +++ b/assets/common/items/weapons/hammer_1h/wood-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.09821428, - crit_mult: 2.1636364, )), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/amethyst.ron b/assets/common/items/weapons/sceptre/amethyst.ron index c7777bc276..09a1b72499 100644 --- a/assets/common/items/weapons/sceptre/amethyst.ron +++ b/assets/common/items/weapons/sceptre/amethyst.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.2, crit_chance: 0.088125, - crit_mult: 1.3857143, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/caduceus.ron b/assets/common/items/weapons/sceptre/caduceus.ron index 2e0e790e50..e837fdd575 100644 --- a/assets/common/items/weapons/sceptre/caduceus.ron +++ b/assets/common/items/weapons/sceptre/caduceus.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.2, crit_chance: 0.078125, - crit_mult: 1.3657143, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/sceptre/coralline_cane.ron b/assets/common/items/weapons/sceptre/coralline_cane.ron index 6dd881bd16..efe78871b0 100644 --- a/assets/common/items/weapons/sceptre/coralline_cane.ron +++ b/assets/common/items/weapons/sceptre/coralline_cane.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.0, crit_chance: 0.14666667, - crit_mult: 1.4285715, )), )), quality: High, diff --git a/assets/common/items/weapons/sceptre/divine_gohei.ron b/assets/common/items/weapons/sceptre/divine_gohei.ron index 27b61b67a0..5ea15a60c1 100644 --- a/assets/common/items/weapons/sceptre/divine_gohei.ron +++ b/assets/common/items/weapons/sceptre/divine_gohei.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 0.8, crit_chance: 0.0809375, - crit_mult: 1.7326007, )), )), quality: Common, diff --git a/assets/common/items/weapons/sceptre/druids_arbor.ron b/assets/common/items/weapons/sceptre/druids_arbor.ron index f3b5c62f07..99fa835657 100644 --- a/assets/common/items/weapons/sceptre/druids_arbor.ron +++ b/assets/common/items/weapons/sceptre/druids_arbor.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.1, crit_chance: 0.055102043, - crit_mult: 1.4444444, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sceptre/emerald.ron b/assets/common/items/weapons/sceptre/emerald.ron index 3a99b0e8ad..ac3eef1626 100644 --- a/assets/common/items/weapons/sceptre/emerald.ron +++ b/assets/common/items/weapons/sceptre/emerald.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index 91d4fa94c6..e3856e04d3 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 0.8, crit_chance: 0.11666667, - crit_mult: 1.4285715, )), )), quality: High, diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index ff0c26e0c6..d29243a9a2 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.3, crit_chance: 0.1925, - crit_mult: 1.4329004, )), )), quality: High, diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index d49039bf58..c1e8f7ccf4 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 0.9, crit_chance: 0.0609375, - crit_mult: 1.7326007, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index dd26418355..32737af908 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.078125, - crit_mult: 1.3657143, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index f8b8baf1f1..e8ce02c3ac 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.1, crit_chance: 0.055102043, - crit_mult: 1.4444444, )), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index d650b11ada..0be83abc30 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.0, crit_chance: 0.21153846, - crit_mult: 1.4502164, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index 45196aff82..ccdc5fa6f1 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.5, speed: 1.1, crit_chance: 0.16491365, - crit_mult: 1.5711566, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index f1cee856b6..4cb89c1373 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 0.1, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron index 767939a495..272a81a86f 100644 --- a/assets/common/items/weapons/sceptre/totem_green.ron +++ b/assets/common/items/weapons/sceptre/totem_green.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.2, crit_chance: 0.16363636, - crit_mult: 1.5238096, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index 5d4c8874a0..d95484e01b 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/staff/aurora.ron b/assets/common/items/weapons/staff/aurora.ron index a8f82f2258..d07070f0a3 100644 --- a/assets/common/items/weapons/staff/aurora.ron +++ b/assets/common/items/weapons/staff/aurora.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.2625, - crit_mult: 1.4761904, )), )), quality: High, diff --git a/assets/common/items/weapons/staff/bent_fuse.ron b/assets/common/items/weapons/staff/bent_fuse.ron index ab06866888..7a8850d61e 100644 --- a/assets/common/items/weapons/staff/bent_fuse.ron +++ b/assets/common/items/weapons/staff/bent_fuse.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.7, crit_chance: 0.17045455, - crit_mult: 1.4469842, )), )), quality: Low, diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index c3b786aff3..a036d26da2 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Low, diff --git a/assets/common/items/weapons/staff/crimson_eye.ron b/assets/common/items/weapons/staff/crimson_eye.ron index 6039aa9ea2..b72c9626ab 100644 --- a/assets/common/items/weapons/staff/crimson_eye.ron +++ b/assets/common/items/weapons/staff/crimson_eye.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.125, - crit_mult: 1.4571428, )), )), quality: Low, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 6a75d645dc..095d9bca53 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/staff/dragon_tongue.ron b/assets/common/items/weapons/staff/dragon_tongue.ron index bc5f5ea7d9..a4b407bf2a 100644 --- a/assets/common/items/weapons/staff/dragon_tongue.ron +++ b/assets/common/items/weapons/staff/dragon_tongue.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.2625, - crit_mult: 1.4761904, )), )), quality: Epic, diff --git a/assets/common/items/weapons/staff/fiery_wishing_rod.ron b/assets/common/items/weapons/staff/fiery_wishing_rod.ron index a9bc27341a..d18ddf3730 100644 --- a/assets/common/items/weapons/staff/fiery_wishing_rod.ron +++ b/assets/common/items/weapons/staff/fiery_wishing_rod.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.11111111, - crit_mult: 1.5142857, )), )), quality: Common, diff --git a/assets/common/items/weapons/staff/flamethrower_0.ron b/assets/common/items/weapons/staff/flamethrower_0.ron index 3244bcbd08..118ad667d2 100644 --- a/assets/common/items/weapons/staff/flamethrower_0.ron +++ b/assets/common/items/weapons/staff/flamethrower_0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.113131315, - crit_mult: 1.4017857, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/frostwood_torch.ron b/assets/common/items/weapons/staff/frostwood_torch.ron index ca3280d0c7..c98cee1a50 100644 --- a/assets/common/items/weapons/staff/frostwood_torch.ron +++ b/assets/common/items/weapons/staff/frostwood_torch.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.134379086, - crit_mult: 1.4114286, )), )), quality: High, diff --git a/assets/common/items/weapons/staff/golden_khakkara.ron b/assets/common/items/weapons/staff/golden_khakkara.ron index 677abccdc9..e5193e2906 100644 --- a/assets/common/items/weapons/staff/golden_khakkara.ron +++ b/assets/common/items/weapons/staff/golden_khakkara.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.115, - crit_mult: 1.4571428, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/heated_arm.ron b/assets/common/items/weapons/staff/heated_arm.ron index d7bd74282e..c562dfb74a 100644 --- a/assets/common/items/weapons/staff/heated_arm.ron +++ b/assets/common/items/weapons/staff/heated_arm.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/infused_tower.ron b/assets/common/items/weapons/staff/infused_tower.ron index e0cbe2c965..6434346811 100644 --- a/assets/common/items/weapons/staff/infused_tower.ron +++ b/assets/common/items/weapons/staff/infused_tower.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.18715277, - crit_mult: 1.445269, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/laevateinn.ron b/assets/common/items/weapons/staff/laevateinn.ron index 9b7fca332b..d00a370fe3 100644 --- a/assets/common/items/weapons/staff/laevateinn.ron +++ b/assets/common/items/weapons/staff/laevateinn.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.2002994, - crit_mult: 1.3798152, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/staff/lava_rod.ron b/assets/common/items/weapons/staff/lava_rod.ron index fe8c3f4a25..7c20f8cb79 100644 --- a/assets/common/items/weapons/staff/lava_rod.ron +++ b/assets/common/items/weapons/staff/lava_rod.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.114379086, - crit_mult: 1.4114286, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/ley_seeker.ron b/assets/common/items/weapons/staff/ley_seeker.ron index 4e48bceace..b595186fe5 100644 --- a/assets/common/items/weapons/staff/ley_seeker.ron +++ b/assets/common/items/weapons/staff/ley_seeker.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/staff/orc_iron.ron b/assets/common/items/weapons/staff/orc_iron.ron index 59e246157b..829ea92fa4 100644 --- a/assets/common/items/weapons/staff/orc_iron.ron +++ b/assets/common/items/weapons/staff/orc_iron.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.2638889, - crit_mult: 1.481203, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/phoenix.ron b/assets/common/items/weapons/staff/phoenix.ron index 39acf85d40..9f7659129a 100644 --- a/assets/common/items/weapons/staff/phoenix.ron +++ b/assets/common/items/weapons/staff/phoenix.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.1002994, - crit_mult: 1.3798152, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/staff/ruby_rod.ron b/assets/common/items/weapons/staff/ruby_rod.ron index d83f85db9a..463e9afabd 100644 --- a/assets/common/items/weapons/staff/ruby_rod.ron +++ b/assets/common/items/weapons/staff/ruby_rod.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.2625, - crit_mult: 1.4761904, )), )), quality: High, diff --git a/assets/common/items/weapons/staff/solar.ron b/assets/common/items/weapons/staff/solar.ron index bb76c9a306..1583e4bf4b 100644 --- a/assets/common/items/weapons/staff/solar.ron +++ b/assets/common/items/weapons/staff/solar.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.125, - crit_mult: 1.4571428, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index 95d68d226a..f7312f1efa 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index b225769c32..362c8e8c3e 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron index 7d694ead4f..9441de1085 100644 --- a/assets/common/items/weapons/sword/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword/bloodsteel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, - crit_mult: 1.4081633, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron index 5dda7cc296..a534715e8c 100644 --- a/assets/common/items/weapons/sword/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword/bloodsteel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.15511364, - crit_mult: 1.4029304, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron index 777156ee26..bd08f6642b 100644 --- a/assets/common/items/weapons/sword/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword/bloodsteel-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.11666667, - crit_mult: 1.4285715, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron index b920735a17..cc59417589 100644 --- a/assets/common/items/weapons/sword/bronze-0.ron +++ b/assets/common/items/weapons/sword/bronze-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.13564593, - crit_mult: 1.574452, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron index 94d403ab5b..eeb6499496 100644 --- a/assets/common/items/weapons/sword/bronze-1.ron +++ b/assets/common/items/weapons/sword/bronze-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.16587302, - crit_mult: 1.5741627, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron index 5035d46d60..94d83474e8 100644 --- a/assets/common/items/weapons/sword/bronze-2.ron +++ b/assets/common/items/weapons/sword/bronze-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, - crit_mult: 1.5714285, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 398be9caaf..8ce2c13cf5 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.11666667, - crit_mult: 1.3918368, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron index 1ac72a7566..32a5f47dac 100644 --- a/assets/common/items/weapons/sword/cobalt-0.ron +++ b/assets/common/items/weapons/sword/cobalt-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.15277778, - crit_mult: 1.4363636, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron index eac68d7dbf..424432f5e1 100644 --- a/assets/common/items/weapons/sword/cobalt-1.ron +++ b/assets/common/items/weapons/sword/cobalt-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.120987654, - crit_mult: 1.4591837, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron index 2097972227..1d9f09e0b4 100644 --- a/assets/common/items/weapons/sword/cobalt-2.ron +++ b/assets/common/items/weapons/sword/cobalt-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, - crit_mult: 1.4395604, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron index 72a70fb048..d5b2cee871 100644 --- a/assets/common/items/weapons/sword/cobalt-3.ron +++ b/assets/common/items/weapons/sword/cobalt-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.13165635, - crit_mult: 1.4467961, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index 2f5047fea4..d34851ad3a 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, - crit_mult: 1.4063492, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron index 31d2f3aeb6..a66b794222 100644 --- a/assets/common/items/weapons/sword/frost-0.ron +++ b/assets/common/items/weapons/sword/frost-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13897058, - crit_mult: 1.4232805, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron index 538878d05a..1eee31cd76 100644 --- a/assets/common/items/weapons/sword/frost-1.ron +++ b/assets/common/items/weapons/sword/frost-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.14182693, - crit_mult: 1.4132365, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron index baea0c90a0..9868f887f8 100644 --- a/assets/common/items/weapons/sword/iron-0.ron +++ b/assets/common/items/weapons/sword/iron-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.95, crit_chance: 0.13153847, - crit_mult: 1.5213033, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron index 3384891775..6cdeb55e65 100644 --- a/assets/common/items/weapons/sword/iron-1.ron +++ b/assets/common/items/weapons/sword/iron-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.75, crit_chance: 0.10862069, - crit_mult: 1.5442177, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron index 2eaf2b6c83..6b0cca590c 100644 --- a/assets/common/items/weapons/sword/iron-10.ron +++ b/assets/common/items/weapons/sword/iron-10.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.85, crit_chance: 0.11996997, - crit_mult: 1.529233, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron index 7399fd8cba..6aa3bf5bf2 100644 --- a/assets/common/items/weapons/sword/iron-2.ron +++ b/assets/common/items/weapons/sword/iron-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.15, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron index 7e032e5d16..58b198e08e 100644 --- a/assets/common/items/weapons/sword/iron-3.ron +++ b/assets/common/items/weapons/sword/iron-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.05, crit_chance: 0.14363733, - crit_mult: 1.5189053, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron index ebb84cbe52..bb888d1089 100644 --- a/assets/common/items/weapons/sword/iron-4.ron +++ b/assets/common/items/weapons/sword/iron-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.1257085, - crit_mult: 1.5244997, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron index 6f23e4967b..0c2b7c9cd9 100644 --- a/assets/common/items/weapons/sword/iron-5.ron +++ b/assets/common/items/weapons/sword/iron-5.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.15, crit_chance: 0.15664452, - crit_mult: 1.5211332, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-6.ron b/assets/common/items/weapons/sword/iron-6.ron index c9b5824305..f91c472bda 100644 --- a/assets/common/items/weapons/sword/iron-6.ron +++ b/assets/common/items/weapons/sword/iron-6.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.5194805, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron index 81cb65d31a..d0f0438938 100644 --- a/assets/common/items/weapons/sword/iron-7.ron +++ b/assets/common/items/weapons/sword/iron-7.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.114285715, - crit_mult: 1.5357143, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron index bc1f5afdd1..9a5256d0f8 100644 --- a/assets/common/items/weapons/sword/iron-8.ron +++ b/assets/common/items/weapons/sword/iron-8.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.16363636, - crit_mult: 1.5238096, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron index f3399c7c5c..844cd6f4f2 100644 --- a/assets/common/items/weapons/sword/iron-9.ron +++ b/assets/common/items/weapons/sword/iron-9.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.25, crit_chance: 0.17105263, - crit_mult: 1.5274725, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index f755182248..006dc1cca9 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, - crit_mult: 2.2190475, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/steel-0.ron b/assets/common/items/weapons/sword/steel-0.ron index e2541750e6..20763f915c 100644 --- a/assets/common/items/weapons/sword/steel-0.ron +++ b/assets/common/items/weapons/sword/steel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron index e8345bd374..ecb3808b3b 100644 --- a/assets/common/items/weapons/sword/steel-1.ron +++ b/assets/common/items/weapons/sword/steel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.95, crit_chance: 0.1234748, - crit_mult: 1.4787478, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron index 8f492c16c1..d67ffa263c 100644 --- a/assets/common/items/weapons/sword/steel-2.ron +++ b/assets/common/items/weapons/sword/steel-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.15, crit_chance: 0.14441861, - crit_mult: 1.4748102, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron index da85244b87..fc90731205 100644 --- a/assets/common/items/weapons/sword/steel-3.ron +++ b/assets/common/items/weapons/sword/steel-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.118421055, - crit_mult: 1.4825397, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron index 17fc51b55c..817499043a 100644 --- a/assets/common/items/weapons/sword/steel-4.ron +++ b/assets/common/items/weapons/sword/steel-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.85, crit_chance: 0.113382734, - crit_mult: 1.4877245, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron index e727291263..385ca3b231 100644 --- a/assets/common/items/weapons/sword/steel-5.ron +++ b/assets/common/items/weapons/sword/steel-5.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.15, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron index b26873235b..2b83c9e665 100644 --- a/assets/common/items/weapons/sword/steel-6.ron +++ b/assets/common/items/weapons/sword/steel-6.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.139011, - crit_mult: 1.4743083, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron index 6a0bdf0a0d..ecca549054 100644 --- a/assets/common/items/weapons/sword/steel-7.ron +++ b/assets/common/items/weapons/sword/steel-7.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.108333334, - crit_mult: 1.4945055, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron index 77fc65a17c..8160a2fba6 100644 --- a/assets/common/items/weapons/sword/steel-8.ron +++ b/assets/common/items/weapons/sword/steel-8.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.05, crit_chance: 0.13373984, - crit_mult: 1.4747431, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron index c0b76b3d8b..99f392017d 100644 --- a/assets/common/items/weapons/sword/stone-0.ron +++ b/assets/common/items/weapons/sword/stone-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.055555556, - crit_mult: 2.0285714, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron index f7d26bf6f0..c31a54b345 100644 --- a/assets/common/items/weapons/sword/stone-1.ron +++ b/assets/common/items/weapons/sword/stone-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.0703125, - crit_mult: 2.015873, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron index 3f64753c63..30dbb210fc 100644 --- a/assets/common/items/weapons/sword/stone-2.ron +++ b/assets/common/items/weapons/sword/stone-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.0625, - crit_mult: 2.015873, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-0.ron b/assets/common/items/weapons/sword/wood-0.ron index e1e15c59de..1b6f5e1086 100644 --- a/assets/common/items/weapons/sword/wood-0.ron +++ b/assets/common/items/weapons/sword/wood-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.083333336, - crit_mult: 2.142857, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron index 9cfb78f27b..4ecd09cc09 100644 --- a/assets/common/items/weapons/sword/wood-1.ron +++ b/assets/common/items/weapons/sword/wood-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.0625, - crit_mult: 2.142857, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-2.ron b/assets/common/items/weapons/sword/wood-2.ron index c01bf40e5c..b067540853 100644 --- a/assets/common/items/weapons/sword/wood-2.ron +++ b/assets/common/items/weapons/sword/wood-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.09821428, - crit_mult: 2.1636364, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron index 0b9177f329..e129ce7bba 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.3, crit_chance: 0.16712894, - crit_mult: 1.4126486, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron index a85f030366..c1944b307e 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.75, crit_chance: 0.1125, - crit_mult: 1.4444444, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron index d9446a0f20..549843b408 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, - crit_mult: 1.4155844, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bronze-0.ron b/assets/common/items/weapons/sword_1h/bronze-0.ron index a23d9fa343..1fa44508c0 100644 --- a/assets/common/items/weapons/sword_1h/bronze-0.ron +++ b/assets/common/items/weapons/sword_1h/bronze-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.14958791, - crit_mult: 1.7346189, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/bronze-1.ron b/assets/common/items/weapons/sword_1h/bronze-1.ron index 7ee513d8dd..caadfc2848 100644 --- a/assets/common/items/weapons/sword_1h/bronze-1.ron +++ b/assets/common/items/weapons/sword_1h/bronze-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.13125, - crit_mult: 1.7256236, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/bronze-2.ron b/assets/common/items/weapons/sword_1h/bronze-2.ron index 154949b53d..fdb3552e0b 100644 --- a/assets/common/items/weapons/sword_1h/bronze-2.ron +++ b/assets/common/items/weapons/sword_1h/bronze-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.11598297, - crit_mult: 1.724534, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/cobalt-0.ron b/assets/common/items/weapons/sword_1h/cobalt-0.ron index ebc06be375..e8c0892556 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-0.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.14475524, - crit_mult: 1.4554865, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-1.ron b/assets/common/items/weapons/sword_1h/cobalt-1.ron index 4129b07834..b1c6493e43 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-1.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.105882354, - crit_mult: 1.4761904, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-2.ron b/assets/common/items/weapons/sword_1h/cobalt-2.ron index 67043941dd..8f1655fff9 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-2.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.13469388, - crit_mult: 1.4545455, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-3.ron b/assets/common/items/weapons/sword_1h/cobalt-3.ron index 91a4acb048..d737a8dbb1 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-3.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.11546052, - crit_mult: 1.4639804, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/iron-0.ron b/assets/common/items/weapons/sword_1h/iron-0.ron index 5f571ef716..ced1cb2749 100644 --- a/assets/common/items/weapons/sword_1h/iron-0.ron +++ b/assets/common/items/weapons/sword_1h/iron-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-1.ron b/assets/common/items/weapons/sword_1h/iron-1.ron index 9d9fe58539..92a1694cdb 100644 --- a/assets/common/items/weapons/sword_1h/iron-1.ron +++ b/assets/common/items/weapons/sword_1h/iron-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.124404766, - crit_mult: 1.6379585, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-2.ron b/assets/common/items/weapons/sword_1h/iron-2.ron index a5959b945c..65c6dbee87 100644 --- a/assets/common/items/weapons/sword_1h/iron-2.ron +++ b/assets/common/items/weapons/sword_1h/iron-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.09166667, - crit_mult: 1.6493506, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-3.ron b/assets/common/items/weapons/sword_1h/iron-3.ron index 08a87d82cc..1e92d9d2cb 100644 --- a/assets/common/items/weapons/sword_1h/iron-3.ron +++ b/assets/common/items/weapons/sword_1h/iron-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.13806818, - crit_mult: 1.6466784, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-4.ron b/assets/common/items/weapons/sword_1h/iron-4.ron index be3a8ae6fd..d2b5f79b9b 100644 --- a/assets/common/items/weapons/sword_1h/iron-4.ron +++ b/assets/common/items/weapons/sword_1h/iron-4.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.10173445, - crit_mult: 1.63828, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/obsidian-0.ron b/assets/common/items/weapons/sword_1h/obsidian-0.ron index e7978eb0d1..27ddd8f6b9 100644 --- a/assets/common/items/weapons/sword_1h/obsidian-0.ron +++ b/assets/common/items/weapons/sword_1h/obsidian-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.8, crit_chance: 0.117663816, - crit_mult: 1.4358354, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-0.ron b/assets/common/items/weapons/sword_1h/orichalcum-0.ron index 1b09761693..47e92693bf 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.9, crit_chance: 0.13110903, - crit_mult: 1.4150879, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-1.ron b/assets/common/items/weapons/sword_1h/orichalcum-1.ron index d99bf20944..36d6fad9da 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-1.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.1, crit_chance: 0.14990601, - crit_mult: 1.4012539, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword_1h/steel-0.ron b/assets/common/items/weapons/sword_1h/steel-0.ron index cc9525f5b7..5a2a5ca0b8 100644 --- a/assets/common/items/weapons/sword_1h/steel-0.ron +++ b/assets/common/items/weapons/sword_1h/steel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.75, crit_chance: 0.10714286, - crit_mult: 1.5333333, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-1.ron b/assets/common/items/weapons/sword_1h/steel-1.ron index 91a120ef04..1baaa2f42a 100644 --- a/assets/common/items/weapons/sword_1h/steel-1.ron +++ b/assets/common/items/weapons/sword_1h/steel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 0.95, crit_chance: 0.12928994, - crit_mult: 1.5099705, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-2.ron b/assets/common/items/weapons/sword_1h/steel-2.ron index 9d5488ab17..c1c95859cd 100644 --- a/assets/common/items/weapons/sword_1h/steel-2.ron +++ b/assets/common/items/weapons/sword_1h/steel-2.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.2, crit_chance: 0.15974025, - crit_mult: 1.5110337, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-3.ron b/assets/common/items/weapons/sword_1h/steel-3.ron index 09bdb53a8a..45bf9a39bc 100644 --- a/assets/common/items/weapons/sword_1h/steel-3.ron +++ b/assets/common/items/weapons/sword_1h/steel-3.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.05, crit_chance: 0.14085366, - crit_mult: 1.5071119, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index f257da73a8..8095f5c773 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 8a3ac29735..046082da09 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index 06a3414c93..0acab723a1 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.5, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 6565f6939c..c41bf5ad60 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index c94c42946d..f976c01315 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 4.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 5f4587c96f..9ddd949c3a 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index f928d87964..bae1c00140 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 2.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index 86eb869854..760ed5999b 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -10,7 +10,6 @@ ItemDef( poise_strength: 2.0, speed: 1.0, crit_chance: 0.1125, - crit_mult: 1.6349206, )), )), quality: Common, diff --git a/assets/common/loadouts/village/villager.ron b/assets/common/loadouts/village/villager.ron index 4be54001f5..72e88f6be4 100644 --- a/assets/common/loadouts/village/villager.ron +++ b/assets/common/loadouts/village/villager.ron @@ -11,12 +11,4 @@ (1.0, Some(Item("common.items.armor.misc.chest.worker_orange_0"))), (1.0, Some(Item("common.items.armor.misc.chest.worker_orange_1"))), ]), - - Armor(Belt): Item("common.items.armor.swift.belt"), - Armor(Legs): Item("common.items.armor.misc.pants.worker_blue"), - - Armor(Feet): Choice([ - (1.0, Some(Item("common.items.armor.swift.foot"))), - (1.0, Some(Item("common.items.armor.misc.foot.sandals"))), - ]), }) diff --git a/assets/common/loot_tables/armor/agile.ron b/assets/common/loot_tables/armor/agile.ron deleted file mode 100644 index 1cd2150a6c..0000000000 --- a/assets/common/loot_tables/armor/agile.ron +++ /dev/null @@ -1,9 +0,0 @@ -[ - (1.0, Item("common.items.armor.agile.back")), - (1.0, Item("common.items.armor.agile.belt")), - (1.0, Item("common.items.armor.agile.chest")), - (1.0, Item("common.items.armor.agile.foot")), - (1.0, Item("common.items.armor.agile.hand")), - (1.0, Item("common.items.armor.agile.pants")), - (1.0, Item("common.items.armor.agile.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/cultist.ron b/assets/common/loot_tables/armor/cultist.ron deleted file mode 100644 index 8b4cc7cb56..0000000000 --- a/assets/common/loot_tables/armor/cultist.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (1.0, Item("common.items.armor.cultist.belt")), - (1.0, Item("common.items.armor.cultist.chest")), - (1.0, Item("common.items.armor.cultist.foot")), - (1.0, Item("common.items.armor.cultist.hand")), - (1.0, Item("common.items.armor.cultist.pants")), - (1.0, Item("common.items.armor.cultist.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/druid.ron b/assets/common/loot_tables/armor/druid.ron deleted file mode 100644 index 13b73adcde..0000000000 --- a/assets/common/loot_tables/armor/druid.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (1.0, Item("common.items.armor.druid.belt")), - (1.0, Item("common.items.armor.druid.chest")), - (1.0, Item("common.items.armor.druid.foot")), - (1.0, Item("common.items.armor.druid.hand")), - (1.0, Item("common.items.armor.druid.pants")), - (1.0, Item("common.items.armor.druid.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/leather.ron b/assets/common/loot_tables/armor/leather.ron new file mode 100644 index 0000000000..c3035dc72c --- /dev/null +++ b/assets/common/loot_tables/armor/leather.ron @@ -0,0 +1,8 @@ +[ + (1.0, Item("common.items.armor.hide.leather.belt")), + (1.0, Item("common.items.armor.hide.leather.chest")), + (1.0, Item("common.items.armor.hide.leather.foot")), + (1.0, Item("common.items.armor.hide.leather.hand")), + (1.0, Item("common.items.armor.hide.leather.pants")), + (1.0, Item("common.items.armor.hide.leather.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/plate.ron b/assets/common/loot_tables/armor/plate.ron deleted file mode 100644 index e7ba66a81b..0000000000 --- a/assets/common/loot_tables/armor/plate.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (1.0, Item("common.items.armor.plate.belt")), - (1.0, Item("common.items.armor.plate.chest")), - (1.0, Item("common.items.armor.plate.foot")), - (1.0, Item("common.items.armor.plate.hand")), - (1.0, Item("common.items.armor.plate.pants")), - (1.0, Item("common.items.armor.plate.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/rawhide.ron b/assets/common/loot_tables/armor/rawhide.ron new file mode 100644 index 0000000000..7f0007d5f8 --- /dev/null +++ b/assets/common/loot_tables/armor/rawhide.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.hide.rawhide.back")), + (1.0, Item("common.items.armor.hide.rawhide.belt")), + (1.0, Item("common.items.armor.hide.rawhide.chest")), + (1.0, Item("common.items.armor.hide.rawhide.foot")), + (1.0, Item("common.items.armor.hide.rawhide.hand")), + (1.0, Item("common.items.armor.hide.rawhide.pants")), + (1.0, Item("common.items.armor.hide.rawhide.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/steel.ron b/assets/common/loot_tables/armor/steel.ron deleted file mode 100644 index b189ec8186..0000000000 --- a/assets/common/loot_tables/armor/steel.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (1.0, Item("common.items.armor.steel.belt")), - (1.0, Item("common.items.armor.steel.chest")), - (1.0, Item("common.items.armor.steel.foot")), - (1.0, Item("common.items.armor.steel.hand")), - (1.0, Item("common.items.armor.steel.pants")), - (1.0, Item("common.items.armor.steel.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/swift.ron b/assets/common/loot_tables/armor/swift.ron deleted file mode 100644 index 8d1bb0d7ea..0000000000 --- a/assets/common/loot_tables/armor/swift.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (1.0, Item("common.items.armor.swift.belt")), - (1.0, Item("common.items.armor.swift.chest")), - (1.0, Item("common.items.armor.swift.foot")), - (1.0, Item("common.items.armor.swift.hand")), - (1.0, Item("common.items.armor.swift.pants")), - (1.0, Item("common.items.armor.swift.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/saurok.ron b/assets/common/loot_tables/creature/biped_large/saurok.ron index 8dc9d108af..0d20129f77 100644 --- a/assets/common/loot_tables/creature/biped_large/saurok.ron +++ b/assets/common/loot_tables/creature/biped_large/saurok.ron @@ -1,5 +1,5 @@ [ - (7.0, LootTable("common.loot_tables.materials.common")), + (2.0, LootTable("common.loot_tables.materials.common")), // Consumables (0.5, Item("common.items.consumable.potion_minor")), // Ring diff --git a/assets/common/loot_tables/creature/biped_large/troll.ron b/assets/common/loot_tables/creature/biped_large/troll.ron index 8d756a38c8..a5a670a39f 100644 --- a/assets/common/loot_tables/creature/biped_large/troll.ron +++ b/assets/common/loot_tables/creature/biped_large/troll.ron @@ -2,5 +2,5 @@ (1.0, LootTable("common.loot_tables.food.prepared")), (1.0, LootTable("common.loot_tables.cave_large")), (1.0, LootTable("common.loot_tables.weapons.tier-2")), - (5.0, Item("common.items.crafting_ing.leather_troll")), + (5.0, Item("common.items.crafting_ing.hide.leather_troll")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/wendigo.ron b/assets/common/loot_tables/creature/biped_large/wendigo.ron index bcb2acdda5..aa83360486 100644 --- a/assets/common/loot_tables/creature/biped_large/wendigo.ron +++ b/assets/common/loot_tables/creature/biped_large/wendigo.ron @@ -1,6 +1,6 @@ [ (1.0, LootTable("common.loot_tables.food.prepared")), - (1.0, Item("common.items.crafting_ing.icy_fang")), + (1.0, Item("common.items.crafting_ing.animal_misc.icy_fang")), (1.0, LootTable("common.loot_tables.weapons.tier-2")), (4.0, LootTable("common.loot_tables.cave_large")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/bird_large/cockatrice.ron b/assets/common/loot_tables/creature/bird_large/cockatrice.ron new file mode 100644 index 0000000000..dff08ded99 --- /dev/null +++ b/assets/common/loot_tables/creature/bird_large/cockatrice.ron @@ -0,0 +1,4 @@ +[ + (0.1, Item("common.items.food.meat.bird_large_raw")), + (1.0, Item("common.items.crafting_ing.hide.scales")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/bird_large/phoenix.ron b/assets/common/loot_tables/creature/bird_large/phoenix.ron new file mode 100644 index 0000000000..705dc8f853 --- /dev/null +++ b/assets/common/loot_tables/creature/bird_large/phoenix.ron @@ -0,0 +1,5 @@ +[ + (0.1, Item("common.items.food.meat.bird_large_raw")), + (1.0, Item("common.items.crafting_ing.animal_misc.phoenix_feather")), + +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/bird_medium.ron b/assets/common/loot_tables/creature/bird_medium.ron index 0b7572577a..5734d81385 100644 --- a/assets/common/loot_tables/creature/bird_medium.ron +++ b/assets/common/loot_tables/creature/bird_medium.ron @@ -1,4 +1,3 @@ [ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (1.0, LootTable("common.loot_tables.fallback")), + (1.0, Item("common.items.food.meat.bird_raw")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/fish.ron b/assets/common/loot_tables/creature/fish.ron index edfafbbe43..29b683c09f 100644 --- a/assets/common/loot_tables/creature/fish.ron +++ b/assets/common/loot_tables/creature/fish.ron @@ -1,3 +1,3 @@ [ - (1.0, Item("common.items.food.fish")), + (1.0, Item("common.items.food.meat.fish_raw")), ] diff --git a/assets/common/loot_tables/creature/golem.ron b/assets/common/loot_tables/creature/golem.ron index 1caabc59f8..a20e4a076c 100644 --- a/assets/common/loot_tables/creature/golem.ron +++ b/assets/common/loot_tables/creature/golem.ron @@ -1,6 +1,5 @@ [ (1.0, LootTable("common.loot_tables.food.prepared")), - (1.0, LootTable("common.loot_tables.armor.steel")), (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.weapons.tier-2")), (1.0, LootTable("common.loot_tables.weapons.tier-3")), diff --git a/assets/common/loot_tables/creature/humanoid.ron b/assets/common/loot_tables/creature/humanoid.ron index 3547240baf..3364f9c097 100644 --- a/assets/common/loot_tables/creature/humanoid.ron +++ b/assets/common/loot_tables/creature/humanoid.ron @@ -1,7 +1,6 @@ [ (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.swift")), + (1.0, LootTable("common.loot_tables.armor.leather")), (1.0, LootTable("common.loot_tables.armor.cloth")), (1.0, LootTable("common.loot_tables.weapons.starter")), - (1.0, LootTable("common.loot_tables.fallback")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/basilisk.ron b/assets/common/loot_tables/creature/quad_low/basilisk.ron new file mode 100644 index 0000000000..c3c206eb06 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/basilisk.ron @@ -0,0 +1,6 @@ +[ + (1.0, Item("common.items.food.meat.tough_raw")), + (2.0, Item("common.items.crafting_ing.hide.plate")), + (2.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), + +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/carapace.ron b/assets/common/loot_tables/creature/quad_low/carapace.ron new file mode 100644 index 0000000000..25c1784e51 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/carapace.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.food.meat.tough_raw")), + (3.0, Item("common.items.crafting_ing.hide.carapace")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/deadwood.ron b/assets/common/loot_tables/creature/quad_low/deadwood.ron new file mode 100644 index 0000000000..ac925c7b9e --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/deadwood.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.crafting_ing.animal_misc.lively_vine")), + (1.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/default.ron b/assets/common/loot_tables/creature/quad_low/default.ron deleted file mode 100644 index 0dd577cd0f..0000000000 --- a/assets/common/loot_tables/creature/quad_low/default.ron +++ /dev/null @@ -1,5 +0,0 @@ -[ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (1.0, Item("common.items.crafting_ing.leather_scraps")), - (1.0, LootTable("common.loot_tables.fallback")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/fanged.ron b/assets/common/loot_tables/creature/quad_low/fanged.ron new file mode 100644 index 0000000000..cdd0845c50 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/fanged.ron @@ -0,0 +1,5 @@ +[ + (4.0, LootTable("common.loot_tables.creature.quad_low.generic")), + (2.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_low/generic.ron b/assets/common/loot_tables/creature/quad_low/generic.ron new file mode 100644 index 0000000000..dd49230ec2 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/generic.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.food.meat.tough_raw")), + (3.0, Item("common.items.crafting_ing.hide.scales")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/maneater.ron b/assets/common/loot_tables/creature/quad_low/maneater.ron index f1ac20be7e..b7390cdec0 100644 --- a/assets/common/loot_tables/creature/quad_low/maneater.ron +++ b/assets/common/loot_tables/creature/quad_low/maneater.ron @@ -1,5 +1,4 @@ [ - (1.0, Item("common.items.flowers.red")), - (1.0, Item("common.items.crafting_ing.twigs")), + (1.0, Item("common.items.crafting_ing.animal_misc.lively_vine")), (1.0, LootTable("common.loot_tables.food.wild_ingredients")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/venemous.ron b/assets/common/loot_tables/creature/quad_low/venemous.ron new file mode 100644 index 0000000000..cdda647e2e --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/venemous.ron @@ -0,0 +1,5 @@ +[ + (4.0, LootTable("common.loot_tables.creature.quad_low.generic")), + (1.0, Item("common.items.crafting_ing.animal_misc.sharp_fang")), + (2.0, Item("common.items.crafting_ing.animal_misc.venom_sac")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/carapace.ron b/assets/common/loot_tables/creature/quad_medium/carapace.ron new file mode 100644 index 0000000000..432f820da5 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/carapace.ron @@ -0,0 +1,6 @@ +[ + (1.5, Item("common.items.food.meat.beast_small_raw")), + (0.5, Item("common.items.food.meat.beast_large_raw")), + (2.0, Item("common.items.crafting_ing.animal_misc.sharp_fang")), + (3.0, Item("common.items.crafting_ing.hide.carapace")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/catoblepas.ron b/assets/common/loot_tables/creature/quad_medium/catoblepas.ron new file mode 100644 index 0000000000..c1f80bea25 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/catoblepas.ron @@ -0,0 +1,4 @@ +[ + (1.5, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), + (4.0, LootTable("common.loot_tables.creature.quad_medium.generic")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/clawed.ron b/assets/common/loot_tables/creature/quad_medium/clawed.ron new file mode 100644 index 0000000000..3a54656ef6 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/clawed.ron @@ -0,0 +1,4 @@ +[ + (4.0, LootTable("common.loot_tables.creature.quad_medium.generic")), + (2.0, Item("common.items.crafting_ing.animal_misc.claw")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/default.ron b/assets/common/loot_tables/creature/quad_medium/default.ron deleted file mode 100644 index c11cdc4259..0000000000 --- a/assets/common/loot_tables/creature/quad_medium/default.ron +++ /dev/null @@ -1,4 +0,0 @@ -[ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (1.0, Item("common.items.crafting_ing.leather_scraps")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron b/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron new file mode 100644 index 0000000000..74c79cede6 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron @@ -0,0 +1,6 @@ +[ + (1.5, Item("common.items.food.meat.beast_small_raw")), + (0.5, Item("common.items.food.meat.beast_large_raw")), + (2.0, Item("common.items.crafting_ing.animal_misc.large_horn")), + (3.0, Item("common.items.crafting_ing.hide.carapace")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/fanged.ron b/assets/common/loot_tables/creature/quad_medium/fanged.ron new file mode 100644 index 0000000000..6623e7cc4e --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/fanged.ron @@ -0,0 +1,4 @@ +[ + (4.0, LootTable("common.loot_tables.creature.quad_medium.generic")), + (2.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/generic.ron b/assets/common/loot_tables/creature/quad_medium/generic.ron new file mode 100644 index 0000000000..3cf402cc04 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/generic.ron @@ -0,0 +1,5 @@ +[ + (1.5, Item("common.items.food.meat.beast_small_raw")), + (0.5, Item("common.items.food.meat.beast_large_raw")), + (3.0, Item("common.items.crafting_ing.hide.tough_hide")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/gentle.ron b/assets/common/loot_tables/creature/quad_medium/gentle.ron new file mode 100644 index 0000000000..a11ac921f4 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/gentle.ron @@ -0,0 +1,5 @@ +[ + (1.5, Item("common.items.food.meat.beast_small_raw")), + (0.5, Item("common.items.food.meat.beast_large_raw")), + (3.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/ice.ron b/assets/common/loot_tables/creature/quad_medium/ice.ron index ca7b5fde38..4ac8226c7b 100644 --- a/assets/common/loot_tables/creature/quad_medium/ice.ron +++ b/assets/common/loot_tables/creature/quad_medium/ice.ron @@ -1,5 +1,4 @@ [ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (1.0, Item("common.items.crafting_ing.leather_scraps")), - (1.0, Item("common.items.crafting_ing.icy_fang")), + (1.0, Item("common.items.crafting_ing.hide.tough_hide")), + (1.0, Item("common.items.crafting_ing.animal_misc.icy_fang")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/default.ron b/assets/common/loot_tables/creature/quad_small/default.ron deleted file mode 100644 index c11cdc4259..0000000000 --- a/assets/common/loot_tables/creature/quad_small/default.ron +++ /dev/null @@ -1,4 +0,0 @@ -[ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (1.0, Item("common.items.crafting_ing.leather_scraps")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/fur.ron b/assets/common/loot_tables/creature/quad_small/fur.ron new file mode 100644 index 0000000000..90ed478a78 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_small/fur.ron @@ -0,0 +1,5 @@ +[ + (1.0, ItemQuantity("common.items.crafting_ing.animal_misc.fur", 1, 3)), + (0.25, LootTable("common.loot_tables.creature.quad_low.generic")), + +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/generic.ron b/assets/common/loot_tables/creature/quad_small/generic.ron new file mode 100644 index 0000000000..431e082771 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_small/generic.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.crafting_ing.hide.animal_hide")), + (0.25, Item("common.items.food.meat.beast_small_raw")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/mushroom.ron b/assets/common/loot_tables/creature/quad_small/mushroom.ron new file mode 100644 index 0000000000..ab6c680d5f --- /dev/null +++ b/assets/common/loot_tables/creature/quad_small/mushroom.ron @@ -0,0 +1,3 @@ +[ + (1.0, Item("common.items.food.mushroom")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/ooze.ron b/assets/common/loot_tables/creature/quad_small/ooze.ron new file mode 100644 index 0000000000..e086f69311 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_small/ooze.ron @@ -0,0 +1,3 @@ +[ + (1.0, Item("common.items.crafting_ing.animal_misc.viscous_ooze")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/sheep.ron b/assets/common/loot_tables/creature/quad_small/sheep.ron new file mode 100644 index 0000000000..77cbaf3289 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_small/sheep.ron @@ -0,0 +1,4 @@ +[ + (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 2, 5)), + (0.25, Item("common.items.food.meat.beast_small_raw")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/default.ron b/assets/common/loot_tables/creature/theropod/default.ron deleted file mode 100644 index 8b25c8a670..0000000000 --- a/assets/common/loot_tables/creature/theropod/default.ron +++ /dev/null @@ -1,3 +0,0 @@ -[ - (1.0, Item("common.items.crafting_ing.leather_scraps")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/generic.ron b/assets/common/loot_tables/creature/theropod/generic.ron new file mode 100644 index 0000000000..14dbec1175 --- /dev/null +++ b/assets/common/loot_tables/creature/theropod/generic.ron @@ -0,0 +1,3 @@ +[ + (1.0, Item("common.items.crafting_ing.hide.plate")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/horned.ron b/assets/common/loot_tables/creature/theropod/horned.ron new file mode 100644 index 0000000000..d3767b3bc1 --- /dev/null +++ b/assets/common/loot_tables/creature/theropod/horned.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.crafting_ing.hide.rugged_hide")), + (1.0, Item("common.items.crafting_ing.animal_misc.large_horn")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/raptor.ron b/assets/common/loot_tables/creature/theropod/raptor.ron index 0c4925c802..2cd8de953f 100644 --- a/assets/common/loot_tables/creature/theropod/raptor.ron +++ b/assets/common/loot_tables/creature/theropod/raptor.ron @@ -1,4 +1,5 @@ [ - (1.0, Item("common.items.crafting_ing.leather_scraps")), - (1.0, Item("common.items.crafting_ing.raptor_feather")), + (0.5, Item("common.items.food.meat.beast_large_raw")), + (1.0, Item("common.items.crafting_ing.hide.tough_hide")), + (1.0, Item("common.items.crafting_ing.animal_misc.raptor_feather")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/enemy.ron b/assets/common/loot_tables/dungeon/tier-1/enemy.ron index 7493b71f24..1450cef0e2 100644 --- a/assets/common/loot_tables/dungeon/tier-1/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-1/enemy.ron @@ -1,5 +1,6 @@ [ (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.swift")), + (1.0, LootTable("common.loot_tables.armor.leather")), (2.0, LootTable("common.loot_tables.weapons.tier-1")), + (1.5, Item("common.items.crafting_ing.sticky_thread")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-2/enemy.ron b/assets/common/loot_tables/dungeon/tier-2/enemy.ron index 1c45d01caf..65ca40674b 100644 --- a/assets/common/loot_tables/dungeon/tier-2/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-2/enemy.ron @@ -1,5 +1,4 @@ [ (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.plate")), (2.0, LootTable("common.loot_tables.weapons.tier-2")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-3/enemy.ron b/assets/common/loot_tables/dungeon/tier-3/enemy.ron index 0efcda9998..9a6f17240e 100644 --- a/assets/common/loot_tables/dungeon/tier-3/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-3/enemy.ron @@ -1,5 +1,4 @@ [ (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.steel")), (1.0, LootTable("common.loot_tables.weapons.tier-3")), ] diff --git a/assets/common/loot_tables/dungeon/tier-4/enemy.ron b/assets/common/loot_tables/dungeon/tier-4/enemy.ron index 696bef6900..c41fd9819e 100644 --- a/assets/common/loot_tables/dungeon/tier-4/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-4/enemy.ron @@ -1,5 +1,4 @@ [ (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.steel")), (1.0, LootTable("common.loot_tables.weapons.tier-4")), ] diff --git a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron index e51e0c7b7a..81239f6e8d 100644 --- a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron @@ -1,6 +1,4 @@ [ - // armor - (6.0, LootTable("common.loot_tables.armor.steel")), // weapons (3.0, LootTable("common.loot_tables.weapons.tier-4")), // lantern diff --git a/assets/common/loot_tables/dungeon/tier-5/boss.ron b/assets/common/loot_tables/dungeon/tier-5/boss.ron index 93264ea299..382c152ca0 100644 --- a/assets/common/loot_tables/dungeon/tier-5/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-5/boss.ron @@ -2,10 +2,11 @@ (2.0, LootTable("common.loot_tables.creature.biped_large.mindflayer")), // miniboss part // armour - (3.0, LootTable("common.loot_tables.armor.cultist")), (0.25, Item("common.items.armor.misc.back.dungeon_purple")), (0.5, Item("common.items.armor.misc.ring.skull")), // weapons (1.5, LootTable("common.loot_tables.weapons.cultist")), (1.5, LootTable("common.loot_tables.weapons.cave")), + (4.0, ItemQuantity("common.items.crafting_ing.hide.dragon_scale", 2, 7)), + ] diff --git a/assets/common/loot_tables/dungeon/tier-5/enemy.ron b/assets/common/loot_tables/dungeon/tier-5/enemy.ron index 88530ec0c6..168307b1a5 100644 --- a/assets/common/loot_tables/dungeon/tier-5/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-5/enemy.ron @@ -6,7 +6,6 @@ (5.0, Item("common.items.food.cheese")), // Gear (3.0, LootTable("common.loot_tables.weapons.tier-5")), - (2.0, LootTable("common.loot_tables.armor.steel")), (0.25, Item("common.items.armor.misc.neck.plain_1")), (0.5, Item("common.items.armor.misc.ring.gold")), (0.25, Item("common.items.armor.misc.ring.skull")), @@ -15,4 +14,5 @@ (0.001, Item("common.items.armor.misc.back.backpack")), (0.1, Item("common.items.armor.misc.bag.heavy_seabag")), (1.0, LootTable("common.loot_tables.consumable.default")), + (4.0, Item("common.items.crafting_ing.hide.dragon_scale")), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/miniboss.ron b/assets/common/loot_tables/dungeon/tier-5/miniboss.ron index a2a77e7334..91bd8115de 100644 --- a/assets/common/loot_tables/dungeon/tier-5/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-5/miniboss.ron @@ -1,6 +1,5 @@ [ // armor - (3.0, LootTable("common.loot_tables.armor.cultist")), (0.25, Item("common.items.armor.misc.back.dungeon_purple")), (0.5, Item("common.items.armor.misc.ring.skull")), // weapons diff --git a/assets/common/loot_tables/food/wild_ingredients.ron b/assets/common/loot_tables/food/wild_ingredients.ron index 6af4f656da..cd99728eb1 100644 --- a/assets/common/loot_tables/food/wild_ingredients.ron +++ b/assets/common/loot_tables/food/wild_ingredients.ron @@ -1,6 +1,5 @@ [ (1.0, Item("common.items.food.apple")), - (0.3, Item("common.items.food.cheese")), (1.0, Item("common.items.food.coconut")), (1.5, Item("common.items.food.mushroom")), ] diff --git a/assets/common/loot_tables/materials/common.ron b/assets/common/loot_tables/materials/common.ron index ec557fe1b9..e93c108380 100644 --- a/assets/common/loot_tables/materials/common.ron +++ b/assets/common/loot_tables/materials/common.ron @@ -1,6 +1,5 @@ [ (1.0, Item("common.items.crafting_ing.bowl")), (1.0, Item("common.items.crafting_ing.empty_vial")), - (2.0, Item("common.items.crafting_ing.cloth_scraps")), - (1.0, Item("common.items.crafting_ing.leather_scraps")), + (1.0, Item("common.items.crafting_ing.leather.leather_strips")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/materials/gems.ron b/assets/common/loot_tables/materials/gems.ron index ed6df318db..226beed85a 100644 --- a/assets/common/loot_tables/materials/gems.ron +++ b/assets/common/loot_tables/materials/gems.ron @@ -1,8 +1,8 @@ [ - (3.0, Item("common.items.crafting_ing.topaz")), - (3.0, Item("common.items.crafting_ing.amethyst")), - (1.6, Item("common.items.crafting_ing.sapphire")), - (1.2, Item("common.items.crafting_ing.emerald")), - (0.8, Item("common.items.crafting_ing.ruby")), - (0.4, Item("common.items.crafting_ing.diamond")), + (3.0, Item("common.items.mineral.gem.topaz")), + (3.0, Item("common.items.mineral.gem.amethyst")), + (1.6, Item("common.items.mineral.gem.sapphire")), + (1.2, Item("common.items.mineral.gem.emerald")), + (0.8, Item("common.items.mineral.gem.ruby")), + (0.4, Item("common.items.mineral.gem.diamond")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/materials/underground.ron b/assets/common/loot_tables/materials/underground.ron index 2ff78e7df9..9147aa87c2 100644 --- a/assets/common/loot_tables/materials/underground.ron +++ b/assets/common/loot_tables/materials/underground.ron @@ -1,6 +1,6 @@ [ (2.0, Item("common.items.crafting_ing.stones")), - (0.5, Item("common.items.ore.veloritefrag")), - (0.25, Item("common.items.ore.velorite")), + (0.5, Item("common.items.mineral.ore.veloritefrag")), + (0.25, Item("common.items.mineral.ore.velorite")), (0.25, LootTable("common.loot_tables.materials.gems")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest-buried.ron b/assets/common/loot_tables/sprite/chest-buried.ron index 1d6ae13b6f..26af68dc76 100644 --- a/assets/common/loot_tables/sprite/chest-buried.ron +++ b/assets/common/loot_tables/sprite/chest-buried.ron @@ -1,6 +1,5 @@ [ (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), - (1.0, LootTable("common.loot_tables.armor.swift")), - (1.0, LootTable("common.loot_tables.fallback")), + (1.0, LootTable("common.loot_tables.armor.leather")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest.ron b/assets/common/loot_tables/sprite/chest.ron index 98f99d2ec4..4ed06d22c4 100644 --- a/assets/common/loot_tables/sprite/chest.ron +++ b/assets/common/loot_tables/sprite/chest.ron @@ -2,7 +2,5 @@ (1.0, LootTable("common.loot_tables.weapons.tier-0")), (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), - (1.0, LootTable("common.loot_tables.armor.swift")), - (0.1, LootTable("common.loot_tables.armor.plate")), - (1.0, LootTable("common.loot_tables.fallback")), + (1.0, LootTable("common.loot_tables.armor.leather")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/mud.ron b/assets/common/loot_tables/sprite/mud.ron index 74779a5e51..73389a2671 100644 --- a/assets/common/loot_tables/sprite/mud.ron +++ b/assets/common/loot_tables/sprite/mud.ron @@ -2,5 +2,4 @@ (1.0, LootTable("common.loot_tables.materials.common")), (1.0, LootTable("common.loot_tables.weapons.tier-0")), (1.0, LootTable("common.loot_tables.materials.underground")), - (1.0, LootTable("common.loot_tables.fallback")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/trading.ron b/assets/common/loot_tables/trading.ron index 17b7bb0a68..6a487c808a 100644 --- a/assets/common/loot_tables/trading.ron +++ b/assets/common/loot_tables/trading.ron @@ -1,5 +1,20 @@ // Loot table that exists purely for price rationalisation [ (1.0, Item("common.items.crafting_ing.honey")), - (0.5, Item("common.items.crafting_ing.icy_fang")), + (0.2, Item("common.items.mineral.ore.bloodstone")), + (1.0, Item("common.items.mineral.ore.coal")), + (0.4, Item("common.items.mineral.ore.cobalt")), + (2.5, Item("common.items.mineral.ore.copper")), + (0.05, Item("common.items.mineral.ore.gold")), + (1.2, Item("common.items.mineral.ore.iron")), + (0.07, Item("common.items.mineral.ore.silver")), + (2.5, Item("common.items.mineral.ore.tin")), + (1.2, Item("common.items.mineral.ore.velorite")), + (0.6, Item("common.items.mineral.ore.veloritefrag")), + (0.8, Item("common.items.mineral.gem.amethyst")), + (0.2, Item("common.items.mineral.gem.diamond")), + (0.6, Item("common.items.mineral.gem.emerald")), + (0.4, Item("common.items.mineral.gem.ruby")), + (0.4, Item("common.items.mineral.gem.sapphire")), + (0.9, Item("common.items.mineral.gem.topaz")), ] diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index 9fc450422e..53fc1f0567 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -1,6 +1,6 @@ // Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_secs is most sensitive to this) ({ - "common.items.crafting_ing.bloodsteel_ingot": ( + "common.items.mineral.ingot.bloodsteel": ( equip_time_secs: 1.0, power: 1.75, poise_strength: 1.75, @@ -8,7 +8,7 @@ crit_chance: 1.75, crit_mult: 1.75, ), - "common.items.crafting_ing.bronze_ingot": ( + "common.items.mineral.ingot.bronze": ( equip_time_secs: 1.0, power: 0.75, poise_strength: 0.75, @@ -16,7 +16,7 @@ crit_chance: 0.75, crit_mult: 0.75, ), - "common.items.crafting_ing.cobalt_ingot": ( + "common.items.mineral.ingot.cobalt": ( equip_time_secs: 1.0, power: 1.5, poise_strength: 1.5, @@ -24,7 +24,7 @@ crit_chance: 1.5, crit_mult: 1.5, ), - "common.items.crafting_ing.copper_ingot": ( + "common.items.mineral.ingot.copper": ( equip_time_secs: 1.0, power: 0.4, poise_strength: 0.4, @@ -32,7 +32,7 @@ crit_chance: 0.4, crit_mult: 0.4, ), - "common.items.crafting_ing.iron_ingot": ( + "common.items.mineral.ingot.iron": ( equip_time_secs: 1.0, power: 1.0, poise_strength: 1.0, @@ -40,7 +40,7 @@ crit_chance: 1.0, crit_mult: 1.0, ), - "common.items.crafting_ing.steel_ingot": ( + "common.items.mineral.ingot.steel": ( equip_time_secs: 1.0, power: 1.25, poise_strength: 1.25, @@ -48,7 +48,7 @@ crit_chance: 1.25, crit_mult: 1.25, ), - "common.items.crafting_ing.tin_ingot": ( + "common.items.mineral.ingot.tin": ( equip_time_secs: 1.0, power: 0.25, poise_strength: 0.25, diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 5b1b11f81b..f68e7960bd 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -19,16 +19,15 @@ "sewing_set": ( output: ("common.items.crafting_tools.sewing_set", 1), inputs: [ - (Item("common.items.crafting_ing.leather_scraps"), 2), - (Item("common.items.crafting_ing.twigs"), 4), - (Item("common.items.crafting_ing.stones"), 2), + (Item("common.items.crafting_ing.cloth.linen"), 1), + (Item("common.items.mineral.ingot.tin"), 1), ], craft_sprite: Some(CraftingBench), ), "velorite_frag": ( - output: ("common.items.ore.veloritefrag", 2), + output: ("common.items.mineral.ore.veloritefrag", 2), inputs: [ - (Item("common.items.ore.velorite"), 1), + (Item("common.items.mineral.ore.velorite"), 1), (Item("common.items.tool.craftsman_hammer"), 0), ], craft_sprite: Some(Anvil), @@ -46,15 +45,15 @@ output: ("common.items.consumable.potion_med", 1), inputs: [ (Item("common.items.consumable.potion_minor"), 2), - (Item("common.items.ore.veloritefrag"), 4), + (Item("common.items.mineral.ore.veloritefrag"), 4), ], craft_sprite: Some(Cauldron), ), "collar_basic": ( output: ("common.items.utility.collar", 1), inputs: [ - (Item("common.items.crafting_ing.leather_scraps"), 5), - (Item("common.items.crafting_ing.ruby"), 1), + (Item("common.items.crafting_ing.leather.leather_strips"), 5), + (Item("common.items.mineral.gem.ruby"), 1), ], ), "bomb_coconut": ( @@ -62,7 +61,7 @@ inputs: [ (Item("common.items.crafting_ing.stones"), 10), (Item("common.items.food.coconut"), 2), - (Item("common.items.ore.veloritefrag"), 2), + (Item("common.items.mineral.ore.veloritefrag"), 2), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -73,7 +72,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -84,7 +83,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -95,7 +94,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -106,7 +105,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -117,7 +116,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -128,7 +127,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -143,12 +142,194 @@ ], craft_sprite: Some(CookingPot), ), + "fish_cooked": ( + output: ("common.items.food.meat.fish_cooked", 1), + inputs: [ + (Item("common.items.food.meat.fish_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "bird_cooked": ( + output: ("common.items.food.meat.bird_cooked", 1), + inputs: [ + (Item("common.items.food.meat.bird_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "bird_large_cooked": ( + output: ("common.items.food.meat.bird_large_cooked", 1), + inputs: [ + (Item("common.items.food.meat.bird_large_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "beast_small_cooked": ( + output: ("common.items.food.meat.beast_small_cooked", 1), + inputs: [ + (Item("common.items.food.meat.beast_small_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "beast_large_cooked": ( + output: ("common.items.food.meat.beast_large_cooked", 1), + inputs: [ + (Item("common.items.food.meat.beast_large_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "tough_cooked": ( + output: ("common.items.food.meat.tough_cooked", 1), + inputs: [ + (Item("common.items.food.meat.tough_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "simple leather": ( + output: ("common.items.crafting_ing.leather.simple_leather", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.animal_hide"), 1), + ], + craft_sprite: Some(TanningRack), + ), + "thick leather": ( + output: ("common.items.crafting_ing.leather.thick_leather", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.tough_hide"), 1), + ], + craft_sprite: Some(TanningRack), + ), + "rigid leather": ( + output: ("common.items.crafting_ing.leather.rigid_leather", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.rugged_hide"), 1), + ], + craft_sprite: Some(TanningRack), + ), + "gold ingot": ( + output: ("common.items.mineral.ingot.gold", 1), + inputs: [ + (Item("common.items.mineral.ore.gold"), 1), + ], + craft_sprite: Some(Forge), + ), + "silver ingot": ( + output: ("common.items.mineral.ingot.silver", 1), + inputs: [ + (Item("common.items.mineral.ore.silver"), 1), + ], + craft_sprite: Some(Forge), + ), + + "iron ingot": ( + output: ("common.items.mineral.ingot.iron", 1), + inputs: [ + (Item("common.items.mineral.ore.iron"), 1), + ], + craft_sprite: Some(Forge), + ), + "cobalt ingot": ( + output: ("common.items.mineral.ingot.cobalt", 1), + inputs: [ + (Item("common.items.mineral.ore.cobalt"), 1), + ], + craft_sprite: Some(Forge), + ), + "tin ingot": ( + output: ("common.items.mineral.ingot.tin", 2), + inputs: [ + (Item("common.items.mineral.ore.tin"), 1), + ], + craft_sprite: Some(Forge), + ), + "orichalcum ingot": ( + output: ("common.items.mineral.ingot.orichalcum", 2), + inputs: [ + (Item("common.items.mineral.ore.gold"), 1), + (Item("common.items.mineral.ore.silver"), 1), + ], + craft_sprite: Some(Forge), + ), + "copper ingot": ( + output: ("common.items.mineral.ingot.copper", 2), + inputs: [ + (Item("common.items.mineral.ore.copper"), 1), + ], + craft_sprite: Some(Forge), + ), + "bloodsteel ingot": ( + output: ("common.items.mineral.ingot.bloodsteel", 2), + inputs: [ + (Item("common.items.mineral.ore.bloodstone"), 1), + (Item("common.items.mineral.ore.iron"), 1), + (Item("common.items.mineral.ore.coal"), 1), + ], + craft_sprite: Some(Forge), + ), + "steel ingot": ( + output: ("common.items.mineral.ingot.steel", 1), + inputs: [ + (Item("common.items.mineral.ore.iron"), 1), + (Item("common.items.mineral.ore.coal"), 1), + ], + craft_sprite: Some(Forge), + ), + "bronze ingot": ( + output: ("common.items.mineral.ingot.bronze", 2), + inputs: [ + (Item("common.items.mineral.ingot.copper"), 1), + (Item("common.items.mineral.ingot.tin"), 1), + ], + craft_sprite: Some(Forge), + ), + "cotton": ( + output: ("common.items.crafting_ing.cloth.cotton", 1), + inputs: [ + (Item("common.items.crafting_ing.cotton_boll"), 1), + ], + craft_sprite: Some(SpinningWheel), + ), + "linen": ( + output: ("common.items.crafting_ing.cloth.linen", 1), + inputs: [ + (Item("common.items.flowers.wild_flax"), 1), + ], + craft_sprite: Some(SpinningWheel), + ), + "silk": ( + output: ("common.items.crafting_ing.cloth.silk", 1), + inputs: [ + (Item("common.items.crafting_ing.sticky_thread"), 1), + ], + craft_sprite: Some(SpinningWheel), + ), + "lifecloth": ( + output: ("common.items.crafting_ing.cloth.lifecloth", 1), + inputs: [ + (Item("common.items.crafting_ing.animal_misc.lively_vine"), 1), + (Item("common.items.crafting_ing.cloth.cotton"), 1), + ], + craft_sprite: Some(SpinningWheel), + ), + "moonweave": ( + output: ("common.items.crafting_ing.cloth.moonweave", 1), + inputs: [ + (Item("common.items.flowers.moonbell"), 1), + ], + craft_sprite: Some(SpinningWheel), + ), + "sunsilk": ( + output: ("common.items.crafting_ing.cloth.sunsilk", 1), + inputs: [ + (Item("common.items.flowers.pyrebloom"), 1), + ], + craft_sprite: Some(SpinningWheel), + ), "salad_plain": ( output: ("common.items.food.plainsalad", 1), inputs: [ (Item("common.items.food.lettuce"), 1), (Item("common.items.crafting_ing.bowl"), 1), - ], + ], ), "salad_tomato": ( output: ("common.items.food.tomatosalad", 1), @@ -162,7 +343,7 @@ output: ("common.items.food.apple_stick", 1), inputs: [ (Item("common.items.crafting_ing.twigs"), 2), - (Item("common.items.food.apple"), 2) + (Item("common.items.food.apple"), 2), ], ), "mushroom_stick": ( @@ -176,7 +357,7 @@ output: ("common.items.food.sunflower_icetea", 4), inputs: [ (Item("common.items.crafting_ing.empty_vial"), 1), - (Item("common.items.crafting_ing.icy_fang"), 1), + (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1), (Item("common.items.flowers.sunflower"), 4), (Item("common.items.crafting_ing.honey"), 1), ], @@ -186,8 +367,8 @@ output: ("common.items.glider.glider_basic_white", 1), inputs: [ (Item("common.items.crafting_ing.twigs"), 5), - (Item("common.items.crafting_ing.leather_scraps"), 5), - (Item("common.items.crafting_ing.cloth_scraps"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 5), + (Item("common.items.crafting_ing.cloth.linen"), 10), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -197,8 +378,8 @@ output: ("common.items.glider.glider_basic_red", 1), inputs: [ (Item("common.items.crafting_ing.twigs"), 5), - (Item("common.items.crafting_ing.cloth_scraps_red"), 10), - (Item("common.items.crafting_ing.leather_scraps"), 5), + (Item("common.items.crafting_ing.cloth.linen_red"), 10), + (Item("common.items.crafting_ing.leather.thick_leather"), 4), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -208,9 +389,9 @@ output: ("common.items.glider.glider_leaves", 1), inputs: [ (Item("common.items.crafting_ing.twigs"), 5), - (Item("common.items.crafting_ing.leather_scraps"), 5), - (Item("common.items.crafting_ing.cloth_scraps"), 5), - (Item("common.items.crafting_ing.emerald"), 1), + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + (Item("common.items.crafting_ing.cloth.linen"), 5), + (Item("common.items.mineral.gem.emerald"), 1), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -219,11 +400,11 @@ "Sand Raptor Wings": ( output: ("common.items.glider.glider_sandraptor", 1), inputs: [ - (Item("common.items.crafting_ing.raptor_feather"), 6), + (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.twigs"), 5), - (Item("common.items.crafting_ing.leather_scraps"), 5), - (Item("common.items.crafting_ing.cloth_scraps"), 5), - (Item("common.items.crafting_ing.ruby"), 1), + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + (Item("common.items.crafting_ing.cloth.linen"), 5), + (Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -232,12 +413,12 @@ "Snow Raptor Wings": ( output: ("common.items.glider.glider_snowraptor", 1), inputs: [ - (Item("common.items.crafting_ing.raptor_feather"), 6), + (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.twigs"), 5), - (Item("common.items.crafting_ing.leather_scraps"), 5), - (Item("common.items.crafting_ing.cloth_scraps"), 5), - (Item("common.items.crafting_ing.icy_fang"), 1), - (Item("common.items.crafting_ing.ruby"), 1), + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + (Item("common.items.crafting_ing.cloth.linen"), 5), + (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1), + (Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -246,11 +427,11 @@ "Wood Raptor Wings": ( output: ("common.items.glider.glider_woodraptor", 1), inputs: [ - (Item("common.items.crafting_ing.raptor_feather"), 6), + (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.twigs"), 15), - (Item("common.items.crafting_ing.leather_scraps"), 5), - (Item("common.items.crafting_ing.cloth_scraps"), 5), - (Item("common.items.crafting_ing.ruby"), 1), + (Item("common.items.crafting_ing.leather.leather_strips"), 5), + (Item("common.items.crafting_ing.cloth.linen"), 5), + (Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -260,15 +441,15 @@ output: ("common.items.weapons.sceptre.loops0", 1), inputs: [ (Item("common.items.crafting_ing.twigs"), 20), - (Item("common.items.ore.veloritefrag"), 8), - (Item("common.items.crafting_ing.ruby"), 4), + (Item("common.items.mineral.ore.veloritefrag"), 8), + (Item("common.items.mineral.gem.ruby"), 4), (Item("common.items.tool.craftsman_hammer"), 0), ], ), "Hunting Bow": ( output: ("common.items.weapons.bow.wood-2", 1), inputs: [ - (Item("common.items.crafting_ing.leather_scraps"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 8), (Item("common.items.crafting_ing.twigs"), 6), (Item("common.items.crafting_ing.stones"), 0), ], @@ -277,62 +458,1160 @@ "Forest Spirit": ( output: ("common.items.weapons.sword.wood-2", 1), inputs: [ - (Item("common.items.crafting_ing.leather_scraps"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), (Item("common.items.crafting_ing.twigs"), 10), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_ing.stones"), 0), ], craft_sprite: Some(Anvil), ), - "adventure back": ( - output: ("common.items.armor.agile.back", 1), - inputs: [(Item("common.items.crafting_ing.leather_scraps"), 4)], + "Burnt Drumstick": ( + output: ("common.items.weapons.hammer.burnt_drumstick", 1), + inputs: [ + (Item("common.items.food.meat.bird_large_cooked"), 1), + ], + craft_sprite: Some(CookingPot), + ), +//ARMOR/HIDE/RAWHIDE + "rawhide back": ( + output: ("common.items.armor.hide.rawhide.back", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.simple_leather"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], craft_sprite: Some(CraftingBench), ), - "adventure belt": ( - output: ("common.items.armor.agile.belt", 1), - inputs: [(Item("common.items.crafting_ing.leather_scraps"), 2)], + "rawhide belt": ( + output: ("common.items.armor.hide.rawhide.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.simple_leather"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], craft_sprite: Some(CraftingBench), ), - "adventure chest": ( - output: ("common.items.armor.agile.chest", 1), - inputs: [(Item("common.items.crafting_ing.leather_scraps"), 12)], + "rawhide chest": ( + output: ("common.items.armor.hide.rawhide.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.simple_leather"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], craft_sprite: Some(CraftingBench), ), - "adventure feet": ( - output: ("common.items.armor.agile.foot", 1), - inputs: [(Item("common.items.crafting_ing.leather_scraps"), 3)], + "rawhide feet": ( + output: ("common.items.armor.hide.rawhide.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.simple_leather"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], craft_sprite: Some(CraftingBench), ), - "adventure hands": ( - output: ("common.items.armor.agile.hand", 1), - inputs: [(Item("common.items.crafting_ing.leather_scraps"), 4)], + "rawhide hands": ( + output: ("common.items.armor.hide.rawhide.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.simple_leather"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], craft_sprite: Some(CraftingBench), ), - "adventure pants": ( - output: ("common.items.armor.agile.pants", 1), - inputs: [(Item("common.items.crafting_ing.leather_scraps"), 8)], + "rawhide pants": ( + output: ("common.items.armor.hide.rawhide.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.simple_leather"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], craft_sprite: Some(CraftingBench), ), - "adventure shoulder": ( - output: ("common.items.armor.agile.shoulder", 1), - inputs: [(Item("common.items.crafting_ing.leather_scraps"), 12)], + "rawhide shoulder": ( + output: ("common.items.armor.hide.rawhide.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.simple_leather"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], craft_sprite: Some(CraftingBench), ), +//ARMOR/HIDE/LEATHER + "leather back": ( + output: ("common.items.armor.hide.leather.back", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "leather belt": ( + output: ("common.items.armor.hide.leather.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "leather chest": ( + output: ("common.items.armor.hide.leather.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "leather feet": ( + output: ("common.items.armor.hide.leather.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "leather hands": ( + output: ("common.items.armor.hide.leather.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "leather pants": ( + output: ("common.items.armor.hide.leather.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "leather shoulder": ( + output: ("common.items.armor.hide.leather.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/HIDE/SCALE + "scale back": ( + output: ("common.items.armor.hide.scale.back", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "scale belt": ( + output: ("common.items.armor.hide.scale.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "scale chest": ( + output: ("common.items.armor.hide.scale.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "scale feet": ( + output: ("common.items.armor.hide.scale.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "scale hands": ( + output: ("common.items.armor.hide.scale.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "scale pants": ( + output: ("common.items.armor.hide.scale.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "scale shoulder": ( + output: ("common.items.armor.hide.scale.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/HIDE/CARAPACE + "carapace back": ( + output: ("common.items.armor.hide.carapace.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 1), + (Item("common.items.crafting_ing.hide.carapace"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace belt": ( + output: ("common.items.armor.hide.carapace.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 1), + (Item("common.items.crafting_ing.hide.carapace"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace chest": ( + output: ("common.items.armor.hide.carapace.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 2), + (Item("common.items.crafting_ing.hide.carapace"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace feet": ( + output: ("common.items.armor.hide.carapace.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 1), + (Item("common.items.crafting_ing.hide.carapace"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace hands": ( + output: ("common.items.armor.hide.carapace.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 1), + (Item("common.items.crafting_ing.hide.carapace"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace pants": ( + output: ("common.items.armor.hide.carapace.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 1), + (Item("common.items.crafting_ing.hide.carapace"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace shoulder": ( + output: ("common.items.armor.hide.carapace.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 1), + (Item("common.items.crafting_ing.hide.carapace"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/HIDE/PRIMAL + "primal back": ( + output: ("common.items.armor.hide.primal.back", 1), + inputs: [ + (Item("common.items.crafting_ing.animal_misc.large_horn"), 1), + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), + (Item("common.items.crafting_ing.hide.plate"), 3), + (Item("common.items.crafting_ing.leather.rigid_leather"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "primal belt": ( + output: ("common.items.armor.hide.primal.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), + (Item("common.items.crafting_ing.hide.plate"), 2), + (Item("common.items.crafting_ing.leather.rigid_leather"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "primal chest": ( + output: ("common.items.armor.hide.primal.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.animal_misc.large_horn"), 1), + (Item("common.items.crafting_ing.cloth.lifecloth"), 2), + (Item("common.items.crafting_ing.hide.plate"), 10), + (Item("common.items.crafting_ing.leather.rigid_leather"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "primal feet": ( + output: ("common.items.armor.hide.primal.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), + (Item("common.items.crafting_ing.hide.plate"), 3), + (Item("common.items.crafting_ing.leather.rigid_leather"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "primal hands": ( + output: ("common.items.armor.hide.primal.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), + (Item("common.items.crafting_ing.hide.plate"), 3), + (Item("common.items.crafting_ing.leather.rigid_leather"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "primal pants": ( + output: ("common.items.armor.hide.primal.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.animal_misc.large_horn"), 1), + (Item("common.items.crafting_ing.cloth.lifecloth"), 2), + (Item("common.items.crafting_ing.hide.plate"), 8), + (Item("common.items.crafting_ing.leather.rigid_leather"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "primal shoulder": ( + output: ("common.items.armor.hide.primal.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.animal_misc.large_horn"), 2), + (Item("common.items.crafting_ing.cloth.lifecloth"), 2), + (Item("common.items.crafting_ing.hide.plate"), 8), + (Item("common.items.crafting_ing.leather.rigid_leather"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/HIDE/DRAGONSCALE + "dragonscale back": ( + output: ("common.items.armor.hide.dragonscale.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 2), + (Item("common.items.crafting_ing.hide.dragon_scale"), 3), + (Item("common.items.crafting_ing.leather.rigid_leather"), 1), + (Item("common.items.crafting_ing.hide.scales"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale belt": ( + output: ("common.items.armor.hide.dragonscale.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 2), + (Item("common.items.crafting_ing.hide.dragon_scale"), 2), + (Item("common.items.crafting_ing.hide.scales"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale chest": ( + output: ("common.items.armor.hide.dragonscale.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 3), + (Item("common.items.crafting_ing.hide.dragon_scale"), 10), + (Item("common.items.crafting_ing.leather.rigid_leather"), 2), + (Item("common.items.crafting_ing.hide.scales"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale feet": ( + output: ("common.items.armor.hide.dragonscale.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 2), + (Item("common.items.crafting_ing.hide.dragon_scale"), 3), + (Item("common.items.crafting_ing.hide.scales"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale hands": ( + output: ("common.items.armor.hide.dragonscale.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 2), + (Item("common.items.crafting_ing.hide.dragon_scale"), 3), + (Item("common.items.crafting_ing.hide.scales"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale pants": ( + output: ("common.items.armor.hide.dragonscale.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 3), + (Item("common.items.crafting_ing.hide.dragon_scale"), 8), + (Item("common.items.crafting_ing.leather.rigid_leather"), 1), + (Item("common.items.crafting_ing.hide.scales"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale shoulder": ( + output: ("common.items.armor.hide.dragonscale.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 3), + (Item("common.items.crafting_ing.hide.dragon_scale"), 8), + (Item("common.items.crafting_ing.leather.rigid_leather"), 2), + (Item("common.items.crafting_ing.hide.scales"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/CLOTH/LINEN + "linen back": ( + output: ("common.items.armor.cloth.linen.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "linen belt": ( + output: ("common.items.armor.cloth.linen.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "linen chest": ( + output: ("common.items.armor.cloth.linen.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 10), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "linen feet": ( + output: ("common.items.armor.cloth.linen.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "linen hands": ( + output: ("common.items.armor.cloth.linen.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "linen pants": ( + output: ("common.items.armor.cloth.linen.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 8), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "linen shoulder": ( + output: ("common.items.armor.cloth.linen.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 8), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), +//ARMOR/CLOTH/WOOLEN + "woolen back": ( + output: ("common.items.armor.cloth.woolen.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 3), + (Item("common.items.crafting_ing.cloth.cotton"), 2), + (Item("common.items.crafting_ing.animal_misc.fur"), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "woolen belt": ( + output: ("common.items.armor.cloth.woolen.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 2), + (Item("common.items.crafting_ing.cloth.cotton"), 2), + (Item("common.items.crafting_ing.animal_misc.fur"), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "woolen chest": ( + output: ("common.items.armor.cloth.woolen.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 10), + (Item("common.items.crafting_ing.cloth.cotton"), 2), + (Item("common.items.crafting_ing.animal_misc.fur"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "woolen feet": ( + output: ("common.items.armor.cloth.woolen.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 3), + (Item("common.items.crafting_ing.cloth.cotton"), 1), + (Item("common.items.crafting_ing.animal_misc.fur"), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "woolen hands": ( + output: ("common.items.armor.cloth.woolen.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 3), + (Item("common.items.crafting_ing.cloth.cotton"), 1), + (Item("common.items.crafting_ing.animal_misc.fur"), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "woolen pants": ( + output: ("common.items.armor.cloth.woolen.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 8), + (Item("common.items.crafting_ing.cloth.cotton"), 2), + (Item("common.items.crafting_ing.animal_misc.fur"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "woolen shoulder": ( + output: ("common.items.armor.cloth.woolen.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 8), + (Item("common.items.crafting_ing.cloth.cotton"), 2), + (Item("common.items.crafting_ing.animal_misc.fur"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), +//ARMOR/CLOTH/SILKEN + "silken back": ( + output: ("common.items.armor.cloth.silken.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "silken belt": ( + output: ("common.items.armor.cloth.silken.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "silken chest": ( + output: ("common.items.armor.cloth.silken.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 10), + (Item("common.items.mineral.gem.amethyst"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "silken feet": ( + output: ("common.items.armor.cloth.silken.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "silken hands": ( + output: ("common.items.armor.cloth.silken.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "silken pants": ( + output: ("common.items.armor.cloth.silken.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 8), + (Item("common.items.mineral.gem.amethyst"), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "silken shoulder": ( + output: ("common.items.armor.cloth.silken.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 8), + (Item("common.items.mineral.gem.amethyst"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), +//ARMOR/CLOTH/DRUID + "druid back": ( + output: ("common.items.armor.cloth.druid.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 3), + (Item("common.items.mineral.ore.veloritefrag"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "druid belt": ( + output: ("common.items.armor.cloth.druid.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 2), + (Item("common.items.mineral.ore.veloritefrag"), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "druid chest": ( + output: ("common.items.armor.cloth.druid.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 10), + (Item("common.items.mineral.ore.veloritefrag"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "druid feet": ( + output: ("common.items.armor.cloth.druid.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 3), + (Item("common.items.mineral.ore.veloritefrag"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "druid hands": ( + output: ("common.items.armor.cloth.druid.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 3), + (Item("common.items.mineral.ore.veloritefrag"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "druid pants": ( + output: ("common.items.armor.cloth.druid.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 8), + (Item("common.items.mineral.ore.veloritefrag"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "druid shoulder": ( + output: ("common.items.armor.cloth.druid.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 8), + (Item("common.items.mineral.ore.veloritefrag"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), +//ARMOR/CLOTH/MOONWEAVE + "moonweave back": ( + output: ("common.items.armor.cloth.moonweave.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 3), + (Item("common.items.crafting_ing.hide.leather_troll"), 3), + (Item("common.items.mineral.ingot.cobalt"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "moonweave belt": ( + output: ("common.items.armor.cloth.moonweave.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 2), + (Item("common.items.crafting_ing.hide.leather_troll"), 2), + (Item("common.items.mineral.ingot.cobalt"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "moonweave chest": ( + output: ("common.items.armor.cloth.moonweave.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 10), + (Item("common.items.crafting_ing.hide.leather_troll"), 5), + (Item("common.items.mineral.ingot.cobalt"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "moonweave feet": ( + output: ("common.items.armor.cloth.moonweave.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 3), + (Item("common.items.crafting_ing.hide.leather_troll"), 2), + (Item("common.items.mineral.ingot.cobalt"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "moonweave hands": ( + output: ("common.items.armor.cloth.moonweave.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 3), + (Item("common.items.crafting_ing.hide.leather_troll"), 2), + (Item("common.items.mineral.ingot.cobalt"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "moonweave pants": ( + output: ("common.items.armor.cloth.moonweave.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 8), + (Item("common.items.crafting_ing.hide.leather_troll"), 3), + (Item("common.items.mineral.ingot.cobalt"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "moonweave shoulder": ( + output: ("common.items.armor.cloth.moonweave.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 8), + (Item("common.items.crafting_ing.hide.leather_troll"), 3), + (Item("common.items.mineral.ingot.cobalt"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), +//ARMOR/CLOTH/SUNSILK + "sunsilk back": ( + output: ("common.items.armor.cloth.sunsilk.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 3), + (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "sunsilk belt": ( + output: ("common.items.armor.cloth.sunsilk.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 2), + (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "sunsilk chest": ( + output: ("common.items.armor.cloth.sunsilk.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 10), + (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 4), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "sunsilk feet": ( + output: ("common.items.armor.cloth.sunsilk.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 3), + (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "sunsilk hands": ( + output: ("common.items.armor.cloth.sunsilk.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 3), + (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "sunsilk pants": ( + output: ("common.items.armor.cloth.sunsilk.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 8), + (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), + "sunsilk shoulder": ( + output: ("common.items.armor.cloth.sunsilk.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 8), + (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(Loom), + ), +//ARMOR/MAIL/BRONZE + "bronze back": ( + output: ("common.items.armor.mail.bronze.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze belt": ( + output: ("common.items.armor.mail.bronze.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze chest": ( + output: ("common.items.armor.mail.bronze.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze feet": ( + output: ("common.items.armor.mail.bronze.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze hands": ( + output: ("common.items.armor.mail.bronze.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze pants": ( + output: ("common.items.armor.mail.bronze.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze shoulder": ( + output: ("common.items.armor.mail.bronze.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), + //ARMOR/MAIL/IRON + "iron back": ( + output: ("common.items.armor.mail.iron.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "iron belt": ( + output: ("common.items.armor.mail.iron.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "iron chest": ( + output: ("common.items.armor.mail.iron.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "iron feet": ( + output: ("common.items.armor.mail.iron.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "iron hands": ( + output: ("common.items.armor.mail.iron.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "iron pants": ( + output: ("common.items.armor.mail.iron.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "iron shoulder": ( + output: ("common.items.armor.mail.iron.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/STEEL + "steel back": ( + output: ("common.items.armor.mail.steel.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 3), + (Item("common.items.crafting_ing.cloth.linen"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "steel belt": ( + output: ("common.items.armor.mail.steel.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 2), + (Item("common.items.crafting_ing.leather.thick_leather"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "steel chest": ( + output: ("common.items.armor.mail.steel.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 10), + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "steel feet": ( + output: ("common.items.armor.mail.steel.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 3), + (Item("common.items.crafting_ing.leather.thick_leather"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "steel hands": ( + output: ("common.items.armor.mail.steel.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 3), + (Item("common.items.crafting_ing.leather.thick_leather"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "steel pants": ( + output: ("common.items.armor.mail.steel.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 8), + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "steel shoulder": ( + output: ("common.items.armor.mail.steel.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 8), + (Item("common.items.crafting_ing.leather.thick_leather"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/COBALT + "cobalt back": ( + output: ("common.items.armor.mail.cobalt.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 3), + (Item("common.items.crafting_ing.cloth.silk"), 4), + (Item("common.items.mineral.gem.sapphire"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt belt": ( + output: ("common.items.armor.mail.cobalt.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 2), + (Item("common.items.crafting_ing.cloth.silk"), 2), + (Item("common.items.mineral.gem.sapphire"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt chest": ( + output: ("common.items.armor.mail.cobalt.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 10), + (Item("common.items.crafting_ing.cloth.silk"), 3), + (Item("common.items.mineral.gem.sapphire"), 3), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt feet": ( + output: ("common.items.armor.mail.cobalt.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 3), + (Item("common.items.crafting_ing.cloth.silk"), 3), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt hands": ( + output: ("common.items.armor.mail.cobalt.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 3), + (Item("common.items.crafting_ing.cloth.silk"), 3), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt pants": ( + output: ("common.items.armor.mail.cobalt.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 8), + (Item("common.items.crafting_ing.cloth.silk"), 3), + (Item("common.items.mineral.gem.sapphire"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt shoulder": ( + output: ("common.items.armor.mail.cobalt.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 8), + (Item("common.items.crafting_ing.cloth.silk"), 3), + (Item("common.items.mineral.gem.sapphire"), 2), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/BLOODSTEEL + "bloodsteel back": ( + output: ("common.items.armor.mail.bloodsteel.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 3), + (Item("common.items.crafting_ing.hide.carapace"), 1), + (Item("common.items.crafting_ing.cloth.lifecloth"), 3), + (Item("common.items.mineral.gem.ruby"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel belt": ( + output: ("common.items.armor.mail.bloodsteel.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 2), + (Item("common.items.crafting_ing.hide.carapace"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel chest": ( + output: ("common.items.armor.mail.bloodsteel.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 10), + (Item("common.items.crafting_ing.hide.carapace"), 4), + (Item("common.items.mineral.gem.diamond"), 2), + (Item("common.items.mineral.gem.ruby"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel feet": ( + output: ("common.items.armor.mail.bloodsteel.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 3), + (Item("common.items.crafting_ing.hide.carapace"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel hands": ( + output: ("common.items.armor.mail.bloodsteel.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 3), + (Item("common.items.crafting_ing.hide.carapace"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel pants": ( + output: ("common.items.armor.mail.bloodsteel.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 8), + (Item("common.items.crafting_ing.hide.carapace"), 3), + (Item("common.items.mineral.gem.ruby"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel shoulder": ( + output: ("common.items.armor.mail.bloodsteel.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 8), + (Item("common.items.crafting_ing.hide.carapace"), 4), + (Item("common.items.mineral.gem.ruby"), 2), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/ORICHALCUM + "orichalcum back": ( + output: ("common.items.armor.mail.orichalcum.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 3), + (Item("common.items.crafting_ing.hide.plate"), 3), + (Item("common.items.mineral.gem.diamond"), 2), + (Item("common.items.mineral.gem.sapphire"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum belt": ( + output: ("common.items.armor.mail.orichalcum.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 2), + (Item("common.items.crafting_ing.hide.plate"), 2), + (Item("common.items.mineral.gem.diamond"), 2), + (Item("common.items.mineral.gem.sapphire"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum chest": ( + output: ("common.items.armor.mail.orichalcum.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 10), + (Item("common.items.mineral.ingot.cobalt"), 2), + (Item("common.items.crafting_ing.hide.plate"), 4), + (Item("common.items.mineral.gem.diamond"), 3), + (Item("common.items.mineral.gem.sapphire"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum feet": ( + output: ("common.items.armor.mail.orichalcum.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 3), + (Item("common.items.crafting_ing.hide.plate"), 2), + (Item("common.items.mineral.gem.diamond"), 1), + (Item("common.items.mineral.gem.sapphire"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum hands": ( + output: ("common.items.armor.mail.orichalcum.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 3), + (Item("common.items.crafting_ing.hide.plate"), 2), + (Item("common.items.mineral.gem.diamond"), 1), + (Item("common.items.mineral.gem.sapphire"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum pants": ( + output: ("common.items.armor.mail.orichalcum.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 8), + (Item("common.items.mineral.ingot.cobalt"), 1), + (Item("common.items.crafting_ing.hide.plate"), 3), + (Item("common.items.mineral.gem.diamond"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum shoulder": ( + output: ("common.items.armor.mail.orichalcum.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 8), + (Item("common.items.crafting_ing.hide.plate"), 4), + (Item("common.items.mineral.gem.sapphire"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "Seashell Necklace": ( output: ("common.items.armor.misc.neck.shell", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps"), 2), - (Item("common.items.crafting_ing.sapphire"), 1), + (Item("common.items.crafting_ing.cloth.linen"), 2), + (Item("common.items.mineral.gem.sapphire"), 1), (Item("common.items.crafting_ing.seashells"), 3), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(CraftingBench), ), "red cloth": ( - output: ("common.items.crafting_ing.cloth_scraps_red", 1), + output: ("common.items.crafting_ing.cloth.linen_red", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps"), 1), + (Item("common.items.crafting_ing.cloth.linen"), 1), (Item("common.items.flowers.red"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], @@ -340,21 +1619,21 @@ "tiny red pouch": ( output: ("common.items.armor.misc.bag.tiny_red_pouch", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps_red"), 3), + (Item("common.items.crafting_ing.cloth.linen_red"), 3), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), "tiny leather pouch": ( output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1), inputs: [ - (Item("common.items.crafting_ing.leather_scraps"), 6), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), "knitted red pouch": ( output: ("common.items.armor.misc.bag.knitted_red_pouch", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps_red"), 3), + (Item("common.items.crafting_ing.cloth.linen_red"), 3), (Item("common.items.armor.misc.bag.tiny_red_pouch"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -362,7 +1641,7 @@ "woven red bag": ( output: ("common.items.armor.misc.bag.woven_red_bag", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps_red"), 6), + (Item("common.items.crafting_ing.cloth.linen_red"), 6), (Item("common.items.armor.misc.bag.knitted_red_pouch"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -370,10 +1649,10 @@ "traveler backpack": ( output: ("common.items.armor.misc.back.backpack", 1), inputs: [ - (Item("common.items.crafting_ing.diamond"), 2), + (Item("common.items.mineral.gem.diamond"), 2), (Item("common.items.crafting_ing.twigs"), 2), - (Item("common.items.crafting_ing.cloth_scraps"), 3), - (Item("common.items.crafting_ing.leather_scraps"), 3), + (Item("common.items.crafting_ing.cloth.linen"), 3), + (Item("common.items.crafting_ing.leather.leather_strips"), 3), (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -382,8 +1661,9 @@ "sturdy red backpack": ( output: ("common.items.armor.misc.bag.sturdy_red_backpack", 1), inputs: [ - (Item("common.items.crafting_ing.diamond"), 2), - (Item("common.items.crafting_ing.cloth_scraps_red"), 3), + (Item("common.items.mineral.gem.diamond"), 2), + (Item("common.items.crafting_ing.cloth.linen_red"), 3), + (Item("common.items.crafting_ing.leather.thick_leather"), 3), (Item("common.items.armor.misc.bag.woven_red_bag"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -391,9 +1671,9 @@ "troll hide pack": ( output: ("common.items.armor.misc.bag.troll_hide_pack", 1), inputs: [ - (Item("common.items.crafting_ing.leather_troll"), 10), - (Item("common.items.crafting_ing.leather_scraps"), 10), - (Item("common.items.crafting_ing.diamond"), 1), + (Item("common.items.crafting_ing.hide.leather_troll"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 10), + (Item("common.items.mineral.gem.diamond"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), @@ -401,36 +1681,72 @@ output: ("common.items.armor.misc.bag.mindflayer_spellbag", 1), inputs: [ (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1), - (Item("common.items.crafting_ing.leather_scraps"), 10), - (Item("common.items.crafting_ing.diamond"), 4), - (Item("common.items.ore.veloritefrag"), 10), + (Item("common.items.crafting_ing.leather.thick_leather"), 8), + (Item("common.items.mineral.gem.diamond"), 4), + (Item("common.items.mineral.ore.veloritefrag"), 10), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), - "pickaxe": ( - output: ("common.items.tool.pick", 1), + "tin pickaxe": ( + output: ("common.items.tool.pickaxe_stone", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps"), 1), // TODO: Replace with plant fiber when obtainable - (Item("common.items.crafting_ing.stones"), 5), // TODO: Replace with iron ingots when obtainable - (Item("common.items.crafting_ing.twigs"), 4), + (Item("common.items.crafting_ing.cloth.linen"), 1), + (Item("common.items.crafting_ing.stones"), 5), (Item("common.items.tool.craftsman_hammer"), 0), ], craft_sprite: Some(Anvil), ), - "cloth_scraps": ( - output: ("common.items.crafting_ing.cloth_scraps", 1), + "steel pickaxe": ( + output: ("common.items.tool.pickaxe_steel", 1), inputs: [ - (Tag(ClothItem), 1), + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), + (Item("common.items.mineral.ingot.steel"), 5), + (Item("common.items.tool.craftsman_hammer"), 0), + ], + craft_sprite: Some(Anvil), + ), + "linen": ( + output: ("common.items.crafting_ing.cloth.linen", 1), + inputs: [ + (Tag(Material(Linen)), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), - "leather_scraps": ( - output: ("common.items.crafting_ing.leather_scraps", 1), + "wool": ( + output: ("common.items.crafting_ing.cloth.wool", 1), inputs: [ - (Tag(LeatherItem), 1), + (Tag(Material(Wool)), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), + "rawhide": ( + output: ("common.items.crafting_ing.leather.simple_leather", 1), + inputs: [ + (Tag(Material(Rawhide)), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + ), + "leather": ( + output: ("common.items.crafting_ing.leather.thick_leather", 1), + inputs: [ + (Tag(Material(Leather)), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + ), + "bronze": ( + output: ("common.items.mineral.ingot.bronze", 1), + inputs: [ + (Tag(Material(Bronze)), 1), + ], + craft_sprite: Some(Anvil), + ), + "iron": ( + output: ("common.items.mineral.ingot.iron", 1), + inputs: [ + (Tag(Material(Iron)), 1), + ], + craft_sprite: Some(Anvil), + ), //"metal_blade": ( // output: ("common.items.crafting_ing.modular.damage.sword.metal_blade", 1), // inputs: [ diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index bc2bb504e5..09c4726a39 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -51,12 +51,12 @@ ("common.items.food.apple_mushroom_curry", 100), ], "tier-4": [ - ("common.items.armor.steel.belt", 1), - ("common.items.armor.steel.chest", 1), - ("common.items.armor.steel.foot", 1), - ("common.items.armor.steel.hand", 1), - ("common.items.armor.steel.pants", 1), - ("common.items.armor.steel.shoulder", 1), + ("common.items.armor.mail.steel.belt", 1), + ("common.items.armor.mail.steel.chest", 1), + ("common.items.armor.mail.steel.foot", 1), + ("common.items.armor.mail.steel.hand", 1), + ("common.items.armor.mail.steel.pants", 1), + ("common.items.armor.mail.steel.shoulder", 1), ("common.items.weapons.sword.cobalt-0", 1), ("common.items.weapons.axe.cobalt_axe-0", 1), ("common.items.weapons.hammer.cobalt_hammer-0", 1), diff --git a/assets/voxygen/element/ui/crafting/icons/processed_material.png b/assets/voxygen/element/ui/crafting/icons/processed_material.png new file mode 100644 index 0000000000..9c99d86015 Binary files /dev/null and b/assets/voxygen/element/ui/crafting/icons/processed_material.png differ diff --git a/assets/voxygen/i18n/en/common.ron b/assets/voxygen/i18n/en/common.ron index ef01237b8c..6694770192 100644 --- a/assets/voxygen/i18n/en/common.ron +++ b/assets/voxygen/i18n/en/common.ron @@ -37,7 +37,7 @@ "common.automatic": "Auto", "common.random": "Random", "common.empty": "Empty", - + // Settings Window title "common.interface_settings": "Interface Settings", "common.gameplay_settings": "Gameplay Settings", @@ -99,7 +99,17 @@ Is the client up to date?"#, "common.stats.crit_mult": "Crit Mult", "common.stats.armor": "Armor", "common.stats.poise_res":"Stun Res", + "common.stats.energy_max": "Max Energy", + "common.stats.energy_reward": "Energy Reward", + "common.stats.crit_power": "Crit Power", + "common.stats.stealth": "Stealth", "common.stats.slots": "Slots", + + "common.material.metal": "Metal", + "common.material.wood": "Wood", + "common.material.stone": "Stone", + "common.material.cloth": "Cloth", + "common.material.hide": "Hide", }, diff --git a/assets/voxygen/i18n/en/hud/crafting.ron b/assets/voxygen/i18n/en/hud/crafting.ron index 985f4c3bd4..f702b1540f 100644 --- a/assets/voxygen/i18n/en/hud/crafting.ron +++ b/assets/voxygen/i18n/en/hud/crafting.ron @@ -14,6 +14,10 @@ "hud.crafting.cauldron": "Cauldron", "hud.crafting.cooking_pot": "Cooking Pot", "hud.crafting.crafting_bench": "Crafting Bench", + "hud.crafting.forge": "Forge", + "hud.crafting.loom": "Loom", + "hud.crafting.spinning_wheel": "Spinning Wheel", + "hud.crafting.tanning_rack": "Tanning Rack", // Tabs "hud.crafting.tabs.all": "All", "hud.crafting.tabs.armor": "Armor", @@ -25,6 +29,7 @@ "hud.crafting.tabs.utility": "Utility", "hud.crafting.tabs.weapon": "Weapons", "hud.crafting.tabs.bag": "Bags", + "hud.crafting.tabs.processed_material": "Materials", }, diff --git a/assets/voxygen/i18n/fr_FR/common.ron b/assets/voxygen/i18n/fr_FR/common.ron index 3f61599a16..ae3130d560 100644 --- a/assets/voxygen/i18n/fr_FR/common.ron +++ b/assets/voxygen/i18n/fr_FR/common.ron @@ -97,6 +97,12 @@ Le client est-il à jour?"#, "common.stats.armor": "Armure", "common.stats.poise_res": "Res Impact", "common.stats.slots": "Emplacements", + + "common.material.metal": "Metal", + "common.material.wood": "Bois", + "common.material.stone": "Pierre", + "common.material.cloth": "Tissu", + "common.material.hide": "Peau", }, diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 561492b219..5bb8796f1c 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -18,7 +18,23 @@ Tool("CraftingBench"): VoxTrans( "voxel.sprite.crafting_bench.crafting_bench-0", (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0, - ), + ), + Tool("Forge"): VoxTrans( + "voxel.object.forge", + (0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0, + ), + Tool("Loom"): VoxTrans( + "voxel.object.loom", + (0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0, + ), + Tool("SpinningWheel"): VoxTrans( + "voxel.object.spinning_wheel", + (0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0, + ), + Tool("TanningRack"): VoxTrans( + "voxel.object.tanning_rack", + (0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0, + ), // Weapons // Diary Example Images Tool("example_utility"): VoxTrans( @@ -780,6 +796,10 @@ "voxel.weapon.hammer.cult_purp-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), + Tool("common.items.weapons.hammer.burnt_drumstick"): VoxTrans( + "voxel.weapon.hammer.burnt_drumstick", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), // 1h Hammers Tool("common.items.weapons.hammer_1h.bloodsteel-0"): VoxTrans( "voxel.weapon.hammer_1h.bloodsteel-0", @@ -1051,10 +1071,14 @@ (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), // Picks - Tool("common.items.tool.pick"): VoxTrans( + Tool("common.items.tool.pickaxe_stone"): VoxTrans( "voxel.weapon.tool.pickaxe_green-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), + Tool("common.items.tool.pickaxe_steel"): VoxTrans( + "voxel.weapon.tool.pickaxe_green-1", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, + ), // Other Utility(Coins): VoxTrans( "voxel.object.v-coin", @@ -1126,31 +1150,6 @@ "voxel.armor.cultist.shoulder", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - // Druid Set - Armor(Chest("Druid")): VoxTrans( - "voxel.armor.druid.chest", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Druid")): VoxTrans( - "voxel.armor.druid.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Druid")): VoxTrans( - "voxel.armor.druid.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, - ), - Armor(Foot("Druid")): VoxTrans( - "voxel.armor.druid.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Druid")): VoxTrans( - "voxel.armor.druid.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - Armor(Shoulder("Druid")): VoxTrans( - "voxel.armor.druid.shoulder", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), // Villager Clothing Armor(Pants("WorkerBlue")): VoxTrans( "voxel.armor.misc.pants.worker_blue", @@ -1250,56 +1249,6 @@ "voxel.armor.assassin.shoulder", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - // Starting Armor - Plate - Armor(Chest("Plate")): VoxTrans( - "voxel.armor.plate.chest", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Plate")): VoxTrans( - "voxel.armor.plate.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Plate")): VoxTrans( - "voxel.armor.plate.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, - ), - Armor(Foot("Plate")): VoxTrans( - "voxel.armor.plate.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Plate")): VoxTrans( - "voxel.armor.plate.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - Armor(Shoulder("Plate")): VoxTrans( - "voxel.armor.plate.shoulder", - (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, - ), - //Steel0 Armor - Armor(Chest("Steel")): VoxTrans( - "voxel.armor.steel.chest", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Steel")): VoxTrans( - "voxel.armor.steel.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Steel")): VoxTrans( - "voxel.armor.steel.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, - ), - Armor(Foot("Steel")): VoxTrans( - "voxel.armor.steel.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Steel")): VoxTrans( - "voxel.armor.steel.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - Armor(Shoulder("Steel")): VoxTrans( - "voxel.armor.steel.shoulder", - (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, - ), //PlateLeather Armor Armor(Chest("LeatherPlate")): VoxTrans( "voxel.armor.leather_plate.chest", @@ -1325,56 +1274,6 @@ "voxel.armor.leather_plate.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), - //Leather0 Armor - Armor(Chest("Swift")): VoxTrans( - "voxel.armor.swift.chest", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Swift")): VoxTrans( - "voxel.armor.swift.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Swift")): VoxTrans( - "voxel.armor.swift.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, - ), - Armor(Foot("Swift")): VoxTrans( - "voxel.armor.swift.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Swift")): VoxTrans( - "voxel.armor.swift.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - Armor(Shoulder("Swift")): VoxTrans( - "voxel.armor.swift.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", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Agile")): VoxTrans( - "voxel.armor.agile.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Agile")): VoxTrans( - "voxel.armor.agile.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, - ), - Armor(Foot("Agile")): VoxTrans( - "voxel.armor.agile.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Agile")): VoxTrans( - "voxel.armor.agile.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - Armor(Shoulder("Agile")): VoxTrans( - "voxel.armor.agile.shoulder", - (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, - ), //Ferocious Armor Armor(Chest("Ferocious")): VoxTrans( "voxel.armor.ferocious.chest", @@ -1695,6 +1594,557 @@ "voxel.armor.warlock.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), + //Rawhide Set + Armor(Chest("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, + ), + Armor(Foot("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.back", + (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, + ), + //Leather set + Armor(Chest("Leather")): VoxTrans( + "voxel.armor.hide.leather.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Leather")): VoxTrans( + "voxel.armor.hide.leather.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Leather")): VoxTrans( + "voxel.armor.hide.leather.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, + ), + Armor(Foot("Leather")): VoxTrans( + "voxel.armor.hide.leather.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Leather")): VoxTrans( + "voxel.armor.hide.leather.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Leather")): VoxTrans( + "voxel.armor.hide.leather.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Leather")): VoxTrans( + "voxel.armor.hide.leather.back", + (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, + ), + //Scale Set + Armor(Chest("Scale")): VoxTrans( + "voxel.armor.hide.scale.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Scale")): VoxTrans( + "voxel.armor.hide.scale.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Scale")): VoxTrans( + "voxel.armor.hide.scale.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Scale")): VoxTrans( + "voxel.armor.hide.scale.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Scale")): VoxTrans( + "voxel.armor.hide.scale.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Scale")): VoxTrans( + "voxel.armor.hide.scale.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Scale")): VoxTrans( + "voxel.armor.hide.scale.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Carapace Set + Armor(Chest("Carapace")): VoxTrans( + "voxel.armor.hide.carapace.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Carapace")): VoxTrans( + "voxel.armor.hide.carapace.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Carapace")): VoxTrans( + "voxel.armor.hide.carapace.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Carapace")): VoxTrans( + "voxel.armor.hide.carapace.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Carapace")): VoxTrans( + "voxel.armor.hide.carapace.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Carapace")): VoxTrans( + "voxel.armor.hide.carapace.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Carapace")): VoxTrans( + "voxel.armor.hide.carapace.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Primal Set + Armor(Chest("Primal")): VoxTrans( + "voxel.armor.hide.primal.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Primal")): VoxTrans( + "voxel.armor.hide.primal.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Primal")): VoxTrans( + "voxel.armor.hide.primal.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Primal")): VoxTrans( + "voxel.armor.hide.primal.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Primal")): VoxTrans( + "voxel.armor.hide.primal.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Primal")): VoxTrans( + "voxel.armor.hide.primal.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Primal")): VoxTrans( + "voxel.armor.hide.primal.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Dragonscale Set + Armor(Chest("Dragonscale")): VoxTrans( + "voxel.armor.hide.dragonscale.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Dragonscale")): VoxTrans( + "voxel.armor.hide.dragonscale.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Dragonscale")): VoxTrans( + "voxel.armor.hide.dragonscale.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Dragonscale")): VoxTrans( + "voxel.armor.hide.dragonscale.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Dragonscale")): VoxTrans( + "voxel.armor.hide.dragonscale.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Dragonscale")): VoxTrans( + "voxel.armor.hide.dragonscale.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Dragonscale")): VoxTrans( + "voxel.armor.hide.dragonscale.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Savage Set + Armor(Chest("Savage")): VoxTrans( + "voxel.armor.savage.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Savage")): VoxTrans( + "voxel.armor.savage.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Savage")): VoxTrans( + "voxel.armor.savage.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Savage")): VoxTrans( + "voxel.armor.savage.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Savage")): VoxTrans( + "voxel.armor.savage.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Savage")): VoxTrans( + "voxel.armor.savage.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Savage")): VoxTrans( + "voxel.armor.savage.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Linen Set + Armor(Chest("Linen")): VoxTrans( + "voxel.armor.cloth.linen.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Linen")): VoxTrans( + "voxel.armor.cloth.linen.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Linen")): VoxTrans( + "voxel.armor.cloth.linen.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Linen")): VoxTrans( + "voxel.armor.cloth.linen.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Linen")): VoxTrans( + "voxel.armor.cloth.linen.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Linen")): VoxTrans( + "voxel.armor.cloth.linen.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Linen")): VoxTrans( + "voxel.armor.cloth.linen.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Woolen Set + Armor(Chest("Woolen")): VoxTrans( + "voxel.armor.cloth.woolen.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Woolen")): VoxTrans( + "voxel.armor.cloth.woolen.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Woolen")): VoxTrans( + "voxel.armor.cloth.woolen.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Woolen")): VoxTrans( + "voxel.armor.cloth.woolen.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Woolen")): VoxTrans( + "voxel.armor.cloth.woolen.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Woolen")): VoxTrans( + "voxel.armor.cloth.woolen.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Woolen")): VoxTrans( + "voxel.armor.cloth.woolen.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Silken Set + Armor(Chest("Silken")): VoxTrans( + "voxel.armor.cloth.silken.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Silken")): VoxTrans( + "voxel.armor.cloth.silken.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Silken")): VoxTrans( + "voxel.armor.cloth.silken.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Silken")): VoxTrans( + "voxel.armor.cloth.silken.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Silken")): VoxTrans( + "voxel.armor.cloth.silken.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Silken")): VoxTrans( + "voxel.armor.cloth.silken.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Silken")): VoxTrans( + "voxel.armor.cloth.silken.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Druid Set + Armor(Chest("Druid")): VoxTrans( + "voxel.armor.cloth.druid.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Druid")): VoxTrans( + "voxel.armor.cloth.druid.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Druid")): VoxTrans( + "voxel.armor.cloth.druid.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Druid")): VoxTrans( + "voxel.armor.cloth.druid.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Druid")): VoxTrans( + "voxel.armor.cloth.druid.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Druid")): VoxTrans( + "voxel.armor.cloth.druid.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Druid")): VoxTrans( + "voxel.armor.cloth.druid.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Moonweave Set + Armor(Chest("Moonweave")): VoxTrans( + "voxel.armor.cloth.moonweave.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Moonweave")): VoxTrans( + "voxel.armor.cloth.moonweave.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Moonweave")): VoxTrans( + "voxel.armor.cloth.moonweave.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Moonweave")): VoxTrans( + "voxel.armor.cloth.moonweave.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Moonweave")): VoxTrans( + "voxel.armor.cloth.moonweave.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Moonweave")): VoxTrans( + "voxel.armor.cloth.moonweave.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Moonweave")): VoxTrans( + "voxel.armor.cloth.moonweave.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Sunsilk Set + Armor(Chest("Sunsilk")): VoxTrans( + "voxel.armor.cloth.sunsilk.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Sunsilk")): VoxTrans( + "voxel.armor.cloth.sunsilk.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Sunsilk")): VoxTrans( + "voxel.armor.cloth.sunsilk.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Sunsilk")): VoxTrans( + "voxel.armor.cloth.sunsilk.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Sunsilk")): VoxTrans( + "voxel.armor.cloth.sunsilk.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Sunsilk")): VoxTrans( + "voxel.armor.cloth.sunsilk.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Sunsilk")): VoxTrans( + "voxel.armor.cloth.sunsilk.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Bronze Set + Armor(Chest("Bronze")): VoxTrans( + "voxel.armor.mail.bronze.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Bronze")): VoxTrans( + "voxel.armor.mail.bronze.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Bronze")): VoxTrans( + "voxel.armor.mail.bronze.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Bronze")): VoxTrans( + "voxel.armor.mail.bronze.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Bronze")): VoxTrans( + "voxel.armor.mail.bronze.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Bronze")): VoxTrans( + "voxel.armor.mail.bronze.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Bronze")): VoxTrans( + "voxel.armor.mail.bronze.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Iron Set + Armor(Chest("Iron")): VoxTrans( + "voxel.armor.mail.iron.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Iron")): VoxTrans( + "voxel.armor.mail.iron.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Iron")): VoxTrans( + "voxel.armor.mail.iron.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Iron")): VoxTrans( + "voxel.armor.mail.iron.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Iron")): VoxTrans( + "voxel.armor.mail.iron.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Iron")): VoxTrans( + "voxel.armor.mail.iron.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Iron")): VoxTrans( + "voxel.armor.mail.iron.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Steel Set + Armor(Chest("Steel")): VoxTrans( + "voxel.armor.mail.steel.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Steel")): VoxTrans( + "voxel.armor.mail.steel.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Steel")): VoxTrans( + "voxel.armor.mail.steel.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Steel")): VoxTrans( + "voxel.armor.mail.steel.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Steel")): VoxTrans( + "voxel.armor.mail.steel.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Steel")): VoxTrans( + "voxel.armor.mail.steel.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Steel")): VoxTrans( + "voxel.armor.mail.steel.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Cobalt Set + Armor(Chest("Cobalt")): VoxTrans( + "voxel.armor.mail.cobalt.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Cobalt")): VoxTrans( + "voxel.armor.mail.cobalt.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Cobalt")): VoxTrans( + "voxel.armor.mail.cobalt.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Cobalt")): VoxTrans( + "voxel.armor.mail.cobalt.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Cobalt")): VoxTrans( + "voxel.armor.mail.cobalt.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Cobalt")): VoxTrans( + "voxel.armor.mail.cobalt.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Cobalt")): VoxTrans( + "voxel.armor.mail.cobalt.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Bloodsteel Set + Armor(Chest("Bloodsteel")): VoxTrans( + "voxel.armor.mail.bloodsteel.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Bloodsteel")): VoxTrans( + "voxel.armor.mail.bloodsteel.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Bloodsteel")): VoxTrans( + "voxel.armor.mail.bloodsteel.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Bloodsteel")): VoxTrans( + "voxel.armor.mail.bloodsteel.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Bloodsteel")): VoxTrans( + "voxel.armor.mail.bloodsteel.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Bloodsteel")): VoxTrans( + "voxel.armor.mail.bloodsteel.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Bloodsteel")): VoxTrans( + "voxel.armor.mail.bloodsteel.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Orichalcum Set + Armor(Chest("Orichalcum")): VoxTrans( + "voxel.armor.mail.orichalcum.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Orichalcum")): VoxTrans( + "voxel.armor.mail.orichalcum.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Orichalcum")): VoxTrans( + "voxel.armor.mail.orichalcum.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Orichalcum")): VoxTrans( + "voxel.armor.mail.orichalcum.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Orichalcum")): VoxTrans( + "voxel.armor.mail.orichalcum.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Orichalcum")): VoxTrans( + "voxel.armor.mail.orichalcum.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Orichalcum")): VoxTrans( + "voxel.armor.mail.orichalcum.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), //misc Armor(Pants("Hunting")): VoxTrans( "voxel.armor.misc.pants.grayscale", @@ -1717,10 +2167,6 @@ "voxel.armor.misc.back.dungeon_purple", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0, ), - Armor(Back("Agile")): VoxTrans( - "voxel.armor.agile.back", - (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, - ), Armor(Back("LeatherBlue")): VoxTrans( "voxel.armor.leather_blue.back", (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, @@ -1771,7 +2217,7 @@ "element.items.tabard_admin", ), // Heads - Armor(Head("Swift")): VoxTrans( + Armor(Head("Leather")): VoxTrans( "voxel.armor.misc.head.leather-0", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0, ), @@ -1885,10 +2331,54 @@ "voxel.sprite.cabbage.cabbage", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Consumable("Fish"): VoxTrans( - "voxel.sprite.food.meat_fish", + Consumable("FishRaw"): VoxTrans( + "voxel.sprite.food.meat.fish_raw", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), + Consumable("FishCooked"): VoxTrans( + "voxel.sprite.food.meat.fish_cooked", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Consumable("BirdRaw"): VoxTrans( + "voxel.sprite.food.meat.bird_raw", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Consumable("BirdCooked"): VoxTrans( + "voxel.sprite.food.meat.bird_cooked", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Consumable("BirdLargeRaw"): VoxTrans( + "voxel.sprite.food.meat.bird_large_raw", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Consumable("BirdLargeCooked"): VoxTrans( + "voxel.sprite.food.meat.bird_large_cooked", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Consumable("BeastSmallRaw"): VoxTrans( + "voxel.sprite.food.meat.beast_small_raw", + (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0, + ), + Consumable("BeastSmallCooked"): VoxTrans( + "voxel.sprite.food.meat.beast_small_cooked", + (0.0, 0.0, 0.0), (-50.0, 20.0, 0.0), 1.0, + ), + Consumable("ToughRaw"): VoxTrans( + "voxel.sprite.food.meat.tough_raw", + (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0, + ), + Consumable("ToughCooked"): VoxTrans( + "voxel.sprite.food.meat.tough_cooked", + (0.0, 0.0, 0.0), (-50.0, 20.0, 0.0), 1.0, + ), + Consumable("BeastLargeRaw"): VoxTrans( + "voxel.sprite.food.meat.beast_large_raw", + (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8, + ), + Consumable("BeastLargeCooked"): VoxTrans( + "voxel.sprite.food.meat.beast_large_cooked", + (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8, + ), Consumable("PlainSalad"): VoxTrans( "voxel.sprite.food.salad_plain", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, @@ -1930,11 +2420,11 @@ "voxel.object.training_dummy", (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), - // Ingredients - Tool("common.items.tool.craftsman_hammer"): VoxTrans( + // Ingredients + Tool("common.items.tool.craftsman_hammer"): VoxTrans( "voxel.weapon.hammer.craftsman", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, - ), + ), Ingredient("SewingSet"): Png( "element.items.sewing_set", ), @@ -1975,65 +2465,213 @@ "voxel.sprite.twigs.twigs-0", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("AnimalPelt"): VoxTrans( - "voxel.sprite.crafting_ing.pelt", + Ingredient("AnimalHide"): VoxTrans( + "voxel.sprite.crafting_ing.hide.animal_hide", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("Claw"): VoxTrans( - "voxel.sprite.crafting_ing.claw", + Ingredient("ToughHide"): VoxTrans( + "voxel.sprite.crafting_ing.hide.tough_hide", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("RuggedHide"): VoxTrans( + "voxel.sprite.crafting_ing.hide.rugged_hide", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("SimpleLeather"): VoxTrans( + "voxel.sprite.crafting_ing.leather.simple_leather", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("ThickLeather"): VoxTrans( + "voxel.sprite.crafting_ing.leather.thick_leather", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("RigidLeather"): VoxTrans( + "voxel.sprite.crafting_ing.leather.rigid_leather", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("TrollLeather"): VoxTrans( + "voxel.sprite.crafting_ing.hide.troll_hide", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("LeatherStrips"): VoxTrans( + "voxel.sprite.crafting_ing.leather.leather_strips", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), Ingredient("Plate"): VoxTrans( - "voxel.sprite.crafting_ing.plate", + "voxel.sprite.crafting_ing.hide.plate", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0, ), - Ingredient("Leather"): VoxTrans( - "voxel.sprite.crafting_ing.leather", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, - ), - Ingredient("DragonScale"): VoxTrans( - "voxel.sprite.crafting_ing.dragon_scale", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, - ), - Ingredient("SilverIngot"): VoxTrans( - "voxel.sprite.crafting_ing.silver_ingot", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, - ), - Ingredient("GoldIngot"): VoxTrans( - "voxel.sprite.crafting_ing.gold_ingot", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, - ), - Ingredient("GoldOre"): VoxTrans( - "voxel.sprite.crafting_ing.gold_ore_drop", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, - ), - Ingredient("SilverOre"): VoxTrans( - "voxel.sprite.crafting_ing.silver_ore_drop", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.8, - ), - Ingredient("OrichalcumIngot"): VoxTrans( - "voxel.sprite.crafting_ing.orichalcum_ingot", + Ingredient("Carapace"): VoxTrans( + "voxel.sprite.crafting_ing.hide.carapace", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), Ingredient("Scale"): VoxTrans( - "voxel.sprite.crafting_ing.scale", + "voxel.sprite.crafting_ing.hide.scale", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.8, + ), + Ingredient("DragonScale"): VoxTrans( + "voxel.sprite.crafting_ing.hide.dragon_scale", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), + Ingredient("Claw"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.claw", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("VenomSac"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.venom_sac", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("LivelyVine"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.lively_vine", + (0.0, 0.0, 0.0), (-40.0, -40.0, 20.0), 1.2, + ), + Ingredient("SharpFang"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.sharp_fang", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0, + ), + Ingredient("Fur"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.fur", + (0.0, 0.0, 0.0), (-40.0, -10.0, 10.0), 1.0, + ), + Ingredient("LargeHorn"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.large_horn", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("GrimEyeball"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.grim_eyeball", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("PlantFiber"): VoxTrans( + "voxel.sprite.crafting_ing.plant_fiber", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("Moonbell"): VoxTrans( + "voxel.sprite.flowers.moonbell", + (0.0, 0.0, 0.0), (-65.0, 40.0, 20.0), 0.9, + ), + Ingredient("Pyrebloom"): VoxTrans( + "voxel.sprite.flowers.pyrebloom", + (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.9, + ), + Ingredient("WildFlax"): VoxTrans( + "voxel.sprite.flowers.flax", + (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.8, + ), + Ingredient("CottonBoll"): VoxTrans( + "voxel.sprite.crafting_ing.cotton_boll", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Cotton"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.cotton", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Linen"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.linen", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Wool"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.wool", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("Silk"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.silk", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Lifecloth"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.lifecloth", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Moonweave"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.moonweave", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Sunsilk"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.sunsilk", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("LinenRed"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.linen_red", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("StickyThread"): VoxTrans( + "voxel.sprite.crafting_ing.sticky_thread", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("SilverIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.silver", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("GoldIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.gold", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("OrichalcumIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.orichalcum", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("BloodsteelIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.bloodsteel", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("BronzeIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.bronze", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("CobaltIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.cobalt", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("CopperIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.copper", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("IronIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.iron", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("SteelIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.steel", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("TinIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.tin", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("GoldOre"): VoxTrans( + "voxel.sprite.mineral.ore.gold", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("SilverOre"): VoxTrans( + "voxel.sprite.mineral.ore.silver", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("BloodstoneOre"): VoxTrans( + "voxel.sprite.mineral.ore.bloodstone", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("CobaltOre"): VoxTrans( + "voxel.sprite.mineral.ore.cobalt", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("CopperOre"): VoxTrans( + "voxel.sprite.mineral.ore.copper", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("IronOre"): VoxTrans( + "voxel.sprite.mineral.ore.iron", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("TinOre"): VoxTrans( + "voxel.sprite.mineral.ore.tin", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("Coal"): VoxTrans( + "voxel.sprite.mineral.ore.coal", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), Ingredient("Honey"): Png( "element.items.item_honey", ), - Ingredient("LeatherScraps"): Png( - "element.items.item_leather0", - ), - Ingredient("TrollLeather"): Png( - "element.items.item_leather_green", - ), - Ingredient("ClothScraps"): Png( - "element.items.item_cloth0", - ), - Ingredient("ClothScrapsRed"): Png( - "element.items.item_cloth_red", - ), Ingredient("MortarPestle"): Png( "element.items.item_mortarpestlecoco", ), @@ -2050,7 +2688,11 @@ (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), Ingredient("ViscousOoze"): VoxTrans( - "voxel.sprite.crafting_ing.ooze", + "voxel.sprite.crafting_ing.animal_misc.viscous_ooze", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("PhoenixFeather"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.phoenix_feather", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), // Gliders @@ -2109,27 +2751,27 @@ ), // Gems Ingredient("Amethyst"): VoxTrans( - "voxel.sprite.gem.amethystgem", + "voxel.sprite.mineral.gem.amethystgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Ingredient("Topaz"): VoxTrans( - "voxel.sprite.gem.topazgem", + "voxel.sprite.mineral.gem.topazgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Ingredient("Sapphire"): VoxTrans( - "voxel.sprite.gem.sapphiregem", + "voxel.sprite.mineral.gem.sapphiregem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.6, ), Ingredient("Emerald"): VoxTrans( - "voxel.sprite.gem.emeraldgem", + "voxel.sprite.mineral.gem.emeraldgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Ingredient("Ruby"): VoxTrans( - "voxel.sprite.gem.rubygem", + "voxel.sprite.mineral.gem.rubygem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Ingredient("Diamond"): VoxTrans( - "voxel.sprite.gem.diamondgem", + "voxel.sprite.mineral.gem.diamondgem", (0.0, 0.0, 0.0), (-55.0, 30.0, 20.0), 0.6, ), ModularComponent("common.items.crafting_ing.modular.damage.sword.tier5"): VoxTrans( diff --git a/assets/voxygen/shaders/include/sky.glsl b/assets/voxygen/shaders/include/sky.glsl index b44c95d522..f6587037ab 100644 --- a/assets/voxygen/shaders/include/sky.glsl +++ b/assets/voxygen/shaders/include/sky.glsl @@ -49,7 +49,7 @@ const float PERSISTENT_AMBIANCE = 1.0 / 32.0;// 1.0 / 80; // 1.0 / 512; // 0.001 // Glow from static light sources // Allowed to be > 1 due to HDR -const vec3 GLOW_COLOR = vec3(3.0, 0.9, 0.05); +const vec3 GLOW_COLOR = vec3(0.89, 0.95, 0.52); // Calculate glow from static light sources, + some noise for flickering. // TODO: Optionally disable the flickering for performance? diff --git a/assets/voxygen/shaders/particle-vert.glsl b/assets/voxygen/shaders/particle-vert.glsl index 4bad57d31e..a97e1bdffe 100644 --- a/assets/voxygen/shaders/particle-vert.glsl +++ b/assets/voxygen/shaders/particle-vert.glsl @@ -70,6 +70,7 @@ const int LASER = 28; const int BUBBLES = 29; const int WATER = 30; const int ICE_SPIKES = 31; +const int DRIP = 32; // meters per second squared (acceleration) const float earth_gravity = 9.807; @@ -531,6 +532,17 @@ void main() { spin_in_axis(vec3(1,0,0),0) ); break; + case DRIP: + attr = Attr( + linear_motion( + vec3(0), + normalize(vec3(rand4, rand5, rand6)) + grav_vel(earth_gravity) + ), + vec3((2.0 * (1 - slow_start(0.2)))), + vec4(1, 1, 0, 1), + spin_in_axis(vec3(1,0,0),0) + ); + break; default: attr = Attr( linear_motion( diff --git a/assets/voxygen/voxel/armor/cloth/druid/back.vox b/assets/voxygen/voxel/armor/cloth/druid/back.vox new file mode 100644 index 0000000000..d900a3ba34 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/druid/back.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/druid/belt.vox b/assets/voxygen/voxel/armor/cloth/druid/belt.vox new file mode 100644 index 0000000000..077df2de9e Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/druid/belt.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/druid/chest.vox b/assets/voxygen/voxel/armor/cloth/druid/chest.vox new file mode 100644 index 0000000000..cb4c19ef81 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/druid/chest.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/druid/foot.vox b/assets/voxygen/voxel/armor/cloth/druid/foot.vox new file mode 100644 index 0000000000..314f513dfb Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/druid/foot.vox differ diff --git a/assets/voxygen/voxel/armor/druid/hand.vox b/assets/voxygen/voxel/armor/cloth/druid/hand.vox similarity index 60% rename from assets/voxygen/voxel/armor/druid/hand.vox rename to assets/voxygen/voxel/armor/cloth/druid/hand.vox index bb4d31d95c..ad6bf6303f 100644 Binary files a/assets/voxygen/voxel/armor/druid/hand.vox and b/assets/voxygen/voxel/armor/cloth/druid/hand.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/druid/pants.vox b/assets/voxygen/voxel/armor/cloth/druid/pants.vox new file mode 100644 index 0000000000..d2d34d8f71 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/druid/pants.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/druid/shoulder.vox b/assets/voxygen/voxel/armor/cloth/druid/shoulder.vox new file mode 100644 index 0000000000..6977e9b1d1 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/druid/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/linen/back.vox b/assets/voxygen/voxel/armor/cloth/linen/back.vox new file mode 100644 index 0000000000..522e27f1e4 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/linen/back.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/linen/belt.vox b/assets/voxygen/voxel/armor/cloth/linen/belt.vox new file mode 100644 index 0000000000..99c71ea462 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/linen/belt.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/linen/chest.vox b/assets/voxygen/voxel/armor/cloth/linen/chest.vox new file mode 100644 index 0000000000..1be352e15d Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/linen/chest.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/linen/foot.vox b/assets/voxygen/voxel/armor/cloth/linen/foot.vox new file mode 100644 index 0000000000..968292828f Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/linen/foot.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/linen/hand.vox b/assets/voxygen/voxel/armor/cloth/linen/hand.vox new file mode 100644 index 0000000000..81f5a71736 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/linen/hand.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/linen/pants.vox b/assets/voxygen/voxel/armor/cloth/linen/pants.vox new file mode 100644 index 0000000000..b1998dfbeb Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/linen/pants.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/linen/shoulder.vox b/assets/voxygen/voxel/armor/cloth/linen/shoulder.vox new file mode 100644 index 0000000000..f530338225 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/linen/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/moonweave/back.vox b/assets/voxygen/voxel/armor/cloth/moonweave/back.vox new file mode 100644 index 0000000000..c4bccef24c Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/moonweave/back.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/moonweave/belt.vox b/assets/voxygen/voxel/armor/cloth/moonweave/belt.vox new file mode 100644 index 0000000000..94997408aa Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/moonweave/belt.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/moonweave/chest.vox b/assets/voxygen/voxel/armor/cloth/moonweave/chest.vox new file mode 100644 index 0000000000..ce4dd82b52 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/moonweave/chest.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/moonweave/foot.vox b/assets/voxygen/voxel/armor/cloth/moonweave/foot.vox new file mode 100644 index 0000000000..2e0d7572ce Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/moonweave/foot.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/moonweave/hand.vox b/assets/voxygen/voxel/armor/cloth/moonweave/hand.vox new file mode 100644 index 0000000000..614533c28d Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/moonweave/hand.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/moonweave/pants.vox b/assets/voxygen/voxel/armor/cloth/moonweave/pants.vox new file mode 100644 index 0000000000..0b5e836da8 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/moonweave/pants.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/moonweave/shoulder.vox b/assets/voxygen/voxel/armor/cloth/moonweave/shoulder.vox new file mode 100644 index 0000000000..7a7bb6fc78 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/moonweave/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/silken/back.vox b/assets/voxygen/voxel/armor/cloth/silken/back.vox new file mode 100644 index 0000000000..4b474fd384 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/silken/back.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/silken/belt.vox b/assets/voxygen/voxel/armor/cloth/silken/belt.vox new file mode 100644 index 0000000000..3453796b41 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/silken/belt.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/silken/chest.vox b/assets/voxygen/voxel/armor/cloth/silken/chest.vox new file mode 100644 index 0000000000..ba78808d21 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/silken/chest.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/silken/foot.vox b/assets/voxygen/voxel/armor/cloth/silken/foot.vox new file mode 100644 index 0000000000..f76bb9f3a1 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/silken/foot.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/silken/hand.vox b/assets/voxygen/voxel/armor/cloth/silken/hand.vox new file mode 100644 index 0000000000..19660eb439 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/silken/hand.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/silken/pants.vox b/assets/voxygen/voxel/armor/cloth/silken/pants.vox new file mode 100644 index 0000000000..c9ec073299 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/silken/pants.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/silken/shoulder.vox b/assets/voxygen/voxel/armor/cloth/silken/shoulder.vox new file mode 100644 index 0000000000..10a22c6a0d Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/silken/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/sunsilk/back.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/back.vox new file mode 100644 index 0000000000..cb509e3350 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/sunsilk/back.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/sunsilk/belt.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/belt.vox new file mode 100644 index 0000000000..7a77db15ef Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/sunsilk/belt.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/sunsilk/chest.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/chest.vox new file mode 100644 index 0000000000..dee5a32efb Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/sunsilk/chest.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/sunsilk/foot.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/foot.vox new file mode 100644 index 0000000000..7309b8c38f Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/sunsilk/foot.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/sunsilk/hand.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/hand.vox new file mode 100644 index 0000000000..c2be4d5a2d Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/sunsilk/hand.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/sunsilk/pants.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/pants.vox new file mode 100644 index 0000000000..381c632834 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/sunsilk/pants.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/sunsilk/shoulder.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/shoulder.vox new file mode 100644 index 0000000000..91119b823a Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/sunsilk/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/woolen/back.vox b/assets/voxygen/voxel/armor/cloth/woolen/back.vox new file mode 100644 index 0000000000..2f2dc871e2 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/woolen/back.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/woolen/belt.vox b/assets/voxygen/voxel/armor/cloth/woolen/belt.vox new file mode 100644 index 0000000000..7ea3ee55eb Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/woolen/belt.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/woolen/chest.vox b/assets/voxygen/voxel/armor/cloth/woolen/chest.vox new file mode 100644 index 0000000000..528d268752 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/woolen/chest.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/woolen/foot.vox b/assets/voxygen/voxel/armor/cloth/woolen/foot.vox new file mode 100644 index 0000000000..23619b7146 Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/woolen/foot.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/woolen/hand.vox b/assets/voxygen/voxel/armor/cloth/woolen/hand.vox new file mode 100644 index 0000000000..f7dff557ef Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/woolen/hand.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/woolen/pants.vox b/assets/voxygen/voxel/armor/cloth/woolen/pants.vox new file mode 100644 index 0000000000..75048bb80e Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/woolen/pants.vox differ diff --git a/assets/voxygen/voxel/armor/cloth/woolen/shoulder.vox b/assets/voxygen/voxel/armor/cloth/woolen/shoulder.vox new file mode 100644 index 0000000000..f7685d7e7e Binary files /dev/null and b/assets/voxygen/voxel/armor/cloth/woolen/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/druid/belt.vox b/assets/voxygen/voxel/armor/druid/belt.vox deleted file mode 100644 index 5d8d6529f5..0000000000 Binary files a/assets/voxygen/voxel/armor/druid/belt.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/druid/chest.vox b/assets/voxygen/voxel/armor/druid/chest.vox deleted file mode 100644 index 96ab76e508..0000000000 Binary files a/assets/voxygen/voxel/armor/druid/chest.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/druid/foot.vox b/assets/voxygen/voxel/armor/druid/foot.vox deleted file mode 100644 index 934efa1cfc..0000000000 Binary files a/assets/voxygen/voxel/armor/druid/foot.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/druid/pants.vox b/assets/voxygen/voxel/armor/druid/pants.vox deleted file mode 100644 index d299520e1d..0000000000 Binary files a/assets/voxygen/voxel/armor/druid/pants.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/druid/shoulder.vox b/assets/voxygen/voxel/armor/druid/shoulder.vox deleted file mode 100644 index 8dee9ef073..0000000000 Binary files a/assets/voxygen/voxel/armor/druid/shoulder.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/hide/carapace/back.vox b/assets/voxygen/voxel/armor/hide/carapace/back.vox new file mode 100644 index 0000000000..1066243471 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/carapace/back.vox differ diff --git a/assets/voxygen/voxel/armor/hide/carapace/belt.vox b/assets/voxygen/voxel/armor/hide/carapace/belt.vox new file mode 100644 index 0000000000..2786538676 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/carapace/belt.vox differ diff --git a/assets/voxygen/voxel/armor/hide/carapace/chest.vox b/assets/voxygen/voxel/armor/hide/carapace/chest.vox new file mode 100644 index 0000000000..ad9fb0b9b2 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/carapace/chest.vox differ diff --git a/assets/voxygen/voxel/armor/hide/carapace/foot.vox b/assets/voxygen/voxel/armor/hide/carapace/foot.vox new file mode 100644 index 0000000000..79e8838768 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/carapace/foot.vox differ diff --git a/assets/voxygen/voxel/armor/hide/carapace/hand.vox b/assets/voxygen/voxel/armor/hide/carapace/hand.vox new file mode 100644 index 0000000000..41ad4c4d51 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/carapace/hand.vox differ diff --git a/assets/voxygen/voxel/armor/hide/carapace/pants.vox b/assets/voxygen/voxel/armor/hide/carapace/pants.vox new file mode 100644 index 0000000000..6e288aa2b7 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/carapace/pants.vox differ diff --git a/assets/voxygen/voxel/armor/hide/carapace/shoulder.vox b/assets/voxygen/voxel/armor/hide/carapace/shoulder.vox new file mode 100644 index 0000000000..ce6af04142 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/carapace/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/hide/dragonscale/back.vox b/assets/voxygen/voxel/armor/hide/dragonscale/back.vox new file mode 100644 index 0000000000..2a7bcbe6ab Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/dragonscale/back.vox differ diff --git a/assets/voxygen/voxel/armor/hide/dragonscale/belt.vox b/assets/voxygen/voxel/armor/hide/dragonscale/belt.vox new file mode 100644 index 0000000000..3ecb3c4c97 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/dragonscale/belt.vox differ diff --git a/assets/voxygen/voxel/armor/hide/dragonscale/chest.vox b/assets/voxygen/voxel/armor/hide/dragonscale/chest.vox new file mode 100644 index 0000000000..7d8c5739a0 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/dragonscale/chest.vox differ diff --git a/assets/voxygen/voxel/armor/hide/dragonscale/foot.vox b/assets/voxygen/voxel/armor/hide/dragonscale/foot.vox new file mode 100644 index 0000000000..7352e69e02 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/dragonscale/foot.vox differ diff --git a/assets/voxygen/voxel/armor/hide/dragonscale/hand.vox b/assets/voxygen/voxel/armor/hide/dragonscale/hand.vox new file mode 100644 index 0000000000..c725be65b4 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/dragonscale/hand.vox differ diff --git a/assets/voxygen/voxel/armor/hide/dragonscale/pants.vox b/assets/voxygen/voxel/armor/hide/dragonscale/pants.vox new file mode 100644 index 0000000000..60fd05f2f0 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/dragonscale/pants.vox differ diff --git a/assets/voxygen/voxel/armor/hide/dragonscale/shoulder.vox b/assets/voxygen/voxel/armor/hide/dragonscale/shoulder.vox new file mode 100644 index 0000000000..dd5e609c99 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/dragonscale/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/agile/back.vox b/assets/voxygen/voxel/armor/hide/leather/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/back.vox rename to assets/voxygen/voxel/armor/hide/leather/back.vox diff --git a/assets/voxygen/voxel/armor/agile/belt.vox b/assets/voxygen/voxel/armor/hide/leather/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/belt.vox rename to assets/voxygen/voxel/armor/hide/leather/belt.vox diff --git a/assets/voxygen/voxel/armor/agile/chest.vox b/assets/voxygen/voxel/armor/hide/leather/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/chest.vox rename to assets/voxygen/voxel/armor/hide/leather/chest.vox diff --git a/assets/voxygen/voxel/armor/swift/foot.vox b/assets/voxygen/voxel/armor/hide/leather/foot.vox similarity index 84% rename from assets/voxygen/voxel/armor/swift/foot.vox rename to assets/voxygen/voxel/armor/hide/leather/foot.vox index 3a11434f6f..a8f033f29e 100644 Binary files a/assets/voxygen/voxel/armor/swift/foot.vox and b/assets/voxygen/voxel/armor/hide/leather/foot.vox differ diff --git a/assets/voxygen/voxel/armor/swift/hand.vox b/assets/voxygen/voxel/armor/hide/leather/hand.vox similarity index 81% rename from assets/voxygen/voxel/armor/swift/hand.vox rename to assets/voxygen/voxel/armor/hide/leather/hand.vox index d9c4695424..10f2b0d1ca 100644 Binary files a/assets/voxygen/voxel/armor/swift/hand.vox and b/assets/voxygen/voxel/armor/hide/leather/hand.vox differ diff --git a/assets/voxygen/voxel/armor/swift/pants.vox b/assets/voxygen/voxel/armor/hide/leather/pants.vox similarity index 94% rename from assets/voxygen/voxel/armor/swift/pants.vox rename to assets/voxygen/voxel/armor/hide/leather/pants.vox index 906cd7bf54..b1f1ca1aaa 100644 Binary files a/assets/voxygen/voxel/armor/swift/pants.vox and b/assets/voxygen/voxel/armor/hide/leather/pants.vox differ diff --git a/assets/voxygen/voxel/armor/agile/shoulder.vox b/assets/voxygen/voxel/armor/hide/leather/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/shoulder.vox rename to assets/voxygen/voxel/armor/hide/leather/shoulder.vox diff --git a/assets/voxygen/voxel/armor/hide/primal/back.vox b/assets/voxygen/voxel/armor/hide/primal/back.vox new file mode 100644 index 0000000000..d1b3869686 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/primal/back.vox differ diff --git a/assets/voxygen/voxel/armor/hide/primal/belt.vox b/assets/voxygen/voxel/armor/hide/primal/belt.vox new file mode 100644 index 0000000000..9b9befaef9 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/primal/belt.vox differ diff --git a/assets/voxygen/voxel/armor/hide/primal/chest.vox b/assets/voxygen/voxel/armor/hide/primal/chest.vox new file mode 100644 index 0000000000..c66aa998f1 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/primal/chest.vox differ diff --git a/assets/voxygen/voxel/armor/hide/primal/foot.vox b/assets/voxygen/voxel/armor/hide/primal/foot.vox new file mode 100644 index 0000000000..ecd5679ad3 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/primal/foot.vox differ diff --git a/assets/voxygen/voxel/armor/hide/primal/hand.vox b/assets/voxygen/voxel/armor/hide/primal/hand.vox new file mode 100644 index 0000000000..f1b9a5760b Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/primal/hand.vox differ diff --git a/assets/voxygen/voxel/armor/hide/primal/pants.vox b/assets/voxygen/voxel/armor/hide/primal/pants.vox new file mode 100644 index 0000000000..ca42554b89 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/primal/pants.vox differ diff --git a/assets/voxygen/voxel/armor/hide/primal/shoulder.vox b/assets/voxygen/voxel/armor/hide/primal/shoulder.vox new file mode 100644 index 0000000000..c09526385e Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/primal/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/swift/belt.vox b/assets/voxygen/voxel/armor/hide/rawhide/back.vox similarity index 56% rename from assets/voxygen/voxel/armor/swift/belt.vox rename to assets/voxygen/voxel/armor/hide/rawhide/back.vox index 62a0a2bc8d..2e939ecbb7 100644 Binary files a/assets/voxygen/voxel/armor/swift/belt.vox and b/assets/voxygen/voxel/armor/hide/rawhide/back.vox differ diff --git a/assets/voxygen/voxel/armor/hide/rawhide/belt.vox b/assets/voxygen/voxel/armor/hide/rawhide/belt.vox new file mode 100644 index 0000000000..f23b51fbfa Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/rawhide/belt.vox differ diff --git a/assets/voxygen/voxel/armor/swift/chest.vox b/assets/voxygen/voxel/armor/hide/rawhide/chest.vox similarity index 96% rename from assets/voxygen/voxel/armor/swift/chest.vox rename to assets/voxygen/voxel/armor/hide/rawhide/chest.vox index 64ecd13f0f..ac9882bf3d 100644 Binary files a/assets/voxygen/voxel/armor/swift/chest.vox and b/assets/voxygen/voxel/armor/hide/rawhide/chest.vox differ diff --git a/assets/voxygen/voxel/armor/agile/foot.vox b/assets/voxygen/voxel/armor/hide/rawhide/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/foot.vox rename to assets/voxygen/voxel/armor/hide/rawhide/foot.vox diff --git a/assets/voxygen/voxel/armor/agile/hand.vox b/assets/voxygen/voxel/armor/hide/rawhide/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/hand.vox rename to assets/voxygen/voxel/armor/hide/rawhide/hand.vox diff --git a/assets/voxygen/voxel/armor/agile/pants.vox b/assets/voxygen/voxel/armor/hide/rawhide/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/pants.vox rename to assets/voxygen/voxel/armor/hide/rawhide/pants.vox diff --git a/assets/voxygen/voxel/armor/hide/rawhide/shoulder.vox b/assets/voxygen/voxel/armor/hide/rawhide/shoulder.vox new file mode 100644 index 0000000000..8d641b72eb Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/rawhide/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/hide/scale/back.vox b/assets/voxygen/voxel/armor/hide/scale/back.vox new file mode 100644 index 0000000000..e849dd0832 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/scale/back.vox differ diff --git a/assets/voxygen/voxel/armor/hide/scale/belt.vox b/assets/voxygen/voxel/armor/hide/scale/belt.vox new file mode 100644 index 0000000000..2037c3417c Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/scale/belt.vox differ diff --git a/assets/voxygen/voxel/armor/hide/scale/chest.vox b/assets/voxygen/voxel/armor/hide/scale/chest.vox new file mode 100644 index 0000000000..dab455182a Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/scale/chest.vox differ diff --git a/assets/voxygen/voxel/armor/hide/scale/foot.vox b/assets/voxygen/voxel/armor/hide/scale/foot.vox new file mode 100644 index 0000000000..752ea354b2 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/scale/foot.vox differ diff --git a/assets/voxygen/voxel/armor/hide/scale/hand.vox b/assets/voxygen/voxel/armor/hide/scale/hand.vox new file mode 100644 index 0000000000..faac5be38a Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/scale/hand.vox differ diff --git a/assets/voxygen/voxel/armor/hide/scale/pants.vox b/assets/voxygen/voxel/armor/hide/scale/pants.vox new file mode 100644 index 0000000000..f62edc336f Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/scale/pants.vox differ diff --git a/assets/voxygen/voxel/armor/hide/scale/shoulder.vox b/assets/voxygen/voxel/armor/hide/scale/shoulder.vox new file mode 100644 index 0000000000..48af06c087 Binary files /dev/null and b/assets/voxygen/voxel/armor/hide/scale/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bloodsteel/back.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/back.vox new file mode 100644 index 0000000000..6ad59af8f9 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bloodsteel/back.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bloodsteel/belt.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/belt.vox new file mode 100644 index 0000000000..409465b511 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bloodsteel/belt.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bloodsteel/chest.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/chest.vox new file mode 100644 index 0000000000..4c3e065f04 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bloodsteel/chest.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bloodsteel/foot.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/foot.vox new file mode 100644 index 0000000000..98d0d305a1 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bloodsteel/foot.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bloodsteel/hand.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/hand.vox new file mode 100644 index 0000000000..45cbbcc256 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bloodsteel/hand.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bloodsteel/pants.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/pants.vox new file mode 100644 index 0000000000..e38f17df16 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bloodsteel/pants.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bloodsteel/shoulder.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/shoulder.vox new file mode 100644 index 0000000000..8525247217 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bloodsteel/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bronze/back.vox b/assets/voxygen/voxel/armor/mail/bronze/back.vox new file mode 100644 index 0000000000..a8872dd70d Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bronze/back.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bronze/belt.vox b/assets/voxygen/voxel/armor/mail/bronze/belt.vox new file mode 100644 index 0000000000..7835aae514 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bronze/belt.vox differ diff --git a/assets/voxygen/voxel/armor/plate/chest.vox b/assets/voxygen/voxel/armor/mail/bronze/chest.vox similarity index 71% rename from assets/voxygen/voxel/armor/plate/chest.vox rename to assets/voxygen/voxel/armor/mail/bronze/chest.vox index 684ecca3c7..b04b078fa3 100644 Binary files a/assets/voxygen/voxel/armor/plate/chest.vox and b/assets/voxygen/voxel/armor/mail/bronze/chest.vox differ diff --git a/assets/voxygen/voxel/armor/plate/foot.vox b/assets/voxygen/voxel/armor/mail/bronze/foot.vox similarity index 53% rename from assets/voxygen/voxel/armor/plate/foot.vox rename to assets/voxygen/voxel/armor/mail/bronze/foot.vox index c9d0c1c64a..92d85fe76b 100644 Binary files a/assets/voxygen/voxel/armor/plate/foot.vox and b/assets/voxygen/voxel/armor/mail/bronze/foot.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bronze/hand.vox b/assets/voxygen/voxel/armor/mail/bronze/hand.vox new file mode 100644 index 0000000000..0a5c5d7f25 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bronze/hand.vox differ diff --git a/assets/voxygen/voxel/armor/plate/pants.vox b/assets/voxygen/voxel/armor/mail/bronze/pants.vox similarity index 57% rename from assets/voxygen/voxel/armor/plate/pants.vox rename to assets/voxygen/voxel/armor/mail/bronze/pants.vox index 04ddec0cc3..7e802aa7b3 100644 Binary files a/assets/voxygen/voxel/armor/plate/pants.vox and b/assets/voxygen/voxel/armor/mail/bronze/pants.vox differ diff --git a/assets/voxygen/voxel/armor/mail/bronze/shoulder.vox b/assets/voxygen/voxel/armor/mail/bronze/shoulder.vox new file mode 100644 index 0000000000..e1efdcef0f Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/bronze/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/mail/cobalt/back.vox b/assets/voxygen/voxel/armor/mail/cobalt/back.vox new file mode 100644 index 0000000000..f5044a2f76 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/cobalt/back.vox differ diff --git a/assets/voxygen/voxel/armor/mail/cobalt/belt.vox b/assets/voxygen/voxel/armor/mail/cobalt/belt.vox new file mode 100644 index 0000000000..fb52dc1af6 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/cobalt/belt.vox differ diff --git a/assets/voxygen/voxel/armor/mail/cobalt/chest.vox b/assets/voxygen/voxel/armor/mail/cobalt/chest.vox new file mode 100644 index 0000000000..52a5c391a3 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/cobalt/chest.vox differ diff --git a/assets/voxygen/voxel/armor/mail/cobalt/foot.vox b/assets/voxygen/voxel/armor/mail/cobalt/foot.vox new file mode 100644 index 0000000000..41b530fa92 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/cobalt/foot.vox differ diff --git a/assets/voxygen/voxel/armor/mail/cobalt/hand.vox b/assets/voxygen/voxel/armor/mail/cobalt/hand.vox new file mode 100644 index 0000000000..db5e570279 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/cobalt/hand.vox differ diff --git a/assets/voxygen/voxel/armor/mail/cobalt/pants.vox b/assets/voxygen/voxel/armor/mail/cobalt/pants.vox new file mode 100644 index 0000000000..d868a8b388 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/cobalt/pants.vox differ diff --git a/assets/voxygen/voxel/armor/mail/cobalt/shoulder.vox b/assets/voxygen/voxel/armor/mail/cobalt/shoulder.vox new file mode 100644 index 0000000000..9176445270 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/cobalt/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/mail/iron/back.vox b/assets/voxygen/voxel/armor/mail/iron/back.vox new file mode 100644 index 0000000000..2e858357b5 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/iron/back.vox differ diff --git a/assets/voxygen/voxel/armor/mail/iron/belt.vox b/assets/voxygen/voxel/armor/mail/iron/belt.vox new file mode 100644 index 0000000000..9e0073f8a9 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/iron/belt.vox differ diff --git a/assets/voxygen/voxel/armor/mail/iron/chest.vox b/assets/voxygen/voxel/armor/mail/iron/chest.vox new file mode 100644 index 0000000000..2e30238b5a Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/iron/chest.vox differ diff --git a/assets/voxygen/voxel/armor/mail/iron/foot.vox b/assets/voxygen/voxel/armor/mail/iron/foot.vox new file mode 100644 index 0000000000..1e5d504d50 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/iron/foot.vox differ diff --git a/assets/voxygen/voxel/armor/mail/iron/hand.vox b/assets/voxygen/voxel/armor/mail/iron/hand.vox new file mode 100644 index 0000000000..5f630f7cf6 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/iron/hand.vox differ diff --git a/assets/voxygen/voxel/armor/mail/iron/pants.vox b/assets/voxygen/voxel/armor/mail/iron/pants.vox new file mode 100644 index 0000000000..55e0dfb2a5 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/iron/pants.vox differ diff --git a/assets/voxygen/voxel/armor/mail/iron/shoulder.vox b/assets/voxygen/voxel/armor/mail/iron/shoulder.vox new file mode 100644 index 0000000000..4decbaf1dc Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/iron/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/mail/orichalcum/back.vox b/assets/voxygen/voxel/armor/mail/orichalcum/back.vox new file mode 100644 index 0000000000..5cc1791196 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/orichalcum/back.vox differ diff --git a/assets/voxygen/voxel/armor/mail/orichalcum/belt.vox b/assets/voxygen/voxel/armor/mail/orichalcum/belt.vox new file mode 100644 index 0000000000..6d1fa76529 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/orichalcum/belt.vox differ diff --git a/assets/voxygen/voxel/armor/mail/orichalcum/chest.vox b/assets/voxygen/voxel/armor/mail/orichalcum/chest.vox new file mode 100644 index 0000000000..4d65576714 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/orichalcum/chest.vox differ diff --git a/assets/voxygen/voxel/armor/mail/orichalcum/foot.vox b/assets/voxygen/voxel/armor/mail/orichalcum/foot.vox new file mode 100644 index 0000000000..376dbce376 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/orichalcum/foot.vox differ diff --git a/assets/voxygen/voxel/armor/mail/orichalcum/hand.vox b/assets/voxygen/voxel/armor/mail/orichalcum/hand.vox new file mode 100644 index 0000000000..32b95bc419 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/orichalcum/hand.vox differ diff --git a/assets/voxygen/voxel/armor/mail/orichalcum/pants.vox b/assets/voxygen/voxel/armor/mail/orichalcum/pants.vox new file mode 100644 index 0000000000..0a6d459724 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/orichalcum/pants.vox differ diff --git a/assets/voxygen/voxel/armor/mail/orichalcum/shoulder.vox b/assets/voxygen/voxel/armor/mail/orichalcum/shoulder.vox new file mode 100644 index 0000000000..856ffd6e88 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/orichalcum/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/mail/steel/back.vox b/assets/voxygen/voxel/armor/mail/steel/back.vox new file mode 100644 index 0000000000..c1fe07a97d Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/steel/back.vox differ diff --git a/assets/voxygen/voxel/armor/steel/belt.vox b/assets/voxygen/voxel/armor/mail/steel/belt.vox similarity index 52% rename from assets/voxygen/voxel/armor/steel/belt.vox rename to assets/voxygen/voxel/armor/mail/steel/belt.vox index f74708f9ea..aef6b1cabb 100644 Binary files a/assets/voxygen/voxel/armor/steel/belt.vox and b/assets/voxygen/voxel/armor/mail/steel/belt.vox differ diff --git a/assets/voxygen/voxel/armor/steel/chest.vox b/assets/voxygen/voxel/armor/mail/steel/chest.vox similarity index 71% rename from assets/voxygen/voxel/armor/steel/chest.vox rename to assets/voxygen/voxel/armor/mail/steel/chest.vox index c61d68b9bf..81cf4eb705 100644 Binary files a/assets/voxygen/voxel/armor/steel/chest.vox and b/assets/voxygen/voxel/armor/mail/steel/chest.vox differ diff --git a/assets/voxygen/voxel/armor/steel/foot.vox b/assets/voxygen/voxel/armor/mail/steel/foot.vox similarity index 87% rename from assets/voxygen/voxel/armor/steel/foot.vox rename to assets/voxygen/voxel/armor/mail/steel/foot.vox index 0a54072247..3a34a5537a 100644 Binary files a/assets/voxygen/voxel/armor/steel/foot.vox and b/assets/voxygen/voxel/armor/mail/steel/foot.vox differ diff --git a/assets/voxygen/voxel/armor/steel/hand.vox b/assets/voxygen/voxel/armor/mail/steel/hand.vox similarity index 69% rename from assets/voxygen/voxel/armor/steel/hand.vox rename to assets/voxygen/voxel/armor/mail/steel/hand.vox index 9f29e826f0..1ee7faf158 100644 Binary files a/assets/voxygen/voxel/armor/steel/hand.vox and b/assets/voxygen/voxel/armor/mail/steel/hand.vox differ diff --git a/assets/voxygen/voxel/armor/mail/steel/pants.vox b/assets/voxygen/voxel/armor/mail/steel/pants.vox new file mode 100644 index 0000000000..2e0e3497a9 Binary files /dev/null and b/assets/voxygen/voxel/armor/mail/steel/pants.vox differ diff --git a/assets/voxygen/voxel/armor/steel/shoulder.vox b/assets/voxygen/voxel/armor/mail/steel/shoulder.vox similarity index 50% rename from assets/voxygen/voxel/armor/steel/shoulder.vox rename to assets/voxygen/voxel/armor/mail/steel/shoulder.vox index 7f1f21731e..5578b50863 100644 Binary files a/assets/voxygen/voxel/armor/steel/shoulder.vox and b/assets/voxygen/voxel/armor/mail/steel/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/plate/belt.vox b/assets/voxygen/voxel/armor/plate/belt.vox deleted file mode 100644 index 7d8ea804e8..0000000000 Binary files a/assets/voxygen/voxel/armor/plate/belt.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/plate/hand.vox b/assets/voxygen/voxel/armor/plate/hand.vox deleted file mode 100644 index 5540fffa95..0000000000 Binary files a/assets/voxygen/voxel/armor/plate/hand.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/plate/shoulder.vox b/assets/voxygen/voxel/armor/plate/shoulder.vox deleted file mode 100644 index d665704b8b..0000000000 Binary files a/assets/voxygen/voxel/armor/plate/shoulder.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/savage/back.vox b/assets/voxygen/voxel/armor/savage/back.vox new file mode 100644 index 0000000000..c8ed83cf86 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/back.vox differ diff --git a/assets/voxygen/voxel/armor/savage/belt.vox b/assets/voxygen/voxel/armor/savage/belt.vox new file mode 100644 index 0000000000..6f26b6a1e2 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/belt.vox differ diff --git a/assets/voxygen/voxel/armor/savage/chest.vox b/assets/voxygen/voxel/armor/savage/chest.vox new file mode 100644 index 0000000000..5987d9a856 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/chest.vox differ diff --git a/assets/voxygen/voxel/armor/savage/foot.vox b/assets/voxygen/voxel/armor/savage/foot.vox new file mode 100644 index 0000000000..1ef779ff90 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/foot.vox differ diff --git a/assets/voxygen/voxel/armor/savage/hand.vox b/assets/voxygen/voxel/armor/savage/hand.vox new file mode 100644 index 0000000000..ea7fa833e0 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/hand.vox differ diff --git a/assets/voxygen/voxel/armor/savage/pants.vox b/assets/voxygen/voxel/armor/savage/pants.vox new file mode 100644 index 0000000000..91ba6091f2 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/pants.vox differ diff --git a/assets/voxygen/voxel/armor/savage/shoulder.vox b/assets/voxygen/voxel/armor/savage/shoulder.vox new file mode 100644 index 0000000000..34546b7c23 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/steel/pants.vox b/assets/voxygen/voxel/armor/steel/pants.vox deleted file mode 100644 index d790632484..0000000000 Binary files a/assets/voxygen/voxel/armor/steel/pants.vox and /dev/null differ diff --git a/assets/voxygen/voxel/armor/swift/shoulder.vox b/assets/voxygen/voxel/armor/swift/shoulder.vox deleted file mode 100644 index 9f7c968e73..0000000000 Binary files a/assets/voxygen/voxel/armor/swift/shoulder.vox and /dev/null differ diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 831bec2328..4cf216a2b6 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -571,6 +571,10 @@ vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)), color: None ), + "common.items.weapons.hammer.burnt_drumstick": ( + vox_spec: ("weapon.hammer.burnt_drumstick", (-3.0, -6.0, -5.0)), + color: None + ), /*"Craftsman": ( //TODO This should be a 1h hammer! vox_spec: ("weapon.hammer.craftsman", (-2.0, -5.0, -5.5)), color: None @@ -971,10 +975,14 @@ color: None ), // Picks - "common.items.tool.pick": ( + "common.items.tool.pickaxe_stone": ( vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)), color: None ), + "common.items.tool.pickaxe_steel": ( + vox_spec: ("weapon.tool.pickaxe_green-1", (-1.5, -9.5, -4.0)), + color: None + ), // Misc "common.items.debug.admin_stick": ( vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index 2b242dbaae..61f2a8225d 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -20,10 +20,6 @@ vox_spec: ("armor.misc.back.short-1", (-5.0, -1.0, -11.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.back", (-5.0, -1.0, -11.0)), - color: None - ), "Ferocious": ( vox_spec: ("armor.ferocious.back", (-5.0, -1.5, -14.0)), color: None @@ -52,5 +48,81 @@ vox_spec: ("armor.warlock.back", (-5.0, -1.5, -15.5)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.0, -6.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)), + color: None + ), + "Scale": ( + vox_spec: ("armor.hide.scale.back", (-5.0, -2.0, -10.5)), + color: None + ), + "Carapace": ( + vox_spec: ("armor.hide.carapace.back", (-5.0, -1.5, -10.5)), + color: None + ), + "Primal": ( + vox_spec: ("armor.hide.primal.back", (-5.0, -4.5, -10.5)), + color: None + ), + "Dragonscale": ( + vox_spec: ("armor.hide.dragonscale.back", (-7.0, -2.5, -12.0)), + color: None + ), + "Savage": ( + vox_spec: ("armor.savage.back", (-5.0, -2.5, -11.0)), + color: None + ), + "Linen": ( + vox_spec: ("armor.cloth.linen.back", (-4.0, -2.5, -8.5)), + color: None + ), + "Woolen": ( + vox_spec: ("armor.cloth.woolen.back", (-5.0, -2.5, -8.5)), + color: None + ), + "Silken": ( + vox_spec: ("armor.cloth.silken.back", (-4.0, -2.5, -11.5)), + color: None + ), + "Druid": ( + vox_spec: ("armor.cloth.druid.back", (-5.0, -2.5, -11.0)), + color: None + ), + "Moonweave": ( + vox_spec: ("armor.cloth.moonweave.back", (-4.0, -2.0, -12.5)), + color: None + ), + "Sunsilk": ( + vox_spec: ("armor.cloth.sunsilk.back", (-5.0, -1.5, -12.5)), + color: None + ), + "Bronze": ( + vox_spec: ("armor.mail.bronze.back", (-4.0, -2.5, -7.0)), + color: None + ), + "Iron": ( + vox_spec: ("armor.mail.iron.back", (-4.0, -2.5, -10.0)), + color: None + ), + "Steel": ( + vox_spec: ("armor.mail.steel.back", (-4.0, -2.5, -12.0)), + color: None + ), + "Cobalt": ( + vox_spec: ("armor.mail.cobalt.back", (-4.0, -2.5, -12.0)), + color: None + ), + "Bloodsteel": ( + vox_spec: ("armor.mail.bloodsteel.back", (-3.5, -2.5, -12.0)), + color: None + ), + "Orichalcum": ( + vox_spec: ("armor.mail.orichalcum.back", (-5.0, -4.5, -12.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index b16a29bee0..3678edd514 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -28,14 +28,6 @@ vox_spec: ("armor.ferocious.belt", (-4.0, -3.5, -1.0)), color: None ), - "Plate": ( - vox_spec: ("armor.plate.belt", (-5.0, -3.5, 2.0)), - color: None - ), - "Swift": ( - vox_spec: ("armor.swift.belt", (-5.0, -3.5, 2.0)), - color: None - ), "ClothPurple": ( vox_spec: ("armor.cloth_purple.belt", (-5.0, -3.5, 2.0)), color: None @@ -52,22 +44,10 @@ vox_spec: ("armor.cultist.belt", (-5.0, -3.5, 1.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.belt", (-5.0, -3.5, 2.0)), - color: None - ), - "Steel": ( - vox_spec: ("armor.steel.belt", (-5.0, -4.5, 2.0)), - color: None - ), "LeatherPlate": ( vox_spec: ("armor.leather_plate.belt", (-4.0, -4.5, 2.0)), color: None ), - "Druid": ( - vox_spec: ("armor.druid.belt", (-4.0, -3.5, -1.0)), - color: None - ), "Twigs": ( vox_spec: ("armor.twigs.belt", (-4.0, -3.5, -1.0)), color: None @@ -100,5 +80,81 @@ vox_spec: ("armor.warlock.belt", (-4.0, -3.0, 2.0)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.belt", (-4.0, -3.5, 2.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.belt", (-5.0, -3.5, 2.0)), + color: None + ), + "Scale":( + vox_spec: ("armor.hide.scale.belt", (-4.0, -3.5, 2.0)), + color: None + ), + "Carapace":( + vox_spec: ("armor.hide.carapace.belt", (-4.0, -4.0, 1.5)), + color: None + ), + "Primal":( + vox_spec: ("armor.hide.primal.belt", (-4.0, -4.0, 1.0)), + color: None + ), + "Dragonscale":( + vox_spec: ("armor.hide.dragonscale.belt", (-4.0, -3.5, 1.5)), + color: None + ), + "Savage":( + vox_spec: ("armor.savage.belt", (-4.0, -4.0, 1.0)), + color: None + ), + "Linen":( + vox_spec: ("armor.cloth.linen.belt", (-4.0, -4.0, 0.0)), + color: None + ), + "Woolen":( + vox_spec: ("armor.cloth.woolen.belt", (-4.0, -4.0, 1.0)), + color: None + ), + "Silken":( + vox_spec: ("armor.cloth.silken.belt", (-4.0, -3.5, -3.0)), + color: None + ), + "Druid":( + vox_spec: ("armor.cloth.druid.belt", (-4.0, -4.0, -0.5)), + color: None + ), + "Moonweave":( + vox_spec: ("armor.cloth.moonweave.belt", (-4.0, -3.5, 1.0)), + color: None + ), + "Sunsilk":( + vox_spec: ("armor.cloth.sunsilk.belt", (-4.0, -3.5, -2.5)), + color: None + ), + "Bronze":( + vox_spec: ("armor.mail.bronze.belt", (-4.0, -4.0, 2.0)), + color: None + ), + "Iron":( + vox_spec: ("armor.mail.iron.belt", (-4.0, -4.0, 2.0)), + color: None + ), + "Steel":( + vox_spec: ("armor.mail.steel.belt", (-5.0, -4.0, 1.0)), + color: None + ), + "Cobalt":( + vox_spec: ("armor.mail.cobalt.belt", (-5.0, -4.0, 1.0)), + color: None + ), + "Bloodsteel":( + vox_spec: ("armor.mail.bloodsteel.belt", (-5.0, -3.5, 1.0)), + color: None + ), + "Orichalcum":( + vox_spec: ("armor.mail.orichalcum.belt", (-4.0, -3.5, 1.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 8b624b319f..cbe2304567 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -40,18 +40,10 @@ vox_spec: ("armor.misc.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)), color: None ), - "Plate": ( - vox_spec: ("armor.plate.chest", (-7.0, -3.5, 2.0)), - color: None - ), "PlateRed": ( vox_spec: ("armor.misc.chest.plate_grey", (-7.0, -3.5, 2.0)), color: Some((124, 38, 46)) ), - "Swift": ( - vox_spec: ("armor.swift.chest", (-7.0, -3.5, 2.0)), - color: None - ), "LeatherBlue": ( vox_spec: ("armor.leather_blue.chest", (-7.0, -3.5, 2.0)), color: None @@ -117,10 +109,6 @@ vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)), color: Some((135, 82, 67)) ), - "Druid": ( - vox_spec: ("armor.druid.chest", (-7.0, -3.5, 2.0)), - color: None - ), "Twigs": ( vox_spec: ("armor.twigs.chest", (-7.0, -3.5, 2.0)), color: None @@ -138,18 +126,10 @@ vox_spec: ("armor.cultist.chest", (-7.0, -3.5, 2.0)), color: Some((30, 0, 64)) ), - "Steel": ( - vox_spec: ("armor.steel.chest", (-8.0, -4.5, 2.0)), - color: None - ), "LeatherPlate": ( vox_spec: ("armor.leather_plate.chest", (-8.0, -5.5, 2.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.chest", (-7.0, -3.5, 2.0)), - color: None - ), "Tarasque":( vox_spec: ("armor.tarasque.chest", (-8.0, -4.5, 2.0)), color: None @@ -170,5 +150,81 @@ vox_spec: ("armor.warlock.chest", (-7.0, -3.5, 0.5)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.chest", (-7.0, -3.5, 2.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.chest", (-7.0, -3.5, 2.0)), + color: None + ), + "Scale": ( + vox_spec: ("armor.hide.scale.chest", (-7.0, -3.5, 2.0)), + color: None + ), + "Carapace": ( + vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 1.5)), + color: None + ), + "Primal": ( + vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 0.5)), + color: None + ), + "Dragonscale": ( + vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 1.5)), + color: None + ), + "Savage": ( + vox_spec: ("armor.hide.savage.chest", (-7.0, -4.0, 1.0)), + color: None + ), + "Linen": ( + vox_spec: ("armor.cloth.linen.chest", (-7.0, -4.0, 2.0)), + color: None + ), + "Woolen": ( + vox_spec: ("armor.cloth.woolen.chest", (-7.0, -4.0, 1.0)), + color: None + ), + "Silken": ( + vox_spec: ("armor.cloth.silken.chest", (-7.0, -4.0, 1.0)), + color: None + ), + "Druid": ( + vox_spec: ("armor.cloth.druid.chest", (-7.0, -4.0, 2.0)), + color: None + ), + "Moonweave": ( + vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -4.0, 1.0)), + color: None + ), + "Sunsilk": ( + vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -4.0, 1.0)), + color: None + ), + "Bronze": ( + vox_spec: ("armor.mail.bronze.chest", (-7.0, -4.0, 2.0)), + color: None + ), + "Iron": ( + vox_spec: ("armor.mail.iron.chest", (-7.0, -4.0, 2.0)), + color: None + ), + "Steel": ( + vox_spec: ("armor.mail.steel.chest", (-8.0, -4.0, 1.0)), + color: None + ), + "Cobalt": ( + vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.0, 1.0)), + color: None + ), + "Bloodsteel": ( + vox_spec: ("armor.mail.bloodsteel.chest", (-8.0, -4.0, 1.0)), + color: None + ), + "Orichalcum": ( + vox_spec: ("armor.mail.orichalcum.chest", (-7.0, -4.0, 1.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index f41ee92a53..5895fd0204 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -16,14 +16,6 @@ vox_spec: ("armor.misc.foot.dark_jester_elf", (-2.5, -3.0, -2.0)), color: None ), - "Plate": ( - vox_spec: ("armor.plate.foot", (-2.5, -3.5, -2.0)), - color: None - ), - "Swift": ( - vox_spec: ("armor.swift.foot", (-2.5, -3.5, -2.0)), - color: None - ), "ClothPurple": ( vox_spec: ("armor.cloth_purple.foot", (-2.5, -3.5, -2.0)), color: None @@ -48,26 +40,14 @@ vox_spec: ("armor.cultist.foot", (-2.5, -3.5, -2.0)), color: None ), - "Steel": ( - vox_spec: ("armor.steel.foot", (-2.5, -3.5, -2.0)), - color: None - ), "LeatherPlate": ( vox_spec: ("armor.leather_plate.foot", (-2.5, -3.5, -2.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.foot", (-2.5, -3.5, -2.0)), - color: None - ), "Jackalope": ( vox_spec: ("armor.misc.foot.jackalope", (-2.5, -3.5, -2.0)), color: None ), - "Druid": ( - vox_spec: ("armor.druid.foot", (-2.5, -3.5, -2.0)), - color: None - ), "Twigs": ( vox_spec: ("armor.twigs.foot", (-2.5, -3.5, -2.0)), color: None @@ -100,5 +80,81 @@ vox_spec: ("armor.warlock.foot", (-2.5, -3.5, -2.0)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Scale": ( + vox_spec: ("armor.hide.scale.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Carapace": ( + vox_spec: ("armor.hide.carapace.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Primal": ( + vox_spec: ("armor.hide.primal.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Dragonscale": ( + vox_spec: ("armor.hide.dragonscale.foot", (-2.5, -5.5, -2.0)), + color: None + ), + "Savage": ( + vox_spec: ("armor.savage.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Linen": ( + vox_spec: ("armor.cloth.linen.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Woolen": ( + vox_spec: ("armor.cloth.woolen.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Silken": ( + vox_spec: ("armor.cloth.silken.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Druid": ( + vox_spec: ("armor.cloth.druid.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Moonweave": ( + vox_spec: ("armor.cloth.moonweave.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Sunsilk": ( + vox_spec: ("armor.cloth.sunsilk.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Bronze": ( + vox_spec: ("armor.mail.bronze.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Iron": ( + vox_spec: ("armor.mail.iron.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Steel": ( + vox_spec: ("armor.mail.steel.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Cobalt": ( + vox_spec: ("armor.mail.cobalt.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Bloodsteel": ( + vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Orichalcum": ( + vox_spec: ("armor.mail.orichalcum.foot", (-2.5, -3.5, -2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index a95bd554a6..de569659e1 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -40,26 +40,6 @@ color: None ) ), - "Plate": ( - left: ( - vox_spec: ("armor.plate.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.plate.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), - "Swift": ( - left: ( - vox_spec: ("armor.swift.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.swift.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), "ClothPurple": ( left: ( vox_spec: ("armor.cloth_purple.hand", (-1.5, -1.5, -2.5)), @@ -100,16 +80,6 @@ color: Some((30, 0, 64)) ) ), - "Steel": ( - left: ( - vox_spec: ("armor.steel.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.steel.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), "LeatherPlate": ( left: ( vox_spec: ("armor.leather_plate.hand", (-1.5, -1.5, -2.5)), @@ -120,26 +90,6 @@ color: None ) ), - "Agile": ( - left: ( - vox_spec: ("armor.agile.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.agile.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), - "Druid": ( - left: ( - vox_spec: ("armor.druid.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.druid.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), "Twigs": ( left: ( vox_spec: ("armor.twigs.hand", (-1.5, -1.5, -2.5)), @@ -220,5 +170,195 @@ color: None ) ), + "Rawhide": ( + left: ( + vox_spec: ("armor.hide.rawhide.hand", (-1.5, -1.5, -2.5)), + color: None + ), + right: ( + vox_spec: ("armor.hide.rawhide.hand", (-1.5, -1.5, -2.5)), + color: None + ) + ), + "Leather": ( + left: ( + vox_spec: ("armor.hide.leather.hand", (-1.5, -1.5, -2.5)), + color: None + ), + right: ( + vox_spec: ("armor.hide.leather.hand", (-1.5, -1.5, -2.5)), + color: None + ) + ), + "Scale": ( + left: ( + vox_spec: ("armor.hide.scale.hand", (-3.5, -1.5, -2.5)), + color: None + ), + right: ( + vox_spec: ("armor.hide.scale.hand", (-1.5, -1.5, -2.5)), + color: None + ) + ), + "Carapace": ( + left: ( + vox_spec: ("armor.hide.carapace.hand", (-3.5, -2.5, -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.hide.carapace.hand", (-1.5, -2.5, -3.0)), + color: None + ) + ), + "Primal": ( + left: ( + vox_spec: ("armor.hide.primal.hand", (-3.5, -3.5, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.hide.primal.hand", (-1.5, -3.5, -4.0)), + color: None + ) + ), + "Dragonscale": ( + left: ( + vox_spec: ("armor.hide.dragonscale.hand", (-5.0, -1.5, -3.5)), + color: None + ), + right: ( + vox_spec: ("armor.hide.dragonscale.hand", (-2.0, -1.5, -3.5)), + color: None + ) + ), + "Savage": ( + left: ( + vox_spec: ("armor.savage.hand", (-2.5, -3.0, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.savage.hand", (-1.5, -3.0, -4.0)), + color: None + ) + ), + "Linen": ( + left: ( + vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)), + color: None + ) + ), + "Woolen": ( + left: ( + vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)), + color: None + ) + ), + "Silken": ( + left: ( + vox_spec: ("armor.cloth.silken.hand", (-2.5, -2.5, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.silken.hand", (-1.5, -2.5, -4.0)), + color: None + ) + ), + "Druid": ( + left: ( + vox_spec: ("armor.cloth.druid.hand", (-2.5, -1.0, -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.druid.hand", (-1.5, -1.0, -3.0)), + color: None + ) + ), + "Moonweave": ( + left: ( + vox_spec: ("armor.cloth.moonweave.hand", (-2.5, -2.0, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.moonweave.hand", (-1.5, -2.0, -4.0)), + color: None + ) + ), + "Sunsilk": ( + left: ( + vox_spec: ("armor.cloth.sunsilk.hand", (-2.5, -2.5, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.sunsilk.hand", (-1.5, -2.5, -4.0)), + color: None + ) + ), + "Bronze": ( + left: ( + vox_spec: ("armor.mail.bronze.hand", (-2.5, -2.0, -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.bronze.hand", (-1.5, -2.0, -3.0)), + color: None + ) + ), + "Iron": ( + left: ( + vox_spec: ("armor.mail.iron.hand", (-2.5, -1.0, -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.iron.hand", (-1.5, -1.0, -3.0)), + color: None + ) + ), + "Steel": ( + left: ( + vox_spec: ("armor.mail.steel.hand", (-2.5, -1.0, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.steel.hand", (-1.5, -1.0, -4.0)), + color: None + ) + ), + "Cobalt": ( + left: ( + vox_spec: ("armor.mail.cobalt.hand", (-2.5, -2.0, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.cobalt.hand", (-1.5, -2.0, -4.0)), + color: None + ) + ), + "Bloodsteel": ( + left: ( + vox_spec: ("armor.mail.bloodsteel.hand", (-5.0, -1.0, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.bloodsteel.hand", (-1.0, -1.0, -4.0)), + color: None + ) + ), + "Orichalcum": ( + left: ( + vox_spec: ("armor.mail.orichalcum.hand", (-4.5, -2.0, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.orichalcum.hand", (-1.5, -2.0, -4.0)), + color: None + ) + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index fde3b5b2cb..c92c63f592 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -36,18 +36,10 @@ vox_spec: ("armor.ferocious.pants", (-5.0, -3.5, 1.0)), color: None ), - "Plate": ( - vox_spec: ("armor.plate.pants", (-5.0, -3.5, 1.0)), - color: None - ), "PlateRed": ( vox_spec: ("armor.misc.pants.plate_grey", (-5.0, -3.5, 1.0)), color: Some((124, 38, 46)) ), - "Swift": ( - vox_spec: ("armor.swift.pants", (-5.0, -3.5, 1.0)), - color: None - ), "ClothPurple": ( vox_spec: ("armor.cloth_purple.pants", (-5.0, -3.5, 0.0)), color: None @@ -76,22 +68,10 @@ vox_spec: ("armor.cultist.pants", (-5.0, -3.5, 1.0)), color: Some((30, 0, 64)) ), - "Steel": ( - vox_spec: ("armor.steel.pants", (-6.0, -4.5, 1.0)), - color: None - ), "LeatherPlate": ( vox_spec: ("armor.leather_plate.pants", (-5.0, -4.5, 1.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.pants", (-5.0, -3.5, 1.0)), - color: None - ), - "Druid": ( - vox_spec: ("armor.druid.pants", (-5.0, -3.5, -1.0)), - color: None - ), "Twigs": ( vox_spec: ("armor.twigs.pants", (-5.0, -3.5, 0.0)), color: None @@ -128,5 +108,81 @@ vox_spec: ("armor.warlock.pants", (-5.0, -4.0, -2.0)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.pants", (-5.0, -3.5, 1.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.pants", (-5.0, -3.5, 1.0)), + color: None + ), + "Scale": ( + vox_spec: ("armor.hide.scale.pants", (-5.0, -4.0, 0.0)), + color: None + ), + "Carapace": ( + vox_spec: ("armor.hide.carapace.pants", (-6.0, -4.0, 0.5)), + color: None + ), + "Primal": ( + vox_spec: ("armor.hide.primal.pants", (-6.0, -4.0, 0.0)), + color: None + ), + "Dragonscale": ( + vox_spec: ("armor.hide.dragonscale.pants", (-5.0, -3.5, -1.5)), + color: None + ), + "Savage": ( + vox_spec: ("armor.savage.pants", (-5.0, -4.0, 0.5)), + color: None + ), + "Linen": ( + vox_spec: ("armor.cloth.linen.pants", (-5.0, -4.0, 0.5)), + color: None + ), + "Woolen": ( + vox_spec: ("armor.cloth.woolen.pants", (-6.0, -5.0, 0.5)), + color: None + ), + "Silken": ( + vox_spec: ("armor.cloth.silken.pants", (-5.0, -4.0, 0.5)), + color: None + ), + "Druid": ( + vox_spec: ("armor.cloth.druid.pants", (-5.0, -4.0, 0.5)), + color: None + ), + "Moonweave": ( + vox_spec: ("armor.cloth.moonweave.pants", (-6.0, -5.5, 0.5)), + color: None + ), + "Sunsilk": ( + vox_spec: ("armor.cloth.sunsilk.pants", (-6.0, -5.0, 0.5)), + color: None + ), + "Bronze": ( + vox_spec: ("armor.mail.bronze.pants", (-5.0, -4.0, 1.0)), + color: None + ), + "Iron": ( + vox_spec: ("armor.mail.iron.pants", (-5.0, -4.0, 1.5)), + color: None + ), + "Steel": ( + vox_spec: ("armor.mail.steel.pants", (-6.0, -4.0, 0.0)), + color: None + ), + "Cobalt": ( + vox_spec: ("armor.mail.cobalt.pants", (-6.0, -5.0, 0.5)), + color: None + ), + "Bloodsteel": ( + vox_spec: ("armor.mail.bloodsteel.pants", (-7.0, -4.0, 0.5)), + color: None + ), + "Orichalcum": ( + vox_spec: ("armor.mail.orichalcum.pants", (-6.0, -4.0, 0.5)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 2c25cce062..5203c3c5d8 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -51,26 +51,6 @@ color: None ) ), - "Plate": ( - left: ( - vox_spec: ("armor.plate.shoulder", (-3.6, -3.5, -0.0)), - color: None - ), - right: ( - vox_spec: ("armor.plate.shoulder", (-2.6, -3.5, 0.0)), - color: None - ) - ), - "Swift": ( - left: ( - vox_spec: ("armor.swift.shoulder", (-3.2, -3.5, 0.0)), - color: None - ), - right: ( - vox_spec: ("armor.swift.shoulder", (-1.4, -3.5, 0.0)), - color: None - ) - ), "ClothPurple": ( left: ( vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)), @@ -111,16 +91,6 @@ color: Some((30, 0, 64)) ) ), - "Steel": ( - left: ( - vox_spec: ("armor.steel.shoulder", (-5.0, -4.5 , 0.0)), - color: None - ), - right: ( - vox_spec: ("armor.steel.shoulder", (-1.0, -4.5, 0.0)), - color: None - ) - ), "LeatherPlate": ( left: ( vox_spec: ("armor.leather_plate.shoulder", (-4.0, -4.5 , 0.0)), @@ -131,16 +101,6 @@ color: None ) ), - "Agile": ( - left: ( - vox_spec: ("armor.agile.shoulder", (-5.0, -3.8, -0.9)), - color: None - ), - right: ( - vox_spec: ("armor.agile.shoulder", (-1.0, -3.8, -0.9)), - color: None - ) - ), "Twigs": ( left: ( vox_spec: ("armor.twigs.shoulder", (-5.0, -4.5 , -1.0)), @@ -241,16 +201,6 @@ color: None ) ), - "Druid": ( - left: ( - vox_spec: ("armor.druid.shoulder", (-4.0, -4.5 , -3.0)), - color: None - ), - right: ( - vox_spec: ("armor.druid.shoulder", (-2.0, -4.5, -3.0)), - color: None - ) - ), "Tarasque": ( left: ( vox_spec: ("armor.tarasque.shoulder", (-5.0, -3.5 , 0.0)), @@ -301,5 +251,195 @@ color: None ) ), + "Rawhide": ( + left: ( + vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.2, -0.5)), + color: None + ), + right: ( + vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.2, -0.5)), + color: None + ) + ), + "Leather": ( + left: ( + vox_spec: ("armor.hide.leather.shoulder", (-5.5, -3.2, -1.8)), + color: None + ), + right: ( + vox_spec: ("armor.hide.leather.shoulder", (-0.5, -3.2, -1.8)), + color: None + ) + ), + "Scale": ( + left: ( + vox_spec: ("armor.hide.scale.shoulder", (-3.2, -3.5 , 0.0)), + color: None + ), + right: ( + vox_spec: ("armor.hide.scale.shoulder", (-1.4, -3.5, -0.5)), + color: None + ) + ), + "Carapace": ( + left: ( + vox_spec: ("armor.hide.carapace.shoulder", (-6.0, -4.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.hide.carapace.shoulder", (-1.0, -4.0, -2.0)), + color: None + ) + ), + "Primal": ( + left: ( + vox_spec: ("armor.hide.primal.shoulder", (-6.0, -4.0 , -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.hide.primal.shoulder", (-1.0, -4.0, -3.0)), + color: None + ) + ), + "Dragonscale": ( + left: ( + vox_spec: ("armor.hide.dragonscale.shoulder", (-9.0, -3.5 , -1.0)), + color: None + ), + right: ( + vox_spec: ("armor.hide.dragonscale.shoulder", (0.0, -3.5, -1.0)), + color: None + ) + ), + "Savage": ( + left: ( + vox_spec: ("armor.savage.shoulder", (-5.5, -4.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.savage.shoulder", (-0.5, -4.0, -2.0)), + color: None + ) + ), + "Linen": ( + left: ( + vox_spec: ("armor.cloth.linen.shoulder", (-3.5, -4.0 , -1.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.linen.shoulder", (-0.5, -4.0, -1.0)), + color: None + ) + ), + "Woolen": ( + left: ( + vox_spec: ("armor.cloth.woolen.shoulder", (-5.5, -4.0 , -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.woolen.shoulder", (-0.5, -4.0, -3.0)), + color: None + ) + ), + "Silken": ( + left: ( + vox_spec: ("armor.cloth.silken.shoulder", (-5.0, -4.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.silken.shoulder", (-1.0, -4.0, -2.0)), + color: None + ) + ), + "Druid": ( + left: ( + vox_spec: ("armor.cloth.druid.shoulder", (-4.5, -4.0 , -3.5)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.druid.shoulder", (-1.5, -4.0, -3.5)), + color: None + ) + ), + "Moonweave": ( + left: ( + vox_spec: ("armor.cloth.moonweave.shoulder", (-4.5, -4.0 , -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.moonweave.shoulder", (-1.5, -4.0, -3.0)), + color: None + ) + ), + "Sunsilk": ( + left: ( + vox_spec: ("armor.cloth.sunsilk.shoulder", (-6.5, -4.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.cloth.sunsilk.shoulder", (-0.5, -4.0, -2.0)), + color: None + ) + ), + "Bronze": ( + left: ( + vox_spec: ("armor.mail.bronze.shoulder", (-4.5, -4.0 , 0.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.bronze.shoulder", (-1.5, -4.0, 0.0)), + color: None + ) + ), + "Iron": ( + left: ( + vox_spec: ("armor.mail.iron.shoulder", (-5.5, -4.0 , -1.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.iron.shoulder", (-0.5, -4.0, -1.0)), + color: None + ) + ), + "Steel": ( + left: ( + vox_spec: ("armor.mail.steel.shoulder", (-5.5, -3.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.steel.shoulder", (-1.5, -3.0, -2.0)), + color: None + ) + ), + "Cobalt": ( + left: ( + vox_spec: ("armor.mail.cobalt.shoulder", (-5.5, -4.0 , -1.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.cobalt.shoulder", (-1.5, -4.0, -1.0)), + color: None + ) + ), + "Bloodsteel": ( + left: ( + vox_spec: ("armor.mail.bloodsteel.shoulder", (-6.5, -5.0 , -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.bloodsteel.shoulder", (-2.5, -5.0, -3.0)), + color: None + ) + ), + "Orichalcum": ( + left: ( + vox_spec: ("armor.mail.orichalcum.shoulder", (-7.5, -3.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.mail.orichalcum.shoulder", (-1.5, -3.0, -2.0)), + color: None + ) + ), }, )) diff --git a/assets/voxygen/voxel/object/forge.vox b/assets/voxygen/voxel/object/forge.vox new file mode 100644 index 0000000000..981b674981 Binary files /dev/null and b/assets/voxygen/voxel/object/forge.vox differ diff --git a/assets/voxygen/voxel/object/loom.vox b/assets/voxygen/voxel/object/loom.vox new file mode 100644 index 0000000000..8ddfe8ee22 Binary files /dev/null and b/assets/voxygen/voxel/object/loom.vox differ diff --git a/assets/voxygen/voxel/object/meat_drop.vox b/assets/voxygen/voxel/object/meat_drop.vox deleted file mode 100644 index 33e19adb7c..0000000000 Binary files a/assets/voxygen/voxel/object/meat_drop.vox and /dev/null differ diff --git a/assets/voxygen/voxel/object/spinning_wheel.vox b/assets/voxygen/voxel/object/spinning_wheel.vox new file mode 100644 index 0000000000..54dc8cd970 Binary files /dev/null and b/assets/voxygen/voxel/object/spinning_wheel.vox differ diff --git a/assets/voxygen/voxel/object/steak.vox b/assets/voxygen/voxel/object/steak.vox deleted file mode 100644 index 2556308b70..0000000000 Binary files a/assets/voxygen/voxel/object/steak.vox and /dev/null differ diff --git a/assets/voxygen/voxel/object/tanning_rack.vox b/assets/voxygen/voxel/object/tanning_rack.vox new file mode 100644 index 0000000000..e4e535faa1 Binary files /dev/null and b/assets/voxygen/voxel/object/tanning_rack.vox differ diff --git a/assets/voxygen/voxel/object_manifest.ron b/assets/voxygen/voxel/object_manifest.ron index cb43158072..54f85607bb 100644 --- a/assets/voxygen/voxel/object_manifest.ron +++ b/assets/voxygen/voxel/object_manifest.ron @@ -629,20 +629,20 @@ central: ("armor.empty"), ) ), - MeatDrop: ( + ToughMeat: ( bone0: ( - offset: (-3.5, -8.0, 0.0), - central: ("object.meat_drop"), + offset: (-4.5, -4.0, 0.0), + central: ("sprite.food.meat.tough_raw"), ), bone1: ( offset: (0.0, 0.0, 0.0), central: ("armor.empty"), ) ), - Steak: ( + BeastMeat: ( bone0: ( - offset: (-3.5, -6.0, 0.0), - central: ("object.steak"), + offset: (-6.5, -4.5, 0.0), + central: ("sprite.food.meat.beast_large_raw"), ), bone1: ( offset: (0.0, 0.0, 0.0), @@ -719,6 +719,36 @@ central: ("armor.empty"), ) ), + BirdMeat: ( + bone0: ( + offset: (-5.5, -3.0, 0.0), + central: ("sprite.food.meat.bird_raw"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), + FishMeat: ( + bone0: ( + offset: (-5.5, -5.5, 0.0), + central: ("sprite.food.meat.fish_raw"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), + SmallMeat: ( + bone0: ( + offset: (-6.5, -3.5, 0.0), + central: ("sprite.food.meat.beast_small_raw"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), Snowball: ( bone0: ( offset: (-12.5, -12.5, 0.0), diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-0.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-0.vox new file mode 100644 index 0000000000..485e28bfd0 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mold-0.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-1.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-1.vox new file mode 100644 index 0000000000..480521da66 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mold-1.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-2.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-2.vox new file mode 100644 index 0000000000..191b621f48 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mold-2.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-3.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-3.vox new file mode 100644 index 0000000000..fd82da750c Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mold-3.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-4.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-4.vox new file mode 100644 index 0000000000..bf3ffe5819 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mold-4.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-5.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-5.vox new file mode 100644 index 0000000000..203f3f919c Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mold-5.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-6.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-6.vox new file mode 100644 index 0000000000..d8384ad8e3 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mold-6.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-0.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-0.vox new file mode 100644 index 0000000000..18b9459758 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-0.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-1.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-1.vox new file mode 100644 index 0000000000..4d8b25ce57 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-1.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-2.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-2.vox new file mode 100644 index 0000000000..4539e2d468 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-2.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-3.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-3.vox new file mode 100644 index 0000000000..98aa67c699 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/mushroom-3.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/orb-0.vox b/assets/voxygen/voxel/sprite/cave/ceiling/orb-0.vox new file mode 100644 index 0000000000..19b823e904 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/orb-0.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/orb-1.vox b/assets/voxygen/voxel/sprite/cave/ceiling/orb-1.vox new file mode 100644 index 0000000000..c8cf1fe96d Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/orb-1.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/orb-2.vox b/assets/voxygen/voxel/sprite/cave/ceiling/orb-2.vox new file mode 100644 index 0000000000..23c2053d8c Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/orb-2.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/orb-3.vox b/assets/voxygen/voxel/sprite/cave/ceiling/orb-3.vox new file mode 100644 index 0000000000..2168cce5d9 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/ceiling/orb-3.vox differ diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox b/assets/voxygen/voxel/sprite/cave/mushroom-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox rename to assets/voxygen/voxel/sprite/cave/mushroom-0.vox diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox b/assets/voxygen/voxel/sprite/cave/mushroom-1.vox similarity index 100% rename from assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox rename to assets/voxygen/voxel/sprite/cave/mushroom-1.vox diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox b/assets/voxygen/voxel/sprite/cave/mushroom-2.vox similarity index 100% rename from assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox rename to assets/voxygen/voxel/sprite/cave/mushroom-2.vox diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox b/assets/voxygen/voxel/sprite/cave/mushroom-3.vox similarity index 100% rename from assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox rename to assets/voxygen/voxel/sprite/cave/mushroom-3.vox diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox b/assets/voxygen/voxel/sprite/cave/mushroom-4.vox similarity index 100% rename from assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox rename to assets/voxygen/voxel/sprite/cave/mushroom-4.vox diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox b/assets/voxygen/voxel/sprite/cave/mushroom-5.vox similarity index 100% rename from assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox rename to assets/voxygen/voxel/sprite/cave/mushroom-5.vox diff --git a/assets/voxygen/voxel/sprite/cave/mushroom-6.vox b/assets/voxygen/voxel/sprite/cave/mushroom-6.vox new file mode 100644 index 0000000000..e105e735df Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/mushroom-6.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/mushroom-7.vox b/assets/voxygen/voxel/sprite/cave/mushroom-7.vox new file mode 100644 index 0000000000..2097fa6d92 Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/mushroom-7.vox differ diff --git a/assets/voxygen/voxel/sprite/cave/mushroom-8.vox b/assets/voxygen/voxel/sprite/cave/mushroom-8.vox new file mode 100644 index 0000000000..082c6e701d Binary files /dev/null and b/assets/voxygen/voxel/sprite/cave/mushroom-8.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/claw.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/claw.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/claw.vox rename to assets/voxygen/voxel/sprite/crafting_ing/animal_misc/claw.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/fur.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/fur.vox new file mode 100644 index 0000000000..bf4c6baee1 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/fur.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/grim_eyeball.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/grim_eyeball.vox new file mode 100644 index 0000000000..ad29af5c55 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/grim_eyeball.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/large_horn.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/large_horn.vox new file mode 100644 index 0000000000..e586173180 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/large_horn.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/lively_vine.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/lively_vine.vox new file mode 100644 index 0000000000..5ec86365a0 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/lively_vine.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/phoenix_feather.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/phoenix_feather.vox new file mode 100644 index 0000000000..33efca811c Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/phoenix_feather.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/sharp_fang.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/sharp_fang.vox new file mode 100644 index 0000000000..be9a7f4878 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/sharp_fang.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/venom_sac.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/venom_sac.vox new file mode 100644 index 0000000000..1944cb30b0 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/venom_sac.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/ooze.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/viscous_ooze.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/ooze.vox rename to assets/voxygen/voxel/sprite/crafting_ing/animal_misc/viscous_ooze.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/cotton.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/cotton.vox new file mode 100644 index 0000000000..1aed7481be Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cloth/cotton.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/lifecloth.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/lifecloth.vox new file mode 100644 index 0000000000..95cdc63eaa Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cloth/lifecloth.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/linen.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/linen.vox new file mode 100644 index 0000000000..435a6d476c Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cloth/linen.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/linen_red.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/linen_red.vox new file mode 100644 index 0000000000..e44fde5fe8 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cloth/linen_red.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/moonweave.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/moonweave.vox new file mode 100644 index 0000000000..ba4e587346 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cloth/moonweave.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/silk.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/silk.vox new file mode 100644 index 0000000000..64d4b0ba1e Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cloth/silk.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/sunsilk.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/sunsilk.vox new file mode 100644 index 0000000000..7c53233462 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cloth/sunsilk.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/wool.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/wool.vox new file mode 100644 index 0000000000..055eaf94ee Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cloth/wool.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cotton_boll.vox b/assets/voxygen/voxel/sprite/crafting_ing/cotton_boll.vox new file mode 100644 index 0000000000..d6fa8f00b7 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/cotton_boll.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/pelt.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/animal_hide.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/pelt.vox rename to assets/voxygen/voxel/sprite/crafting_ing/hide/animal_hide.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/hide/carapace.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/carapace.vox new file mode 100644 index 0000000000..dd0df135c1 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/hide/carapace.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/dragon_scale.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/dragon_scale.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/dragon_scale.vox rename to assets/voxygen/voxel/sprite/crafting_ing/hide/dragon_scale.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/plate.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/plate.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/plate.vox rename to assets/voxygen/voxel/sprite/crafting_ing/hide/plate.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/hide/rugged.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/rugged.vox new file mode 100644 index 0000000000..165a1f57bb Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/hide/rugged.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/hide/rugged_hide.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/rugged_hide.vox new file mode 100644 index 0000000000..473af5dedb Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/hide/rugged_hide.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/scale.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/scale.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/scale.vox rename to assets/voxygen/voxel/sprite/crafting_ing/hide/scale.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/hide/tough_hide.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/tough_hide.vox new file mode 100644 index 0000000000..30a2cdfabb Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/hide/tough_hide.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/hide/troll_hide.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/troll_hide.vox new file mode 100644 index 0000000000..7f7074a346 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/hide/troll_hide.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/leather/leather_strips.vox b/assets/voxygen/voxel/sprite/crafting_ing/leather/leather_strips.vox new file mode 100644 index 0000000000..f47304480a Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/leather/leather_strips.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/leather/rigid.vox b/assets/voxygen/voxel/sprite/crafting_ing/leather/rigid.vox new file mode 100644 index 0000000000..c0a3215199 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/leather/rigid.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/leather/rigid_leather.vox b/assets/voxygen/voxel/sprite/crafting_ing/leather/rigid_leather.vox new file mode 100644 index 0000000000..c5e1a1bd96 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/leather/rigid_leather.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/leather/simple_leather.vox b/assets/voxygen/voxel/sprite/crafting_ing/leather/simple_leather.vox new file mode 100644 index 0000000000..ee375fe2ae Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/leather/simple_leather.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/leather/thick_leather.vox b/assets/voxygen/voxel/sprite/crafting_ing/leather/thick_leather.vox new file mode 100644 index 0000000000..53d8ec898a Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/leather/thick_leather.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/plant_fiber.vox b/assets/voxygen/voxel/sprite/crafting_ing/plant_fiber.vox new file mode 100644 index 0000000000..798837e693 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/plant_fiber.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/sticky_thread.vox b/assets/voxygen/voxel/sprite/crafting_ing/sticky_thread.vox new file mode 100644 index 0000000000..8ac10c9ca6 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/sticky_thread.vox differ diff --git a/assets/voxygen/voxel/sprite/flowers/cotton.vox b/assets/voxygen/voxel/sprite/flowers/cotton.vox new file mode 100644 index 0000000000..b0743ba5cc Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/cotton.vox differ diff --git a/assets/voxygen/voxel/sprite/flowers/flax.vox b/assets/voxygen/voxel/sprite/flowers/flax.vox new file mode 100644 index 0000000000..f625a576cc Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/flax.vox differ diff --git a/assets/voxygen/voxel/sprite/flowers/moonbell.vox b/assets/voxygen/voxel/sprite/flowers/moonbell.vox new file mode 100644 index 0000000000..194448c22d Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/moonbell.vox differ diff --git a/assets/voxygen/voxel/sprite/flowers/pyrebloom.vox b/assets/voxygen/voxel/sprite/flowers/pyrebloom.vox new file mode 100644 index 0000000000..b9d6cd695a Binary files /dev/null and b/assets/voxygen/voxel/sprite/flowers/pyrebloom.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox new file mode 100644 index 0000000000..71e8a5bccd Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox b/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox new file mode 100644 index 0000000000..2649293118 Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox new file mode 100644 index 0000000000..fd4f55aa0e Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox b/assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox new file mode 100644 index 0000000000..f2d70218cd Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/bird_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/bird_cooked.vox new file mode 100644 index 0000000000..dceca80f85 Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/bird_cooked.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/bird_large_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/bird_large_cooked.vox new file mode 100644 index 0000000000..c2084ab465 Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/bird_large_cooked.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/bird_large_raw.vox b/assets/voxygen/voxel/sprite/food/meat/bird_large_raw.vox new file mode 100644 index 0000000000..770c4ffac9 Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/bird_large_raw.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/bird_raw.vox b/assets/voxygen/voxel/sprite/food/meat/bird_raw.vox new file mode 100644 index 0000000000..a0dc01fbb6 Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/bird_raw.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox new file mode 100644 index 0000000000..f536d494c9 Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat_fish.vox b/assets/voxygen/voxel/sprite/food/meat/fish_raw.vox similarity index 100% rename from assets/voxygen/voxel/sprite/food/meat_fish.vox rename to assets/voxygen/voxel/sprite/food/meat/fish_raw.vox diff --git a/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox new file mode 100644 index 0000000000..9a1783d376 Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox differ diff --git a/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox b/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox new file mode 100644 index 0000000000..d5ca5e5daa Binary files /dev/null and b/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/bloodstone.vox b/assets/voxygen/voxel/sprite/mineral/deposit/bloodstone.vox new file mode 100644 index 0000000000..acda9b9c25 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/bloodstone.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/coal.vox b/assets/voxygen/voxel/sprite/mineral/deposit/coal.vox new file mode 100644 index 0000000000..b2da7668e2 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/coal.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/cobalt.vox b/assets/voxygen/voxel/sprite/mineral/deposit/cobalt.vox new file mode 100644 index 0000000000..a731ee0fc0 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/cobalt.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/copper.vox b/assets/voxygen/voxel/sprite/mineral/deposit/copper.vox new file mode 100644 index 0000000000..10da182202 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/copper.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-0.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-0.vox new file mode 100644 index 0000000000..e2285cfe35 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-0.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-1.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-1.vox new file mode 100644 index 0000000000..381dfd52a4 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-1.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-2.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-2.vox new file mode 100644 index 0000000000..9d7779bfbf Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/blue-2.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-0.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-0.vox new file mode 100644 index 0000000000..bdbeb5fd62 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-0.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-1.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-1.vox new file mode 100644 index 0000000000..11719bc081 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-1.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-2.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-2.vox new file mode 100644 index 0000000000..d1426e7a9d Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/green-2.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-0.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-0.vox new file mode 100644 index 0000000000..12aee999db Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-0.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-1.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-1.vox new file mode 100644 index 0000000000..6a6790bbb4 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-1.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-2.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-2.vox new file mode 100644 index 0000000000..9e54b16024 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-2.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-3.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-3.vox new file mode 100644 index 0000000000..f911e5ac6d Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/ceiling/purple-3.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-0.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-0.vox new file mode 100644 index 0000000000..fd68b9f2ee Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-0.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-1.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-1.vox new file mode 100644 index 0000000000..8bc6c82aaf Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-1.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-2.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-2.vox new file mode 100644 index 0000000000..b4344ae618 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/blue-2.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-0.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-0.vox new file mode 100644 index 0000000000..7355c9f611 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-0.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-1.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-1.vox new file mode 100644 index 0000000000..4a45548a0a Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-1.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-2.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-2.vox new file mode 100644 index 0000000000..3652ade7a7 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/green-2.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-0.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-0.vox new file mode 100644 index 0000000000..f3619b0425 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-0.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-1.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-1.vox new file mode 100644 index 0000000000..92332fb881 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-1.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-2.vox b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-2.vox new file mode 100644 index 0000000000..60e18f25c6 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/crystal/floor/purple-2.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/gold.vox b/assets/voxygen/voxel/sprite/mineral/deposit/gold.vox new file mode 100644 index 0000000000..9e3a3531a6 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/gold.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/iron.vox b/assets/voxygen/voxel/sprite/mineral/deposit/iron.vox new file mode 100644 index 0000000000..5242b4756d Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/iron.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/silver.vox b/assets/voxygen/voxel/sprite/mineral/deposit/silver.vox new file mode 100644 index 0000000000..89fa659249 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/silver.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/tin.vox b/assets/voxygen/voxel/sprite/mineral/deposit/tin.vox new file mode 100644 index 0000000000..920c00f3f1 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/deposit/tin.vox differ diff --git a/assets/voxygen/voxel/sprite/gem/amethyst-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/amethyst-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/amethyst-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/amethyst-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/amethyst_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/amethyst_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/amethystgem.vox b/assets/voxygen/voxel/sprite/mineral/gem/amethystgem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/amethystgem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/amethystgem.vox diff --git a/assets/voxygen/voxel/sprite/gem/diamond-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/diamond-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/diamond-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/diamond-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/diamond_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/diamond_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/diamond_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/diamond_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/diamondgem.vox b/assets/voxygen/voxel/sprite/mineral/gem/diamondgem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/diamondgem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/diamondgem.vox diff --git a/assets/voxygen/voxel/sprite/gem/emerald-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/emerald-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/emerald-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/emerald-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/emerald_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/emerald_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/emerald_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/emerald_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/emeraldgem.vox b/assets/voxygen/voxel/sprite/mineral/gem/emeraldgem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/emeraldgem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/emeraldgem.vox diff --git a/assets/voxygen/voxel/sprite/gem/gem_blue.vox b/assets/voxygen/voxel/sprite/mineral/gem/gem_blue.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/gem_blue.vox rename to assets/voxygen/voxel/sprite/mineral/gem/gem_blue.vox diff --git a/assets/voxygen/voxel/sprite/gem/gem_green.vox b/assets/voxygen/voxel/sprite/mineral/gem/gem_green.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/gem_green.vox rename to assets/voxygen/voxel/sprite/mineral/gem/gem_green.vox diff --git a/assets/voxygen/voxel/sprite/gem/gem_red.vox b/assets/voxygen/voxel/sprite/mineral/gem/gem_red.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/gem_red.vox rename to assets/voxygen/voxel/sprite/mineral/gem/gem_red.vox diff --git a/assets/voxygen/voxel/sprite/gem/ruby-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/ruby-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/ruby-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/ruby-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/ruby_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/ruby_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/ruby_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/ruby_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/rubygem.vox b/assets/voxygen/voxel/sprite/mineral/gem/rubygem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/rubygem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/rubygem.vox diff --git a/assets/voxygen/voxel/sprite/gem/sapphire-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/sapphire-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/sapphire-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/sapphire-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/sapphire_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/sapphire_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/sapphiregem.vox b/assets/voxygen/voxel/sprite/mineral/gem/sapphiregem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/sapphiregem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/sapphiregem.vox diff --git a/assets/voxygen/voxel/sprite/gem/topaz-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/topaz-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/topaz-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/topaz-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/topaz_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/topaz_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/topaz_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/topaz_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/topazgem.vox b/assets/voxygen/voxel/sprite/mineral/gem/topazgem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/topazgem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/topazgem.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/bloodsteel.vox b/assets/voxygen/voxel/sprite/mineral/ingot/bloodsteel.vox new file mode 100644 index 0000000000..166cabacbc Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ingot/bloodsteel.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/bronze.vox b/assets/voxygen/voxel/sprite/mineral/ingot/bronze.vox new file mode 100644 index 0000000000..95b90a068c Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ingot/bronze.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/cobalt.vox b/assets/voxygen/voxel/sprite/mineral/ingot/cobalt.vox new file mode 100644 index 0000000000..9dd89f7121 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ingot/cobalt.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/copper.vox b/assets/voxygen/voxel/sprite/mineral/ingot/copper.vox new file mode 100644 index 0000000000..e6fc42c02c Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ingot/copper.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/gold_ingot.vox b/assets/voxygen/voxel/sprite/mineral/ingot/gold.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/gold_ingot.vox rename to assets/voxygen/voxel/sprite/mineral/ingot/gold.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/iron.vox b/assets/voxygen/voxel/sprite/mineral/ingot/iron.vox new file mode 100644 index 0000000000..b929114b1a Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ingot/iron.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox b/assets/voxygen/voxel/sprite/mineral/ingot/orichalcum.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox rename to assets/voxygen/voxel/sprite/mineral/ingot/orichalcum.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox b/assets/voxygen/voxel/sprite/mineral/ingot/silver.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox rename to assets/voxygen/voxel/sprite/mineral/ingot/silver.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/steel.vox b/assets/voxygen/voxel/sprite/mineral/ingot/steel.vox new file mode 100644 index 0000000000..2d1585e753 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ingot/steel.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/tin.vox b/assets/voxygen/voxel/sprite/mineral/ingot/tin.vox new file mode 100644 index 0000000000..84674c92e6 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ingot/tin.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/ore/bloodstone.vox b/assets/voxygen/voxel/sprite/mineral/ore/bloodstone.vox new file mode 100644 index 0000000000..e573ce4106 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ore/bloodstone.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/ore/coal.vox b/assets/voxygen/voxel/sprite/mineral/ore/coal.vox new file mode 100644 index 0000000000..657527cd4b Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ore/coal.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/ore/cobalt.vox b/assets/voxygen/voxel/sprite/mineral/ore/cobalt.vox new file mode 100644 index 0000000000..8e6b38496d Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ore/cobalt.vox differ diff --git a/assets/voxygen/voxel/sprite/mineral/ore/copper.vox b/assets/voxygen/voxel/sprite/mineral/ore/copper.vox new file mode 100644 index 0000000000..fe85326d9a Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ore/copper.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/gold_ore_drop.vox b/assets/voxygen/voxel/sprite/mineral/ore/gold.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/gold_ore_drop.vox rename to assets/voxygen/voxel/sprite/mineral/ore/gold.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ore/iron.vox b/assets/voxygen/voxel/sprite/mineral/ore/iron.vox new file mode 100644 index 0000000000..46b2c18734 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ore/iron.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox b/assets/voxygen/voxel/sprite/mineral/ore/silver.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox rename to assets/voxygen/voxel/sprite/mineral/ore/silver.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ore/tin.vox b/assets/voxygen/voxel/sprite/mineral/ore/tin.vox new file mode 100644 index 0000000000..27d3e3ce90 Binary files /dev/null and b/assets/voxygen/voxel/sprite/mineral/ore/tin.vox differ diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 0e997614ec..8ca8d3bbb2 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -41,7 +41,6 @@ Window4: Some(( ], wind_sway: 0.0, )), - // Cacti LargeCactus: Some(( variations: [ @@ -108,7 +107,6 @@ ShortFlatCactus: Some(( ], wind_sway: 0.0, )), - // Flowers BlueFlower: Some(( variations: [ @@ -325,8 +323,6 @@ Sunflower: Some(( ], wind_sway: 0.1, )), - - // Grass LongGrass: Some(( variations: [ @@ -448,7 +444,6 @@ LargeGrass: Some(( ], wind_sway: 0.5, )), - // Fruit Apple: Some(( variations: [ @@ -460,7 +455,6 @@ Apple: Some(( ], wind_sway: 0.0, )), - // Mushrooms Mushroom: Some(( variations: [ @@ -522,44 +516,138 @@ Mushroom: Some(( ], wind_sway: 0.1, )), - // Cave Mushrooms CaveMushroom: Some(( variations: [ ( - model: "voxygen.voxel.sprite.mushrooms.mushroom-11", + model: "voxygen.voxel.sprite.cave.mushroom-0", offset: (-8.0, -8.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.mushrooms.mushroom-12", + model: "voxygen.voxel.sprite.cave.mushroom-1", offset: (-5.0, -5.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.mushrooms.mushroom-13", + model: "voxygen.voxel.sprite.cave.mushroom-2", offset: (-5.5, -5.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.mushrooms.mushroom-14", + model: "voxygen.voxel.sprite.cave.mushroom-3", offset: (-2.5, -2.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.mushrooms.mushroom-15", + model: "voxygen.voxel.sprite.cave.mushroom-4", offset: (-1.5, -1.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.mushrooms.mushroom-16", + model: "voxygen.voxel.sprite.cave.mushroom-5", offset: (-5.5, -5.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), + ( + model: "voxygen.voxel.sprite.cave.mushroom-6", + offset: (-8.5, -8.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.mushroom-7", + offset: (-11.5, -11.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.mushroom-8", + offset: (-12.5, -15.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +)), +// Ceiling Mushrooms +CeilingMushroom: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.cave.ceiling.mushroom-0", + offset: (-8.0, -8.0, -22.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mushroom-1", + offset: (-8.5, -8.5, -9.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mushroom-2", + offset: (-11.5, -11.5, -17.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mold-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mold-1", + offset: (-5.5, -5.5, -7.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mold-2", + offset: (-5.5, -5.5, -7.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mold-3", + offset: (-5.5, -5.5, 2.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mold-4", + offset: (-2.0, -2.0, -49.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mold-5", + offset: (-2.0, -2.0, -79.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.mold-6", + offset: (-2.0, -2.0, -79.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +)), +Orb: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.cave.ceiling.orb-0", + offset: (-8.0, -8.0, -79.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.orb-1", + offset: (-8.0, -8.0, -20.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.orb-2", + offset: (-8.0, -8.0, -65.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cave.ceiling.orb-3", + offset: (-8.0, -8.0, -44.0), + lod_axes: (1.0, 1.0, 1.0), + ), ], wind_sway: 0.0, )), - // Lianas, Liana: Some(( variations: [ @@ -574,9 +662,8 @@ Liana: Some(( lod_axes: (0.0, 0.0, 0.5), ), ], - wind_sway: 0.05, + wind_sway: 0.0, )), - // Velorite Velorite: Some(( variations: [ @@ -643,7 +730,6 @@ VeloriteFrag: Some(( ], wind_sway: 0.0, )), - // Chests Chest: Some(( variations: [ @@ -670,7 +756,6 @@ Chest: Some(( ], wind_sway: 0.0, )), - // Dungeon Chests DungeonChest0: Some(( variations: [ @@ -732,7 +817,6 @@ DungeonChest5: Some(( ], wind_sway: 0.0, )), - // Welwitch Welwitch: Some(( variations: [ @@ -744,7 +828,6 @@ Welwitch: Some(( ], wind_sway: 0.1, )), - // Pumpkins Pumpkin: Some(( variations: [ @@ -786,7 +869,6 @@ Pumpkin: Some(( ], wind_sway: 0.0, )), - // Lingonberries LingonBerry: Some(( variations: [ @@ -808,7 +890,6 @@ LingonBerry: Some(( ], wind_sway: 0.0, )), - // Leafy Plants LeafyPlant: Some(( variations: [ @@ -865,7 +946,6 @@ LeafyPlant: Some(( ], wind_sway: 0.4, )), - // Ferns Fern: Some(( variations: [ @@ -937,7 +1017,6 @@ Fern: Some(( ], wind_sway: 0.4, )), - // Savanna Flora SavannaGrass: Some(( variations: [ @@ -1079,7 +1158,6 @@ SavannaBush: Some(( ], wind_sway: 0.1, )), - // Dead Bush DeadBush: Some(( variations: [ @@ -1106,7 +1184,6 @@ DeadBush: Some(( ], wind_sway: 0.1, )), - // Blueberries // NOTE: Why are these commented out? Blueberry: None/* ( @@ -1159,7 +1236,6 @@ Blueberry: None/* ( ], wind_sway: 0.0, )*/, - // Ember Ember: Some(( variations: [ @@ -1171,7 +1247,6 @@ Ember: Some(( ], wind_sway: 0.8, )), - // Corn Corn: Some(( variations: [ @@ -1208,7 +1283,6 @@ Corn: Some(( ], wind_sway: 0.4, )), - // Yellow Wheat WheatYellow: Some(( variations: [ @@ -1265,7 +1339,6 @@ WheatYellow: Some(( ], wind_sway: 0.4, )), - // Green Wheat WheatGreen: Some(( variations: [ @@ -1322,7 +1395,6 @@ WheatGreen: Some(( ], wind_sway: 0.4, )), - // Cabbage Cabbage: Some(( variations: [ @@ -1344,7 +1416,6 @@ Cabbage: Some(( ], wind_sway: 0.0, )), - // Flax Flax: Some(( variations: [ @@ -1381,7 +1452,6 @@ Flax: Some(( ], wind_sway: 0.4, )), - // Carrot Carrot: Some(( variations: [ @@ -1418,7 +1488,6 @@ Carrot: Some(( ], wind_sway: 0.1, )), - // Tomato Tomato: Some(( variations: [ @@ -1450,7 +1519,6 @@ Tomato: Some(( ], wind_sway: 0.0, )), - // Radish Radish: Some(( variations: [ @@ -1482,7 +1550,6 @@ Radish: Some(( ], wind_sway: 0.1, )), - // Turnip Turnip: Some(( variations: [ @@ -1519,7 +1586,6 @@ Turnip: Some(( ], wind_sway: 0.1, )), - // Coconut Coconut: Some(( variations: [ @@ -1531,7 +1597,6 @@ Coconut: Some(( ], wind_sway: 0.0, )), - // Scarecrow Scarecrow: Some(( variations: [ @@ -1543,7 +1608,6 @@ Scarecrow: Some(( ], wind_sway: 0.0, )), - // Street Light StreetLamp: Some(( variations: [ @@ -1566,7 +1630,6 @@ StreetLampTall: Some(( ], wind_sway: 0.0, )), - // Door Door: Some(( variations: [ @@ -1578,7 +1641,6 @@ Door: Some(( ], wind_sway: 0.0, )), - // Bed Bed: Some(( variations: [ @@ -1590,7 +1652,6 @@ Bed: Some(( ], wind_sway: 0.0, )), - // Bench Bench: Some(( variations: [ @@ -1602,7 +1663,6 @@ Bench: Some(( ], wind_sway: 0.0, )), - // Chair ChairSingle: Some(( variations: [ @@ -1634,7 +1694,6 @@ ChairDouble: Some(( ], wind_sway: 0.0, )), - // CoatRack CoatRack: Some(( variations: [ @@ -1651,7 +1710,6 @@ CoatRack: Some(( ], wind_sway: 0.0, )), - // Crate Crate: Some(( variations: [ @@ -1693,7 +1751,6 @@ Crate: Some(( ], wind_sway: 0.0, )), - // DrawerLarge DrawerLarge: Some(( variations: [ @@ -1710,7 +1767,6 @@ DrawerLarge: Some(( ], wind_sway: 0.0, )), - // DrawerMedium DrawerMedium: Some(( variations: [ @@ -1727,7 +1783,6 @@ DrawerMedium: Some(( ], wind_sway: 0.0, )), - // DrawerSmall DrawerSmall: Some(( variations: [ @@ -1744,7 +1799,6 @@ DrawerSmall: Some(( ], wind_sway: 0.0, )), - // DungeonWallDecor DungeonWallDecor: Some(( variations: [ @@ -1801,7 +1855,6 @@ DungeonWallDecor: Some(( ], wind_sway: 0.0, )), - // HangingBasket HangingBasket: Some(( variations: [ @@ -1818,7 +1871,6 @@ HangingBasket: Some(( ], wind_sway: 0.0, )), - // HangingSign HangingSign: Some(( variations: [ @@ -1830,7 +1882,6 @@ HangingSign: Some(( ], wind_sway: 0.0, )), - // WallLamp WallLamp: Some(( variations: [ @@ -1842,7 +1893,6 @@ WallLamp: Some(( ], wind_sway: 0.0, )), - // WallLampSmall WallLampSmall: Some(( variations: [ @@ -1854,7 +1904,6 @@ WallLampSmall: Some(( ], wind_sway: 0.0, )), - // WallSconce WallSconce: Some(( variations: [ @@ -1866,7 +1915,6 @@ WallSconce: Some(( ], wind_sway: 0.0, )), - // Planter Planter: Some(( variations: [ @@ -1908,7 +1956,6 @@ Planter: Some(( ], wind_sway: 0.0, )), - // Shelf Shelf: Some(( variations: [ @@ -1925,7 +1972,6 @@ Shelf: Some(( ], wind_sway: 0.0, )), - // TableSide TableSide: Some(( variations: [ @@ -1942,7 +1988,6 @@ TableSide: Some(( ], wind_sway: 0.0, )), - // TableDining TableDining: Some(( variations: [ @@ -1959,7 +2004,6 @@ TableDining: Some(( ], wind_sway: 0.0, )), - // TableDouble TableDouble: Some(( variations: [ @@ -1972,7 +2016,6 @@ TableDouble: Some(( ], wind_sway: 0.0, )), - // WardrobeDouble WardrobeDouble: Some(( variations: [ @@ -1989,7 +2032,6 @@ WardrobeDouble: Some(( ], wind_sway: 0.0, )), - // WardrobeSingle WardrobeSingle: Some(( variations: [ @@ -2006,8 +2048,6 @@ WardrobeSingle: Some(( ], wind_sway: 0.0, )), - - // Pot Pot: Some(( variations: [ @@ -2024,7 +2064,6 @@ Pot: Some(( ], wind_sway: 0.0, )), - // Stones Stones: Some(( variations: [ @@ -2046,7 +2085,6 @@ Stones: Some(( ], wind_sway: 0.0, )), - // Twigs Twigs: Some(( variations: [ @@ -2068,7 +2106,6 @@ Twigs: Some(( ], wind_sway: 0.0, )), - // Drop Gate Parts DropGate: Some(( variations: [ @@ -2090,7 +2127,6 @@ DropGateBottom: Some(( ], wind_sway: 0.0, )), - // Snow covered Grass GrassSnow: Some(( variations: [ @@ -2147,7 +2183,6 @@ GrassSnow: Some(( ], wind_sway: 0.2, )), - // Reed Reed: Some(( variations: [ @@ -2179,7 +2214,6 @@ Reed: Some(( ], wind_sway: 0.3, )), - // Beehive Beehive: Some(( variations: [ @@ -2774,7 +2808,7 @@ Mud: Some(( Amethyst: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.amethyst-0", + model: "voxygen.voxel.sprite.mineral.gem.amethyst-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2785,7 +2819,7 @@ Amethyst: Some(( Ruby: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.ruby-0", + model: "voxygen.voxel.sprite.mineral.gem.ruby-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2796,7 +2830,7 @@ Ruby: Some(( Diamond: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.diamond-0", + model: "voxygen.voxel.sprite.mineral.gem.diamond-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2807,7 +2841,7 @@ Diamond: Some(( Sapphire: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.sapphire-0", + model: "voxygen.voxel.sprite.mineral.gem.sapphire-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2818,7 +2852,7 @@ Sapphire: Some(( Emerald: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.emerald-0", + model: "voxygen.voxel.sprite.mineral.gem.emerald-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2829,7 +2863,7 @@ Emerald: Some(( Topaz: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.topaz-0", + model: "voxygen.voxel.sprite.mineral.gem.topaz-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2840,7 +2874,7 @@ Topaz: Some(( AmethystSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.amethyst_S-0", + model: "voxygen.voxel.sprite.mineral.gem.amethyst_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2851,7 +2885,7 @@ AmethystSmall: Some(( TopazSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.topaz_S-0", + model: "voxygen.voxel.sprite.mineral.gem.topaz_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2862,7 +2896,7 @@ TopazSmall: Some(( RubySmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.ruby_S-0", + model: "voxygen.voxel.sprite.mineral.gem.ruby_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2873,7 +2907,7 @@ RubySmall: Some(( EmeraldSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.emerald_S-0", + model: "voxygen.voxel.sprite.mineral.gem.emerald_S-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2884,7 +2918,7 @@ EmeraldSmall: Some(( DiamondSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.diamond_S-0", + model: "voxygen.voxel.sprite.mineral.gem.diamond_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2895,14 +2929,228 @@ DiamondSmall: Some(( SapphireSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.sapphire_S-0", + model: "voxygen.voxel.sprite.mineral.gem.sapphire_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), ], wind_sway: 0.0, )), - +Bloodstone: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.bloodstone", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Coal: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.coal", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Cobalt: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.cobalt", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Copper: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.copper", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Iron: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.iron", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Tin: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.tin", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Silver: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.silver", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Gold: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.gold", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +CrystalHigh: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.ceiling.green-0", + offset: (-8.5, -9.0, -7.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.ceiling.green-1", + offset: (-8.0, -8.0, -10.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.ceiling.green-2", + offset: (-11.5, -12.5, -9.0), + lod_axes: (1.0, 1.0, 1.0), + ) +], +wind_sway: 0.0, +)), +CrystalLow: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.blue-0", + offset: (-8.5, -9.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.blue-1", + offset: (-8.0, -8.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.blue-2", + offset: (-11.5, -12.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.purple-0", + offset: (-8.5, -9.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.purple-1", + offset: (-8.0, -8.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.purple-2", + offset: (-11.5, -12.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.green-0", + offset: (-8.5, -9.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.green-1", + offset: (-8.0, -8.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.mineral.deposit.crystal.floor.green-2", + offset: (-11.5, -12.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ) +], +wind_sway: 0.0, +)), +Cotton: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.flowers.cotton", + offset: (-4.5, -4.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.4, +)), +Moonbell: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.flowers.moonbell", + offset: (-3.5, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Pyrebloom: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.flowers.pyrebloom", + offset: (-5.5, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +WildFlax: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.flax.flax-0", + offset: (-6.0, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.7), + ), + ( + model: "voxygen.voxel.sprite.flax.flax-1", + offset: (-6.0, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.7), + ), + ( + model: "voxygen.voxel.sprite.flax.flax-2", + offset: (-6.0, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.7), + ), + ( + model: "voxygen.voxel.sprite.flax.flax-3", + offset: (-6.0, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.7), + ), + ( + model: "voxygen.voxel.sprite.flax.flax-4", + offset: (-6.0, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.7), + ), + ( + model: "voxygen.voxel.sprite.flax.flax-5", + offset: (-6.0, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.7), + ), + ], + wind_sway: 0.4, +)), // Lantern Lantern: Some(( variations: [ @@ -2940,8 +3188,38 @@ Cauldron: Some(( Forge: Some(( variations: [ ( - model: "voxygen.voxel.sprite.forge.forge-0", - offset: (-20.0, -20.0, 0.0), + model: "voxygen.voxel.object.forge", + offset: (-6.5, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Loom: Some(( + variations: [ + ( + model: "voxygen.voxel.object.loom", + offset: (-6.0, -4.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +SpinningWheel: Some(( + variations: [ + ( + model: "voxygen.voxel.object.spinning_wheel", + offset: (-7.5, -5.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +TanningRack: Some(( + variations: [ + ( + model: "voxygen.voxel.object.tanning_rack", + offset: (-7.5, -4.0, 0.0), lod_axes: (0.0, 0.0, 0.0), ), ], diff --git a/assets/voxygen/voxel/weapon/hammer/burnt_drumstick.vox b/assets/voxygen/voxel/weapon/hammer/burnt_drumstick.vox new file mode 100644 index 0000000000..4fd90c272c Binary files /dev/null and b/assets/voxygen/voxel/weapon/hammer/burnt_drumstick.vox differ diff --git a/assets/voxygen/voxel/weapon/tool/pickaxe_green-1.vox b/assets/voxygen/voxel/weapon/tool/pickaxe_green-1.vox new file mode 100644 index 0000000000..aaacddefb5 Binary files /dev/null and b/assets/voxygen/voxel/weapon/tool/pickaxe_green-1.vox differ diff --git a/assets/world/style/colors.ron b/assets/world/style/colors.ron index 3f56568c85..b46018a8c7 100644 --- a/assets/world/style/colors.ron +++ b/assets/world/style/colors.ron @@ -59,7 +59,12 @@ deep_stone_color: (125, 120, 130), layer: ( bridge: (80, 80, 100), - stalagtite: (140, 150, 200), + stalagtite: (90, 71, 112), + cave_floor: (42, 39, 82), + cave_roof: (38, 21, 79), + dirt: (69, 48, 15), + scaffold: (195, 190, 212), + vein: (222, 140, 39), ), site: ( castle: (), diff --git a/common/Cargo.toml b/common/Cargo.toml index aaee090b99..a9706d48a2 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" no-assets = [] tracy = ["common-base/tracy"] simd = ["vek/platform_intrinsics"] -bin_csv = ["csv", "structopt"] +bin_csv = ["ron", "csv", "structopt"] default = ["simd"] @@ -46,6 +46,8 @@ dot_vox = "4.0" # Assets serde_repr = "0.1.6" +# csv import +ron = { version = "0.6", default-features = false, optional = true } # csv export csv = { version = "1.1.3", optional = true } structopt = { version = "0.3.13", optional = true } diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 8ed25823cf..7c4d5bbe9f 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -36,6 +36,10 @@ fn armor_stats() -> Result<(), Box> { "Quality", "Protection", "Poise Resilience", + "Max Energy", + "Energy Reward", + "Crit Power", + "Stealth", "Description", ])?; @@ -49,14 +53,18 @@ fn armor_stats() -> Result<(), Box> { continue; } - let protection = match armor.get_protection() { + let protection = match armor.protection() { Protection::Invincible => "Invincible".to_string(), Protection::Normal(value) => value.to_string(), }; - let poise_resilience = match armor.get_poise_resilience() { + let poise_resilience = match armor.poise_resilience() { Protection::Invincible => "Invincible".to_string(), Protection::Normal(value) => value.to_string(), }; + let max_energy = armor.energy_max().to_string(); + let energy_reward = armor.energy_reward().to_string(); + let crit_power = armor.crit_power().to_string(); + let stealth = armor.stealth().to_string(); wtr.write_record(&[ item.item_definition_id(), @@ -65,6 +73,10 @@ fn armor_stats() -> Result<(), Box> { &format!("{:?}", item.quality()), &protection, &poise_resilience, + &max_energy, + &energy_reward, + &crit_power, + &stealth, item.description(), ])?; }, @@ -139,19 +151,19 @@ fn weapon_stats() -> Result<(), Box> { fn get_tool_kind(kind: &ToolKind) -> String { match kind { - ToolKind::Sword | ToolKind::SwordSimple => "Sword".to_string(), - ToolKind::Axe | ToolKind::AxeSimple => "Axe".to_string(), - ToolKind::Hammer | ToolKind::HammerSimple => "Hammer".to_string(), - ToolKind::Bow | ToolKind::BowSimple => "Bow".to_string(), + ToolKind::Sword => "Sword".to_string(), + ToolKind::Axe => "Axe".to_string(), + ToolKind::Hammer => "Hammer".to_string(), + ToolKind::Bow => "Bow".to_string(), ToolKind::Dagger => "Dagger".to_string(), - ToolKind::Staff | ToolKind::StaffSimple => "Staff".to_string(), + ToolKind::Staff => "Staff".to_string(), ToolKind::Sceptre => "Sceptre".to_string(), ToolKind::Shield => "Shield".to_string(), ToolKind::Spear => "Spear".to_string(), ToolKind::Debug => "Debug".to_string(), ToolKind::Farming => "Farming".to_string(), ToolKind::Pick => "Pick".to_string(), - ToolKind::Unique(_) => "Unique".to_string(), + ToolKind::Natural => "Natural".to_string(), ToolKind::Empty => "Empty".to_string(), } } diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index 7755dd2ed6..fc5e207c68 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -112,9 +112,61 @@ fn armor_stats() -> Result<(), Box> { Protection::Normal(0.0) }; + let max_energy = + if let Some(max_energy_raw) = record.get(headers["Max Energy"]) { + max_energy_raw.parse().unwrap() + } else { + eprintln!( + "Could not unwrap max energy value for {:?}", + item.item_definition_id() + ); + 0 + }; + + let energy_reward = if let Some(energy_reward_raw) = + record.get(headers["Energy Reward"]) + { + energy_reward_raw.parse().unwrap() + } else { + eprintln!( + "Could not unwrap energy recovery value for {:?}", + item.item_definition_id() + ); + 0.0 + }; + + let crit_power = + if let Some(crit_power_raw) = record.get(headers["Crit Power"]) { + crit_power_raw.parse().unwrap() + } else { + eprintln!( + "Could not unwrap crit power value for {:?}", + item.item_definition_id() + ); + 0.0 + }; + + let stealth = if let Some(stealth_raw) = record.get(headers["Stealth"]) + { + stealth_raw.parse().unwrap() + } else { + eprintln!( + "Could not unwrap stealth value for {:?}", + item.item_definition_id() + ); + 0.0 + }; + let kind = armor.kind.clone(); - let armor = - comp::item::armor::Armor::new(kind, protection, poise_resilience); + let armor_stats = comp::item::armor::Stats::new( + protection, + poise_resilience, + max_energy, + energy_reward, + crit_power, + stealth, + ); + let armor = comp::item::armor::Armor::new(kind, armor_stats); let quality = if let Some(quality_raw) = record.get(headers["Quality"]) { match quality_raw { diff --git a/common/src/combat.rs b/common/src/combat.rs index 4755f3d170..9e6a5d4524 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -56,6 +56,7 @@ pub struct AttackerInfo<'a> { pub uid: Uid, pub energy: Option<&'a Energy>, pub combo: Option<&'a Combo>, + pub inventory: Option<&'a Inventory>, } #[cfg(not(target_arch = "wasm32"))] @@ -213,11 +214,13 @@ impl Attack { } }, CombatEffect::EnergyReward(ec) => { - if let Some(attacker_entity) = attacker.map(|a| a.entity) { + if let Some(attacker) = attacker { emit(ServerEvent::EnergyChange { - entity: attacker_entity, + entity: attacker.entity, change: EnergyChange { - amount: *ec as i32, + amount: (*ec + * compute_energy_reward_mod(attacker.inventory)) + as i32, source: EnergySource::HitEnemy, }, }); @@ -348,11 +351,12 @@ impl Attack { } }, CombatEffect::EnergyReward(ec) => { - if let Some(attacker_entity) = attacker.map(|a| a.entity) { + if let Some(attacker) = attacker { emit(ServerEvent::EnergyChange { - entity: attacker_entity, + entity: attacker.entity, change: EnergyChange { - amount: ec as i32, + amount: (ec * compute_energy_reward_mod(attacker.inventory)) + as i32, source: EnergySource::HitEnemy, }, }); @@ -539,7 +543,7 @@ impl Damage { .equipped_items() .filter_map(|item| { if let ItemKind::Armor(armor) = &item.kind() { - Some(armor.get_protection()) + Some(armor.protection()) } else { None } @@ -817,8 +821,10 @@ pub fn weapon_rating(item: &T, msm: &MaterialStatManifest) -> f32 { if let ItemKind::Tool(tool) = item.kind() { let stats = tool::Stats::from((msm, item.components(), tool)); - let damage_rating = - stats.power * stats.speed * (1.0 + stats.crit_chance * (stats.crit_mult - 1.0)); + // TODO: Look into changing the 0.5 to reflect armor later maybe? + // Since it is only for weapon though, it probably makes sense to leave + // independent for now + let damage_rating = stats.power * stats.speed * (1.0 + stats.crit_chance * 0.5); let poise_rating = stats.poise_strength * stats.speed; (damage_rating * DAMAGE_WEIGHT + poise_rating * POISE_WEIGHT) @@ -894,3 +900,58 @@ pub fn combat_rating( // skills would account for. It should only not be 1.0 for non-humanoids combined_rating * body.combat_multiplier() } + +pub fn compute_crit_mult(inventory: Option<&Inventory>) -> f32 { + // Starts with a value of 1.25 when summing the stats from each armor piece, and + // defaults to a value of 1.25 if no inventory is equipped + inventory.map_or(1.25, |inv| { + inv.equipped_items() + .filter_map(|item| { + if let ItemKind::Armor(armor) = &item.kind() { + Some(armor.crit_power()) + } else { + None + } + }) + .fold(1.25, |a, b| a + b) + }) +} + +/// Computes the energy reward modifer from worn armor +pub fn compute_energy_reward_mod(inventory: Option<&Inventory>) -> f32 { + // Starts with a value of 1.0 when summing the stats from each armor piece, and + // defaults to a value of 1.0 if no inventory is present + inventory.map_or(1.0, |inv| { + inv.equipped_items() + .filter_map(|item| { + if let ItemKind::Armor(armor) = &item.kind() { + Some(armor.energy_reward()) + } else { + None + } + }) + .fold(1.0, |a, b| a + b) + }) +} + +/// Computes the modifier that should be applied to max energy from the +/// currently equipped items +pub fn compute_max_energy_mod(energy: &Energy, inventory: Option<&Inventory>) -> f32 { + // Defaults to a value of 0 if no inventory is present + let energy_increase = inventory.map_or(0, |inv| { + inv.equipped_items() + .filter_map(|item| { + if let ItemKind::Armor(armor) = &item.kind() { + Some(armor.energy_max()) + } else { + None + } + }) + .sum() + }); + // Returns the energy increase divided by base max of energy. + // This value is then added to the max_energy_modifier field on stats component. + // Adding is important here, as it ensures that a flat modifier is applied + // correctly. + energy_increase as f32 / energy.base_max() as f32 +} diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 2d5d3ed4a8..b7d2b62528 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -365,9 +365,9 @@ impl Body { quadruped_low::Species::Monitor => Vec3::new(1.0, 2.3, 1.5), quadruped_low::Species::Pangolin => Vec3::new(1.0, 2.0, 1.3), quadruped_low::Species::Rocksnapper => Vec3::new(1.0, 1.6, 2.9), + quadruped_low::Species::Basilisk => Vec3::new(1.8, 2.2, 2.9), quadruped_low::Species::Salamander => Vec3::new(1.0, 2.4, 1.3), quadruped_low::Species::Tortoise => Vec3::new(1.0, 1.6, 2.0), - quadruped_low::Species::Basilisk => Vec3::new(1.8, 2.2, 2.9), _ => Vec3::new(1.0, 1.6, 1.3), }, Body::Ship(ship) => ship.dimensions(), @@ -510,13 +510,13 @@ impl Body { quadruped_low::Species::Monitor => 600, quadruped_low::Species::Asp => 750, quadruped_low::Species::Tortoise => 900, - quadruped_low::Species::Rocksnapper => 1200, + quadruped_low::Species::Rocksnapper => 1400, quadruped_low::Species::Pangolin => 400, quadruped_low::Species::Maneater => 700, quadruped_low::Species::Sandshark => 900, quadruped_low::Species::Hakulaq => 500, - quadruped_low::Species::Lavadrake => 1000, - quadruped_low::Species::Basilisk => 1000, + quadruped_low::Species::Lavadrake => 1600, + quadruped_low::Species::Basilisk => 2000, quadruped_low::Species::Deadwood => 700, _ => 700, }, diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 97f2d203a5..95d8978b9d 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -74,8 +74,8 @@ make_case_elim!( FireworkYellow = 59, MultiArrow = 60, BoltNature = 61, - MeatDrop = 62, - Steak = 63, + ToughMeat = 62, + BeastMeat = 63, Crossbow = 64, ArrowTurret = 65, Coins = 66, @@ -85,6 +85,9 @@ make_case_elim!( HaniwaSentry = 70, SeaLantern = 71, Snowball = 72, + BirdMeat = 73, + FishMeat = 74, + SmallMeat = 75, } ); @@ -95,7 +98,7 @@ impl Body { } } -pub const ALL_OBJECTS: [Body; 73] = [ +pub const ALL_OBJECTS: [Body; 76] = [ Body::Arrow, Body::Bomb, Body::Scarecrow, @@ -158,8 +161,8 @@ pub const ALL_OBJECTS: [Body; 73] = [ Body::FireworkYellow, Body::MultiArrow, Body::BoltNature, - Body::MeatDrop, - Body::Steak, + Body::ToughMeat, + Body::BeastMeat, Body::Crossbow, Body::ArrowTurret, Body::Coins, @@ -169,6 +172,9 @@ pub const ALL_OBJECTS: [Body; 73] = [ Body::HaniwaSentry, Body::SeaLantern, Body::Snowball, + Body::BirdMeat, + Body::FishMeat, + Body::SmallMeat, ]; impl From for super::Body { @@ -240,8 +246,8 @@ impl Body { Body::FireworkYellow => "firework_yellow", Body::MultiArrow => "multi_arrow", Body::BoltNature => "bolt_nature", - Body::MeatDrop => "meat_drop", - Body::Steak => "steak", + Body::ToughMeat => "tough_meat", + Body::BeastMeat => "beast_meat", Body::Crossbow => "crossbow", Body::ArrowTurret => "arrow_turret", Body::Coins => "coins", @@ -251,6 +257,9 @@ impl Body { Body::HaniwaSentry => "haniwa_sentry", Body::SeaLantern => "sea_lantern", Body::Snowball => "snowball", + Body::BirdMeat => "bird_meat", + Body::FishMeat => "fish_meat", + Body::SmallMeat => "small_meat", } } @@ -327,14 +336,14 @@ impl Body { | Body::LanternGroundOpen | Body::LanternStanding | Body::LanternStanding2 => 3.0, - Body::MeatDrop => 5.0, + Body::ToughMeat => 50.0, + Body::BeastMeat => 50.0, Body::PotionBlue | Body::PotionGreen | Body::PotionRed => 5.0, Body::Pouch => 1.0, Body::Pumpkin | Body::Pumpkin2 | Body::Pumpkin3 | Body::Pumpkin4 | Body::Pumpkin5 => { 10.0 }, Body::Scarecrow => 50.0, - Body::Steak => 2.0, Body::Table | Body::Table2 | Body::Table3 => 50.0, Body::Tent => 50.0, Body::TrainingDummy => 60.0, @@ -345,6 +354,9 @@ impl Body { Body::HaniwaSentry => 300.0, Body::SeaLantern => 1000.0, Body::Snowball => 7360.0, // 2.5 m diamter + Body::FishMeat => 10.0, + Body::BirdMeat => 10.0, + Body::SmallMeat => 10.0, }; Mass(m) diff --git a/common/src/comp/energy.rs b/common/src/comp/energy.rs index e540cb6ad5..c469952fa0 100644 --- a/common/src/comp/energy.rs +++ b/common/src/comp/energy.rs @@ -6,9 +6,8 @@ use specs_idvs::IdvStorage; #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub struct Energy { current: u32, - maximum: u32, base_max: u32, - last_max: u32, + maximum: u32, pub regen_rate: f32, pub last_change: Option<(i32, f64, EnergySource)>, } @@ -45,7 +44,6 @@ impl Energy { current: 0, maximum: 0, base_max: 0, - last_max: 0, regen_rate: 0.0, last_change: None, } @@ -53,6 +51,8 @@ impl Energy { pub fn current(&self) -> u32 { self.current } + pub fn base_max(&self) -> u32 { self.base_max } + pub fn maximum(&self) -> u32 { self.maximum } pub fn set_to(&mut self, amount: u32, cause: EnergySource) { @@ -66,14 +66,20 @@ impl Energy { self.last_change = Some((change.amount, 0.0, change.source)); } - // This function changes the modified max energy value, not the base energy - // value. The modified energy value takes into account buffs and other temporary - // changes to max energy. + /// This function changes the modified max energy value, not the base energy + /// value. The modified energy value takes into account buffs and other + /// temporary changes to max energy. pub fn set_maximum(&mut self, amount: u32) { self.maximum = amount; self.current = self.current.min(self.maximum); } + /// Scales the temporary max energy by a modifier. + pub fn scale_maximum(&mut self, scaled: f32) { + let scaled_max = (self.base_max as f32 * scaled) as u32; + self.set_maximum(scaled_max); + } + pub fn try_change_by( &mut self, amount: i32, @@ -92,34 +98,24 @@ impl Energy { } } - //sets last_max to base HP, then if the current is more than your base_max - // it'll set it to base max - pub fn last_set(&mut self) { self.last_max = self.maximum } - pub fn update_max_energy(&mut self, body: Option, level: u16) { + const ENERGY_PER_LEVEL: u32 = 50; if let Some(body) = body { - self.set_base_max(body.base_energy() + 50 * level as u32); - self.set_maximum(body.base_energy() + 50 * level as u32); + // Checks the current difference between maximum and base max + let current_difference = self.maximum as i32 - self.base_max as i32; + // Sets base max to new value based off of new level provided + self.base_max = body.base_energy() + ENERGY_PER_LEVEL * level as u32; + // Calculates new maximum by adding difference to new base max + let new_maximum = (self.base_max as i32 + current_difference).max(0) as u32; + // Sets maximum to calculated value + self.set_maximum(new_maximum); + // Awards energy self.change_by(EnergyChange { - amount: 50, + amount: ENERGY_PER_LEVEL as i32, source: EnergySource::LevelUp, }); } } - - pub fn reset_max(&mut self) { - self.maximum = self.base_max; - if self.current > self.last_max { - self.current = self.last_max; - self.last_max = self.base_max; - } - } - - // This is private because max energy is based on the level - fn set_base_max(&mut self, amount: u32) { - self.base_max = amount; - self.current = self.current.min(self.maximum); - } } pub struct EnergyChange { diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index 19b0f42fd4..13b7b9cced 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -28,23 +28,58 @@ impl Armor { #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub struct Stats { + /// Protection is non-linearly transformed (following summation) to a damage + /// reduction using (prot / (60 + prot)) protection: Protection, + /// Poise protection is non-linearly transformed (following summation) to a + /// poise damage reduction using (prot / (60 + prot)) poise_resilience: Protection, + /// Energy max is summed, and then applied directly to the max energy stat + /// (multiply values by 10 for expected results, as energy internally is 10x + /// larger to allow smaller changes to occur with an integer) + energy_max: i32, + /// Energy recovery is summed, and then added to 1.0. When attacks reward + /// energy, it is then multiplied by this value before the energy is + /// rewarded. + energy_reward: f32, + /// Crit power is summed, and then added to the default crit multiplier of + /// 1.25. Damage is multiplied by this value when an attack crits. + crit_power: f32, + stealth: f32, } impl Stats { // DO NOT USE UNLESS YOU KNOW WHAT YOU ARE DOING // Added for csv import of stats - pub fn new(protection: Protection, poise_resilience: Protection) -> Self { + pub fn new( + protection: Protection, + poise_resilience: Protection, + energy_max: i32, + energy_reward: f32, + crit_power: f32, + stealth: f32, + ) -> Self { Self { protection, poise_resilience, + energy_max, + energy_reward, + crit_power, + stealth, } } - pub fn get_protection(&self) -> Protection { self.protection } + pub fn protection(&self) -> Protection { self.protection } - pub fn get_poise_resilience(&self) -> Protection { self.poise_resilience } + pub fn poise_resilience(&self) -> Protection { self.poise_resilience } + + pub fn energy_max(&self) -> i32 { self.energy_max } + + pub fn energy_reward(&self) -> f32 { self.energy_reward } + + pub fn crit_power(&self) -> f32 { self.crit_power } + + pub fn stealth(&self) -> f32 { self.stealth } } impl Sub for Stats { @@ -54,6 +89,10 @@ impl Sub for Stats { Self { protection: self.protection - other.protection, poise_resilience: self.poise_resilience - other.poise_resilience, + energy_max: self.energy_max - other.energy_max, + energy_reward: self.energy_reward - other.energy_reward, + crit_power: self.crit_power - other.crit_power, + stealth: self.stealth - other.stealth, } } } @@ -64,6 +103,10 @@ pub enum Protection { Normal(f32), } +impl Default for Protection { + fn default() -> Self { Self::Normal(0.0) } +} + impl Sub for Protection { type Output = Self; @@ -96,19 +139,19 @@ pub struct Armor { } impl Armor { - pub fn new(kind: ArmorKind, protection: Protection, poise_resilience: Protection) -> Self { - Self { - kind, - stats: Stats { - protection, - poise_resilience, - }, - } - } + pub fn new(kind: ArmorKind, stats: Stats) -> Self { Self { kind, stats } } - pub fn get_protection(&self) -> Protection { self.stats.protection } + pub fn protection(&self) -> Protection { self.stats.protection } - pub fn get_poise_resilience(&self) -> Protection { self.stats.poise_resilience } + pub fn poise_resilience(&self) -> Protection { self.stats.poise_resilience } + + pub fn energy_max(&self) -> i32 { self.stats.energy_max } + + pub fn energy_reward(&self) -> f32 { self.stats.energy_reward } + + pub fn crit_power(&self) -> f32 { self.stats.crit_power } + + pub fn stealth(&self) -> f32 { self.stats.stealth } #[cfg(test)] pub fn test_armor( @@ -121,6 +164,10 @@ impl Armor { stats: Stats { protection, poise_resilience, + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, }, } } diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index f1d4216ed3..64583dfa60 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -28,6 +28,7 @@ use serde::{de, Deserialize, Serialize, Serializer}; use specs::{Component, DerefFlaggedStorage}; use specs_idvs::IdvStorage; use std::{fmt, sync::Arc}; +use strum_macros::IntoStaticStr; use tracing::error; use vek::Rgb; @@ -91,12 +92,110 @@ pub trait TagExampleInfo { fn exemplar_identifier(&self) -> &'static str; } +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum MaterialKind { + Metal, + Wood, + Stone, + Cloth, + Hide, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, IntoStaticStr)] +#[strum(serialize_all = "snake_case")] +pub enum Material { + Bronze, + Iron, + Steel, + Cobalt, + Bloodsteel, + Orichalcum, + Wood, + Bamboo, + Hardwood, + Ironwood, + Frostwood, + Eldwood, + Rock, + Granite, + Bone, + Basalt, + Obsidian, + Velorite, + Linen, + Wool, + Silk, + Lifecloth, + Moonweave, + Sunsilk, + Rawhide, + Leather, + Scale, + Carapace, + Plate, + Dragonscale, +} + +impl Material { + pub fn material_kind(&self) -> MaterialKind { + match self { + Material::Bronze + | Material::Iron + | Material::Steel + | Material::Cobalt + | Material::Bloodsteel + | Material::Orichalcum => MaterialKind::Metal, + Material::Wood + | Material::Bamboo + | Material::Hardwood + | Material::Ironwood + | Material::Frostwood + | Material::Eldwood => MaterialKind::Wood, + Material::Rock + | Material::Granite + | Material::Bone + | Material::Basalt + | Material::Obsidian + | Material::Velorite => MaterialKind::Stone, + Material::Linen + | Material::Wool + | Material::Silk + | Material::Lifecloth + | Material::Moonweave + | Material::Sunsilk => MaterialKind::Cloth, + Material::Rawhide + | Material::Leather + | Material::Scale + | Material::Carapace + | Material::Plate + | Material::Dragonscale => MaterialKind::Hide, + } + } +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +#[serde(transparent)] +pub struct MaterialTag { + material: Material, +} + +impl MaterialTag { + pub fn material(&self) -> &Material { &self.material } +} + +impl TagExampleInfo for MaterialTag { + fn name(&self) -> &'static str { self.material.into() } + + fn exemplar_identifier(&self) -> &'static str { "common.items.tag_examples.placeholder" } +} + #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub enum ItemTag { - ClothItem, - LeatherItem, - ModularComponent(ModularComponentTag), MetalIngot, + Textile, + Leather, + Material(MaterialTag), + ModularComponent(ModularComponentTag), Cultist, Potion, Food, @@ -109,10 +208,11 @@ pub enum ItemTag { impl TagExampleInfo for ItemTag { fn name(&self) -> &'static str { match self { - ItemTag::ClothItem => "cloth item", - ItemTag::LeatherItem => "leather item", + ItemTag::Material(material) => material.name(), ItemTag::ModularComponent(kind) => kind.name(), ItemTag::MetalIngot => "metal ingot", + ItemTag::Textile => "textile", + ItemTag::Leather => "leather", ItemTag::Cultist => "cultist", ItemTag::Potion => "potion", ItemTag::Food => "food", @@ -126,10 +226,11 @@ impl TagExampleInfo for ItemTag { // TODO: Autogenerate these? fn exemplar_identifier(&self) -> &'static str { match self { - ItemTag::ClothItem => "common.items.tag_examples.cloth_item", - ItemTag::LeatherItem => "common.items.tag_examples.leather_item", + ItemTag::Material(_) => "common.items.tag_examples.placeholder", ItemTag::ModularComponent(tag) => tag.exemplar_identifier(), ItemTag::MetalIngot => "common.items.tag_examples.metal_ingot", + ItemTag::Textile => "common.items.tag_examples.textile", + ItemTag::Leather => "common.items.tag_examples.leather", ItemTag::Cultist => "common.items.tag_examples.cultist", ItemTag::Potion => "common.items.tag_examples.placeholder", ItemTag::Food => "common.items.tag_examples.placeholder", @@ -706,9 +807,8 @@ impl Item { Some(Item::new_from_asset_expect(match block.get_sprite()? { SpriteKind::Apple => "common.items.food.apple", SpriteKind::Mushroom => "common.items.food.mushroom", - SpriteKind::CaveMushroom => "common.items.food.mushroom", - SpriteKind::Velorite => "common.items.ore.velorite", - SpriteKind::VeloriteFrag => "common.items.ore.veloritefrag", + SpriteKind::Velorite => "common.items.mineral.ore.velorite", + SpriteKind::VeloriteFrag => "common.items.mineral.ore.veloritefrag", SpriteKind::BlueFlower => "common.items.flowers.blue", SpriteKind::PinkFlower => "common.items.flowers.pink", SpriteKind::PurpleFlower => "common.items.flowers.purple", @@ -726,18 +826,30 @@ impl Item { SpriteKind::VialEmpty => "common.items.crafting_ing.empty_vial", SpriteKind::Bowl => "common.items.crafting_ing.bowl", SpriteKind::PotionMinor => "common.items.consumable.potion_minor", - SpriteKind::Amethyst => "common.items.crafting_ing.amethyst", - SpriteKind::Ruby => "common.items.crafting_ing.ruby", - SpriteKind::Diamond => "common.items.crafting_ing.diamond", - SpriteKind::Sapphire => "common.items.crafting_ing.sapphire", - SpriteKind::Topaz => "common.items.crafting_ing.topaz", - SpriteKind::Emerald => "common.items.crafting_ing.emerald", - SpriteKind::AmethystSmall => "common.items.crafting_ing.amethyst", - SpriteKind::TopazSmall => "common.items.crafting_ing.topaz", - SpriteKind::DiamondSmall => "common.items.crafting_ing.diamond", - SpriteKind::RubySmall => "common.items.crafting_ing.ruby", - SpriteKind::EmeraldSmall => "common.items.crafting_ing.emerald", - SpriteKind::SapphireSmall => "common.items.crafting_ing.sapphire", + SpriteKind::Amethyst => "common.items.mineral.gem.amethyst", + SpriteKind::Ruby => "common.items.mineral.gem.ruby", + SpriteKind::Diamond => "common.items.mineral.gem.diamond", + SpriteKind::Sapphire => "common.items.mineral.gem.sapphire", + SpriteKind::Topaz => "common.items.mineral.gem.topaz", + SpriteKind::Emerald => "common.items.mineral.gem.emerald", + SpriteKind::AmethystSmall => "common.items.mineral.gem.amethyst", + SpriteKind::TopazSmall => "common.items.mineral.gem.topaz", + SpriteKind::DiamondSmall => "common.items.mineral.gem.diamond", + SpriteKind::RubySmall => "common.items.mineral.gem.ruby", + SpriteKind::EmeraldSmall => "common.items.mineral.gem.emerald", + SpriteKind::SapphireSmall => "common.items.mineral.gem.sapphire", + SpriteKind::Bloodstone => "common.items.mineral.ore.bloodstone", + SpriteKind::Coal => "common.items.mineral.ore.coal", + SpriteKind::Cobalt => "common.items.mineral.ore.cobalt", + SpriteKind::Copper => "common.items.mineral.ore.copper", + SpriteKind::Iron => "common.items.mineral.ore.iron", + SpriteKind::Tin => "common.items.mineral.ore.tin", + SpriteKind::Silver => "common.items.mineral.ore.silver", + SpriteKind::Gold => "common.items.mineral.ore.gold", + SpriteKind::Cotton => "common.items.crafting_ing.cotton_boll", + SpriteKind::Moonbell => "common.items.flowers.moonbell", + SpriteKind::Pyrebloom => "common.items.flowers.pyrebloom", + SpriteKind::WildFlax => "common.items.flowers.wild_flax", SpriteKind::Seashells => "common.items.crafting_ing.seashells", // Containers // IMPORTANT: Add any new container to `SpriteKind::is_container` @@ -956,7 +1068,8 @@ mod tests { Item::new_from_asset_glob("common.items.npc_weapons.*") .expect("Failed to iterate over npc weapons."); - Item::new_from_asset_glob("common.items.ore.*").expect("Failed to iterate over ores."); + Item::new_from_asset_glob("common.items.mineral.*") + .expect("Failed to iterate over minerals."); Item::new_from_asset_glob("common.items.tag_examples.*") .expect("Failed to iterate over tag examples."); diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs index 039a377e70..9b803a20af 100644 --- a/common/src/comp/inventory/item/modular.rs +++ b/common/src/comp/inventory/item/modular.rs @@ -175,11 +175,6 @@ fn make_component_def( } else { 0.0 }, - crit_mult: if matches!(modkind, ModularComponentKind::Damage) { - 1.0 + AVERAGE_STAT_VALUE[tier] - } else { - 0.0 - }, }, }; let kind = ItemKind::ModularComponent(mc); diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 50f62365d5..e91b52c0de 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -65,7 +65,6 @@ pub struct Stats { pub poise_strength: f32, pub speed: f32, pub crit_chance: f32, - pub crit_mult: f32, } impl Stats { @@ -76,7 +75,6 @@ impl Stats { poise_strength: 0.0, speed: 0.0, crit_chance: 0.0, - crit_mult: 0.0, } } @@ -101,7 +99,6 @@ impl AddAssign for Stats { self.poise_strength += other.poise_strength; self.speed += other.speed; self.crit_chance += other.crit_chance; - self.crit_mult += other.crit_mult; } } impl MulAssign for Stats { @@ -111,7 +108,6 @@ impl MulAssign for Stats { self.poise_strength *= other.poise_strength; self.speed *= other.speed; self.crit_chance *= other.crit_chance; - self.crit_mult *= other.crit_mult; } } impl DivAssign for Stats { @@ -124,7 +120,6 @@ impl DivAssign for Stats { self.poise_strength /= scalar as f32; self.speed /= scalar as f32; self.crit_chance /= scalar as f32; - self.crit_mult /= scalar as f32; } } @@ -138,7 +133,6 @@ impl Sub for Stats { poise_strength: self.poise_strength - other.poise_strength, speed: self.speed - other.speed, crit_chance: self.crit_chance - other.crit_chance, - crit_mult: self.crit_mult - other.crit_mult, } } } @@ -216,7 +210,6 @@ impl From<(&MaterialStatManifest, &[Item], &Tool)> for Stats { poise_strength: raw_stats.poise_strength * poise, speed: raw_stats.speed * speed, crit_chance: raw_stats.crit_chance, - crit_mult: raw_stats.crit_mult, } } } @@ -241,7 +234,6 @@ impl Tool { poise_strength: f32, speed: f32, crit_chance: f32, - crit_mult: f32, ) -> Self { Self { kind, @@ -252,7 +244,6 @@ impl Tool { poise_strength, speed, crit_chance, - crit_mult, }), } } @@ -267,7 +258,6 @@ impl Tool { poise_strength: 1.00, speed: 1.00, crit_chance: 0.1, - crit_mult: 2.0, }), } } @@ -292,10 +282,6 @@ impl Tool { self.stats.resolve_stats(msm, components).crit_chance } - pub fn base_crit_mult(&self, msm: &MaterialStatManifest, components: &[Item]) -> f32 { - self.stats.resolve_stats(msm, components).crit_mult - } - pub fn equip_time(&self, msm: &MaterialStatManifest, components: &[Item]) -> Duration { Duration::from_secs_f32(self.stats.resolve_stats(msm, components).equip_time_secs) } diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 909963088a..f373b4d800 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -228,6 +228,9 @@ pub fn default_main_tool(body: &Body) -> Option { quadruped_low::Species::Deadwood => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadlowbeam", )), + quadruped_low::Species::Basilisk => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.basilisk", + )), _ => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadlowbasic", )), @@ -846,7 +849,7 @@ mod tests { // Exotic "common.items.npc_weapons.unique.beast_claws", // Natural "common.items.weapons.tool.rake", // Farming - "common.items.tool.pick", // Pick + "common.items.tool.pickaxe_stone", // Pick "common.items.weapons.empty.empty", // Empty ]; diff --git a/common/src/comp/inventory/trade_pricing.rs b/common/src/comp/inventory/trade_pricing.rs index 32e3a56f01..25323dc516 100644 --- a/common/src/comp/inventory/trade_pricing.rs +++ b/common/src/comp/inventory/trade_pricing.rs @@ -443,7 +443,7 @@ impl TradePricing { } printvec("Armor", &self.armor, |i, p| match &i.kind { - ItemKind::Armor(a) => match a.get_protection() { + ItemKind::Armor(a) => match a.protection() { armor::Protection::Invincible => "Invincible".into(), armor::Protection::Normal(x) => format!("{:.4} prot/val", x * p), }, diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs index 0262aa9ab5..8cbbdf1067 100644 --- a/common/src/comp/poise.rs +++ b/common/src/comp/poise.rs @@ -203,7 +203,7 @@ impl Poise { .equipped_items() .filter_map(|item| { if let ItemKind::Armor(armor) = &item.kind() { - Some(armor.get_poise_resilience()) + Some(armor.poise_resilience()) } else { None } diff --git a/common/src/comp/stats.rs b/common/src/comp/stats.rs index fd962d702b..d3f2b6d77e 100644 --- a/common/src/comp/stats.rs +++ b/common/src/comp/stats.rs @@ -28,6 +28,7 @@ pub struct Stats { pub move_speed_modifier: f32, pub attack_speed_modifier: f32, pub friction_modifier: f32, + pub max_energy_modifier: f32, } impl Stats { @@ -39,6 +40,7 @@ impl Stats { move_speed_modifier: 1.0, attack_speed_modifier: 1.0, friction_modifier: 1.0, + max_energy_modifier: 1.0, } } @@ -52,6 +54,7 @@ impl Stats { move_speed_modifier: 1.0, attack_speed_modifier: 1.0, friction_modifier: 1.0, + max_energy_modifier: 1.0, } } @@ -62,6 +65,7 @@ impl Stats { self.move_speed_modifier = 1.0; self.attack_speed_modifier = 1.0; self.friction_modifier = 1.0; + self.max_energy_modifier = 1.0; } } diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 8217e7f046..3d933bd396 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -1,4 +1,5 @@ use crate::{ + combat, comp::{ biped_large, biped_small, inventory::slot::EquipSlot, @@ -730,22 +731,30 @@ pub fn get_hands(data: &JoinData) -> (Option, Option) { ) } +/// Returns (critical chance, critical multiplier) which is calculated from +/// equipped weapon and equipped armor respectively pub fn get_crit_data(data: &JoinData, ai: AbilityInfo) -> (f32, f32) { - const DEFAULT_CRIT_DATA: (f32, f32) = (0.5, 1.3); - use HandInfo::*; - let slot = match ai.hand { - Some(TwoHanded) | Some(MainHand) => EquipSlot::ActiveMainhand, - Some(OffHand) => EquipSlot::ActiveOffhand, - None => return DEFAULT_CRIT_DATA, - }; - if let Some(item) = data.inventory.equipped(slot) { - if let ItemKind::Tool(tool) = item.kind() { - let crit_chance = tool.base_crit_chance(data.msm, item.components()); - let crit_mult = tool.base_crit_mult(data.msm, item.components()); - return (crit_chance, crit_mult); - } - } - DEFAULT_CRIT_DATA + const DEFAULT_CRIT_CHANCE: f32 = 0.1; + + let crit_chance = ai + .hand + .map(|hand| match hand { + HandInfo::TwoHanded | HandInfo::MainHand => EquipSlot::ActiveMainhand, + HandInfo::OffHand => EquipSlot::ActiveOffhand, + }) + .and_then(|slot| data.inventory.equipped(slot)) + .and_then(|item| { + if let ItemKind::Tool(tool) = item.kind() { + Some(tool.base_crit_chance(data.msm, item.components())) + } else { + None + } + }) + .unwrap_or(DEFAULT_CRIT_CHANCE); + + let crit_mult = combat::compute_crit_mult(Some(data.inventory)); + + (crit_chance, crit_mult) } pub fn handle_state_interrupt(data: &JoinData, update: &mut StateUpdate, attacks_interrupt: bool) { diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 6c6d370c3f..8cb8c73aea 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -174,9 +174,15 @@ impl Block { SpriteKind::WallLamp | SpriteKind::WallLampSmall | SpriteKind::WallSconce - | SpriteKind::FireBowlGround => Some(16), - SpriteKind::Velorite | SpriteKind::VeloriteFrag => Some(6), - SpriteKind::CaveMushroom | SpriteKind::CookingPot => Some(12), + | SpriteKind::FireBowlGround + | SpriteKind::Orb => Some(16), + SpriteKind::Velorite | SpriteKind::VeloriteFrag | SpriteKind::CeilingMushroom => { + Some(6) + }, + SpriteKind::CaveMushroom + | SpriteKind::CookingPot + | SpriteKind::CrystalHigh + | SpriteKind::CrystalLow => Some(10), SpriteKind::Amethyst | SpriteKind::Ruby | SpriteKind::Sapphire diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 4f74e3a9d8..d859ac0495 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -154,6 +154,25 @@ make_case_elim!( DungeonChest3 = 0x7F, DungeonChest4 = 0x80, DungeonChest5 = 0x81, + Loom = 0x82, + SpinningWheel = 0x83, + CrystalHigh = 0x84, + Bloodstone = 0x85, + Coal = 0x86, + Cobalt = 0x87, + Copper = 0x88, + Iron = 0x89, + Tin = 0x8A, + Silver = 0x8B, + Gold = 0x8C, + Cotton = 0x8D, + Moonbell = 0x8E, + Pyrebloom = 0x8F, + TanningRack = 0x90, + WildFlax = 0x91, + CrystalLow = 0x92, + CeilingMushroom = 0x93, + Orb = 0x94, } ); @@ -204,6 +223,9 @@ impl SpriteKind { SpriteKind::CraftingBench => 1.18, SpriteKind::Forge => 2.7, SpriteKind::Cauldron => 1.27, + SpriteKind::SpinningWheel => 1.6, + SpriteKind::TanningRack => 2.2, + SpriteKind::Loom => 1.27, SpriteKind::Anvil => 1.1, SpriteKind::CookingPot => 1.36, // TODO: Find suitable heights. @@ -225,6 +247,15 @@ impl SpriteKind { // TODO: Figure out if this should be solid or not. SpriteKind::Shelf => 1.0, SpriteKind::Lantern => 0.9, + SpriteKind::CrystalHigh | SpriteKind::CrystalLow => 1.5, + SpriteKind::Bloodstone + | SpriteKind::Coal + | SpriteKind::Cobalt + | SpriteKind::Copper + | SpriteKind::Iron + | SpriteKind::Tin + | SpriteKind::Silver + | SpriteKind::Gold => 0.6, _ => return None, }) } @@ -243,7 +274,6 @@ impl SpriteKind { SpriteKind::ShortGrass => false, SpriteKind::Apple => true, SpriteKind::Mushroom => true, - SpriteKind::CaveMushroom => true, // SpriteKind::Velorite => true, // SpriteKind::VeloriteFrag => true, SpriteKind::Chest => true, @@ -264,6 +294,10 @@ impl SpriteKind { SpriteKind::ChestBuried => true, SpriteKind::Mud => true, SpriteKind::Seashells => true, + SpriteKind::Cotton => true, + SpriteKind::Moonbell => true, + SpriteKind::Pyrebloom => true, + SpriteKind::WildFlax => true, _ => false, } } @@ -301,6 +335,14 @@ impl SpriteKind { | SpriteKind::DiamondSmall | SpriteKind::RubySmall | SpriteKind::EmeraldSmall + | SpriteKind::Bloodstone + | SpriteKind::Coal + | SpriteKind::Cobalt + | SpriteKind::Copper + | SpriteKind::Iron + | SpriteKind::Tin + | SpriteKind::Silver + | SpriteKind::Gold | SpriteKind::SapphireSmall => Some(ToolKind::Pick), _ => None, } @@ -357,6 +399,9 @@ impl SpriteKind { | SpriteKind::Cauldron | SpriteKind::Anvil | SpriteKind::CookingPot + | SpriteKind::SpinningWheel + | SpriteKind::TanningRack + | SpriteKind::Loom ) } } diff --git a/common/systems/src/beam.rs b/common/systems/src/beam.rs index 440f1d8550..c3373a3533 100644 --- a/common/systems/src/beam.rs +++ b/common/systems/src/beam.rs @@ -198,6 +198,7 @@ impl<'a> System<'a> for Sys { uid, energy: read_data.energies.get(entity), combo: read_data.combos.get(entity), + inventory: read_data.inventories.get(entity), }); let target_info = TargetInfo { diff --git a/common/systems/src/buff.rs b/common/systems/src/buff.rs index a04d006053..b504dbc4a2 100644 --- a/common/systems/src/buff.rs +++ b/common/systems/src/buff.rs @@ -23,6 +23,7 @@ pub struct ReadData<'a> { inventories: ReadStorage<'a, Inventory>, healths: ReadStorage<'a, Health>, physics_states: ReadStorage<'a, PhysicsState>, + energies: ReadStorage<'a, Energy>, } #[derive(Default)] @@ -30,7 +31,6 @@ pub struct Sys; impl<'a> System<'a> for Sys { type SystemData = ( ReadData<'a>, - WriteStorage<'a, Energy>, WriteStorage<'a, Buffs>, WriteStorage<'a, Stats>, ); @@ -39,20 +39,16 @@ impl<'a> System<'a> for Sys { const ORIGIN: Origin = Origin::Common; const PHASE: Phase = Phase::Create; - fn run( - _job: &mut Job, - (read_data, mut energies, mut buffs, mut stats): Self::SystemData, - ) { + fn run(_job: &mut Job, (read_data, mut buffs, mut stats): Self::SystemData) { let mut server_emitter = read_data.server_bus.emitter(); let dt = read_data.dt.0; // Set to false to avoid spamming server buffs.set_event_emission(false); - energies.set_event_emission(false); stats.set_event_emission(false); - for (entity, mut buff_comp, mut energy, mut stat, health) in ( + for (entity, mut buff_comp, energy, mut stat, health) in ( &read_data.entities, &mut buffs, - &mut energies, + &read_data.energies, &mut stats, &read_data.healths, ) @@ -106,9 +102,7 @@ impl<'a> System<'a> for Sys { } } - // Call to reset energy and stats to base values - energy.last_set(); - energy.reset_max(); + // Call to reset stats to base values stat.reset_temp_modifiers(); // Iterator over the lists of buffs by kind @@ -160,7 +154,7 @@ impl<'a> System<'a> for Sys { }, BuffEffect::MaxHealthModifier { value, kind } => match kind { ModifierKind::Additive => { - stat.max_health_modifier += *value / (health.maximum() as f32); + stat.max_health_modifier += *value / (health.base_max() as f32); }, ModifierKind::Fractional => { stat.max_health_modifier *= *value; @@ -168,12 +162,10 @@ impl<'a> System<'a> for Sys { }, BuffEffect::MaxEnergyModifier { value, kind } => match kind { ModifierKind::Additive => { - let new_max = (energy.maximum() as f32 + *value) as u32; - energy.set_maximum(new_max); + stat.max_energy_modifier += *value / (energy.base_max() as f32); }, ModifierKind::Fractional => { - let new_max = (energy.maximum() as f32 + *value) as u32; - energy.set_maximum(new_max); + stat.max_energy_modifier *= *value; }, }, BuffEffect::DamageReduction(dr) => { @@ -244,7 +236,6 @@ impl<'a> System<'a> for Sys { } // Turned back to true buffs.set_event_emission(true); - energies.set_event_emission(true); stats.set_event_emission(true); } } diff --git a/common/systems/src/lib.rs b/common/systems/src/lib.rs index 8e6f63292a..bd0b018e3d 100644 --- a/common/systems/src/lib.rs +++ b/common/systems/src/lib.rs @@ -24,8 +24,8 @@ pub fn add_local_systems(dispatch_builder: &mut DispatcherBuilder) { dispatch::(dispatch_builder, &[]); dispatch::(dispatch_builder, &[&mount::Sys::sys_name()]); dispatch::(dispatch_builder, &[&controller::Sys::sys_name()]); - dispatch::(dispatch_builder, &[]); dispatch::(dispatch_builder, &[]); + dispatch::(dispatch_builder, &[&buff::Sys::sys_name()]); dispatch::(dispatch_builder, &[ &interpolation::Sys::sys_name(), &controller::Sys::sys_name(), diff --git a/common/systems/src/melee.rs b/common/systems/src/melee.rs index 78d77a3e93..561b9a4b5b 100644 --- a/common/systems/src/melee.rs +++ b/common/systems/src/melee.rs @@ -146,6 +146,7 @@ impl<'a> System<'a> for Sys { uid: *uid, energy: read_data.energies.get(attacker), combo: read_data.combos.get(attacker), + inventory: read_data.inventories.get(attacker), }); let target_info = TargetInfo { diff --git a/common/systems/src/projectile.rs b/common/systems/src/projectile.rs index 443a8b84ba..a1bab8cd96 100644 --- a/common/systems/src/projectile.rs +++ b/common/systems/src/projectile.rs @@ -135,6 +135,7 @@ impl<'a> System<'a> for Sys { uid, energy: read_data.energies.get(entity), combo: read_data.combos.get(entity), + inventory: read_data.inventories.get(entity), } }); diff --git a/common/systems/src/shockwave.rs b/common/systems/src/shockwave.rs index 2b5c8fc812..d1d4fbb575 100644 --- a/common/systems/src/shockwave.rs +++ b/common/systems/src/shockwave.rs @@ -194,6 +194,7 @@ impl<'a> System<'a> for Sys { uid, energy: read_data.energies.get(entity), combo: read_data.combos.get(entity), + inventory: read_data.inventories.get(entity), }); let target_info = TargetInfo { diff --git a/common/systems/src/stats.rs b/common/systems/src/stats.rs index 4539978d62..ed6c9b3a9f 100644 --- a/common/systems/src/stats.rs +++ b/common/systems/src/stats.rs @@ -1,8 +1,9 @@ use common::{ + combat, comp::{ self, skills::{GeneralSkill, Skill}, - Body, CharacterState, Combo, Energy, EnergyChange, EnergySource, Health, Poise, + Body, CharacterState, Combo, Energy, EnergyChange, EnergySource, Health, Inventory, Poise, PoiseChange, PoiseSource, Pos, SkillSet, Stats, }, event::{EventBus, ServerEvent}, @@ -30,6 +31,7 @@ pub struct ReadData<'a> { uids: ReadStorage<'a, Uid>, bodies: ReadStorage<'a, Body>, char_states: ReadStorage<'a, CharacterState>, + inventories: ReadStorage<'a, Inventory>, } /// This system kills players, levels them up, and regenerates energy. @@ -84,13 +86,15 @@ impl<'a> System<'a> for Sys { poises.set_event_emission(true); // Update stats - for (entity, uid, stats, mut skill_set, mut health, pos) in ( + for (entity, uid, stats, mut skill_set, mut health, pos, mut energy, inventory) in ( &read_data.entities, &read_data.uids, &stats, &mut skill_sets.restrict_mut(), &mut healths.restrict_mut(), &read_data.positions, + &mut energies.restrict_mut(), + read_data.inventories.maybe(), ) .join() { @@ -123,6 +127,27 @@ impl<'a> System<'a> for Sys { health.scale_maximum(stat.max_health_modifier); } + let (change_energy, energy_scaling) = { + let energy = energy.get_unchecked(); + // Calculates energy scaling from stats and inventory + let new_energy_scaling = + combat::compute_max_energy_mod(energy, inventory) + stat.max_energy_modifier; + let current_energy_scaling = energy.maximum() as f32 / energy.base_max() as f32; + // Only changes energy if new modifier different from old modifer + // TODO: Look into using wider threshold incase floating point imprecision makes + // this always true + ( + (current_energy_scaling - new_energy_scaling).abs() > f32::EPSILON, + new_energy_scaling, + ) + }; + + // If modifier sufficiently different, mutably access energy + if change_energy { + let mut energy = energy.get_mut_unchecked(); + energy.scale_maximum(energy_scaling); + } + let skillset = skill_set.get_unchecked(); let skills_to_level = skillset .skill_groups diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 720d4e6036..91fe9325dc 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -2,7 +2,7 @@ use crate::{ client::Client, comp::{ agent::{Sound, SoundKind}, - biped_large, quadruped_low, quadruped_medium, quadruped_small, + biped_large, bird_large, quadruped_low, quadruped_medium, quadruped_small, skills::SkillGroupKind, theropod, PhysicsState, }, @@ -358,18 +358,73 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc quadruped_small::Species::Dodarock => { "common.loot_tables.creature.quad_small.dodarock" }, - _ => "common.loot_tables.creature.quad_small.default", + quadruped_small::Species::Truffler | quadruped_small::Species::Fungome => { + "common.loot_tables.creature.quad_small.mushroom" + }, + quadruped_small::Species::Sheep => { + "common.loot_tables.creature.quad_small.sheep" + }, + quadruped_small::Species::Skunk + | quadruped_small::Species::Quokka + | quadruped_small::Species::Beaver + | quadruped_small::Species::Jackalope + | quadruped_small::Species::Hare => { + "common.loot_tables.creature.quad_small.fur" + }, + quadruped_small::Species::Frog + | quadruped_small::Species::Axolotl + | quadruped_small::Species::Gecko + | quadruped_small::Species::Turtle => { + "common.loot_tables.creature.quad_small.ooze" + }, + _ => "common.loot_tables.creature.quad_small.generic", } }, Some(Body::QuadrupedMedium(quadruped_medium)) => match quadruped_medium.species { quadruped_medium::Species::Frostfang | quadruped_medium::Species::Roshwalr => { "common.loot_tables.creature.quad_medium.ice" }, - _ => "common.loot_tables.creature.quad_medium.default", + quadruped_medium::Species::Catoblepas => { + "common.loot_tables.creature.quad_medium.catoblepas" + }, + quadruped_medium::Species::Bear + | quadruped_medium::Species::Snowleopard + | quadruped_medium::Species::Tiger + | quadruped_medium::Species::Lion => { + "common.loot_tables.creature.quad_medium.clawed" + }, + quadruped_medium::Species::Tarasque + | quadruped_medium::Species::Bonerattler => { + "common.loot_tables.creature.quad_medium.carapace" + }, + quadruped_medium::Species::Dreadhorn => { + "common.loot_tables.creature.quad_medium.dreadhorn" + }, + quadruped_medium::Species::Mouflon + | quadruped_medium::Species::Camel + | quadruped_medium::Species::Deer + | quadruped_medium::Species::Hirdrasil + | quadruped_medium::Species::Horse + | quadruped_medium::Species::Highland + | quadruped_medium::Species::Zebra + | quadruped_medium::Species::Donkey + | quadruped_medium::Species::Antelope + | quadruped_medium::Species::Kelpie + | quadruped_medium::Species::Cattle + | quadruped_medium::Species::Yak => { + "common.loot_tables.creature.quad_medium.gentle" + }, + _ => "common.loot_tables.creature.quad_medium.fanged", }, Some(common::comp::Body::BirdMedium(_)) => { "common.loot_tables.creature.bird_medium" }, + Some(common::comp::Body::BirdLarge(bird_large)) => match bird_large.species { + bird_large::Species::Cockatrice => { + "common.loot_tables.creature.bird_large.cockatrice" + }, + _ => "common.loot_tables.creature.bird_large.phoenix", + }, Some(common::comp::Body::FishMedium(_)) => "common.loot_tables.creature.fish", Some(common::comp::Body::FishSmall(_)) => "common.loot_tables.creature.fish", Some(common::comp::Body::BipedLarge(biped_large)) => match biped_large.species { @@ -388,10 +443,12 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc Some(common::comp::Body::Theropod(theropod)) => match theropod.species { theropod::Species::Sandraptor | theropod::Species::Snowraptor - | theropod::Species::Woodraptor => { - "common.loot_tables.creature.theropod.raptor" - }, - _ => "common.loot_tables.creature.theropod.default", + | theropod::Species::Woodraptor + | theropod::Species::Sunlizard => "common.loot_tables.creature.theropod.raptor", + theropod::Species::Archaeos + | theropod::Species::Ntouka + | theropod::Species::Yale => "common.loot_tables.creature.theropod.horned", + _ => "common.loot_tables.creature.theropod.generic", }, Some(common::comp::Body::Dragon(_)) => "common.loot_tables.creature.dragon", Some(common::comp::Body::QuadrupedLow(quadruped_low)) => { @@ -399,7 +456,24 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc quadruped_low::Species::Maneater => { "common.loot_tables.creature.quad_low.maneater" }, - _ => "common.loot_tables.creature.quad_low.default", + quadruped_low::Species::Lavadrake + | quadruped_low::Species::Rocksnapper + | quadruped_low::Species::Sandshark => { + "common.loot_tables.creature.quad_low.carapace" + }, + quadruped_low::Species::Asp => { + "common.loot_tables.creature.quad_low.venemous" + }, + quadruped_low::Species::Hakulaq => { + "common.loot_tables.creature.quad_low.fanged" + }, + quadruped_low::Species::Deadwood => { + "common.loot_tables.creature.quad_low.deadwood" + }, + quadruped_low::Species::Basilisk => { + "common.loot_tables.creature.quad_low.basilisk" + }, + _ => "common.loot_tables.creature.quad_low.generic", } }, _ => "common.loot_tables.fallback", @@ -422,9 +496,16 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc Some(common::comp::Body::Humanoid(_)) => object::Body::Pouch, Some(common::comp::Body::BipedSmall(_)) => object::Body::Pouch, Some(common::comp::Body::Golem(_)) => object::Body::Chest, + Some(common::comp::Body::QuadrupedSmall(_)) => object::Body::SmallMeat, + Some(common::comp::Body::FishMedium(_)) + | Some(common::comp::Body::FishSmall(_)) => object::Body::FishMeat, + Some(common::comp::Body::QuadrupedMedium(_)) => object::Body::BeastMeat, Some(common::comp::Body::BipedLarge(_)) - | Some(common::comp::Body::QuadrupedLow(_)) => object::Body::MeatDrop, - _ => object::Body::Steak, + | Some(common::comp::Body::QuadrupedLow(_)) => object::Body::ToughMeat, + Some(common::comp::Body::BirdLarge(_)) + | Some(common::comp::Body::BirdMedium(_)) => object::Body::BirdMeat, + + _ => object::Body::BeastMeat, }) .maybe_with(vel) .with(item) @@ -689,25 +770,18 @@ pub fn handle_explosion(server: &Server, pos: Vec3, explosion: Explosion, o RadiusEffect::Attack(attack) => { let energies = &ecs.read_storage::(); let combos = &ecs.read_storage::(); + let inventories = &ecs.read_storage::(); for ( entity_b, pos_b, health_b, - ( - body_b_maybe, - inventory_b_maybe, - stats_b_maybe, - ori_b_maybe, - char_state_b_maybe, - uid_b, - ), + (body_b_maybe, stats_b_maybe, ori_b_maybe, char_state_b_maybe, uid_b), ) in ( &ecs.entities(), &ecs.read_storage::(), &ecs.read_storage::(), ( ecs.read_storage::().maybe(), - ecs.read_storage::().maybe(), ecs.read_storage::().maybe(), ecs.read_storage::().maybe(), ecs.read_storage::().maybe(), @@ -751,12 +825,13 @@ pub fn handle_explosion(server: &Server, pos: Vec3, explosion: Explosion, o uid, energy: energies.get(entity), combo: combos.get(entity), + inventory: inventories.get(entity), }); let target_info = combat::TargetInfo { entity: entity_b, uid: *uid_b, - inventory: inventory_b_maybe, + inventory: inventories.get(entity_b), stats: stats_b_maybe, health: Some(health_b), pos: pos_b.0, diff --git a/server/src/migrations/V39__meat_MR_organization.sql b/server/src/migrations/V39__meat_MR_organization.sql new file mode 100644 index 0000000000..cbb5f9a99d --- /dev/null +++ b/server/src/migrations/V39__meat_MR_organization.sql @@ -0,0 +1,197 @@ +-- xx +UPDATE item +SET item_definition_id = 'common.items.armor.cloth.druid.belt' WHERE item_definition_id = 'common.items.armor.druid.belt'; +UPDATE item +SET item_definition_id = 'common.items.armor.cloth.druid.chest' WHERE item_definition_id = 'common.items.armor.druid.chest'; +UPDATE item +SET item_definition_id = 'common.items.armor.cloth.druid.hand' WHERE item_definition_id = 'common.items.armor.druid.hand'; +UPDATE item +SET item_definition_id = 'common.items.armor.cloth.druid.pants' WHERE item_definition_id = 'common.items.armor.druid.pants'; +UPDATE item +SET item_definition_id = 'common.items.armor.cloth.druid.shoulder' WHERE item_definition_id = 'common.items.armor.druid.shoulder'; +UPDATE item +SET item_definition_id = 'common.items.armor.cloth.druid.foot' WHERE item_definition_id = 'common.items.armor.druid.foot'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.steel.belt' WHERE item_definition_id = 'common.items.armor.steel.belt'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.steel.chest' WHERE item_definition_id = 'common.items.armor.steel.chest'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.steel.hand' WHERE item_definition_id = 'common.items.armor.steel.hand'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.steel.pants' WHERE item_definition_id = 'common.items.armor.steel.pants'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.steel.shoulder' WHERE item_definition_id = 'common.items.armor.steel.shoulder'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.steel.foot' WHERE item_definition_id = 'common.items.armor.steel.foot'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.rawhide.belt' WHERE item_definition_id = 'common.items.armor.agile.belt'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.rawhide.chest' WHERE item_definition_id = 'common.items.armor.agile.chest'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.rawhide.hand' WHERE item_definition_id = 'common.items.armor.agile.hand'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.rawhide.pants' WHERE item_definition_id = 'common.items.armor.agile.pants'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.rawhide.shoulder' WHERE item_definition_id = 'common.items.armor.agile.shoulder'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.rawhide.foot' WHERE item_definition_id = 'common.items.armor.agile.foot'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.rawhide.back' WHERE item_definition_id = 'common.items.armor.agile.back'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.leather.belt' WHERE item_definition_id = 'common.items.armor.swift.belt'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.leather.chest' WHERE item_definition_id = 'common.items.armor.swift.chest'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.leather.hand' WHERE item_definition_id = 'common.items.armor.swift.hand'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.leather.pants' WHERE item_definition_id = 'common.items.armor.swift.pants'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.leather.shoulder' WHERE item_definition_id = 'common.items.armor.swift.shoulder'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.leather.foot' WHERE item_definition_id = 'common.items.armor.swift.foot'; +UPDATE item +SET item_definition_id = 'common.items.armor.hide.leather.head' WHERE item_definition_id = 'common.items.armor.swift.head'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.iron.belt' WHERE item_definition_id = 'common.items.armor.plate.belt'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.iron.chest' WHERE item_definition_id = 'common.items.armor.plate.chest'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.iron.hand' WHERE item_definition_id = 'common.items.armor.plate.hand'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.iron.pants' WHERE item_definition_id = 'common.items.armor.plate.pants'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.iron.shoulder' WHERE item_definition_id = 'common.items.armor.plate.shoulder'; +UPDATE item +SET item_definition_id = 'common.items.armor.mail.iron.foot' WHERE item_definition_id = 'common.items.armor.plate.foot'; +UPDATE item +SET item_definition_id = 'common.items.mineral.gem.amethyst' WHERE item_definition_id = 'common.items.crafting_ing.amethyst'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.hide.animal_hide' WHERE item_definition_id = 'common.items.crafting_ing.animal_pelt'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.log.bamboo' WHERE item_definition_id = 'common.items.crafting_ing.bamboo'; +UPDATE item +SET item_definition_id = 'common.items.mineral.stone.basalt' WHERE item_definition_id = 'common.items.crafting_ing.basalt'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.bloodsteel' WHERE item_definition_id = 'common.items.crafting_ing.bloosteel_ingot'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.bloodstone' WHERE item_definition_id = 'common.items.crafting_ing.bloodstone_ore'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.bone' WHERE item_definition_id = 'common.items.crafting_ing.bone'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.bronze' WHERE item_definition_id = 'common.items.crafting_ing.bronze_ingot'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.hide.carapace' WHERE item_definition_id = 'common.items.crafting_ing.carapace'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.claw' WHERE item_definition_id = 'common.items.crafting_ing.claw'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.cloth.cloth_scraps' WHERE item_definition_id = 'common.items.crafting_ing.linen'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.cloth.cloth_scraps_red' WHERE item_definition_id = 'common.items.crafting_ing.linen_red'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.coal' WHERE item_definition_id = 'common.items.crafting_ing.coal'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.cobalt' WHERE item_definition_id = 'common.items.crafting_ing.cobalt_ingot'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.copper' WHERE item_definition_id = 'common.items.crafting_ing.copper_ore'; +UPDATE item +SET item_definition_id = 'common.items.mineral.gem.diamond' WHERE item_definition_id = 'common.items.crafting_ing.diamond'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.hide.dragon_scale' WHERE item_definition_id = 'common.items.crafting_ing.dragon_scale'; +UPDATE item +SET item_definition_id = 'common.items.log.eldwood' WHERE item_definition_id = 'common.items.crafting_ing.eldwood_logs'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.ember' WHERE item_definition_id = 'common.items.crafting_ing.ember'; +UPDATE item +SET item_definition_id = 'common.items.mineral.gem.emerald' WHERE item_definition_id = 'common.items.crafting_ing.emerald'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.sharp_fang' WHERE item_definition_id = 'common.items.crafting_ing.fang'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.feather' WHERE item_definition_id = 'common.items.crafting_ing.feather'; +UPDATE item +SET item_definition_id = 'common.items.log.frostwood' WHERE item_definition_id = 'common.items.crafting_ing.frostwood_logs'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.fur' WHERE item_definition_id = 'common.items.crafting_ing.fur'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.gold' WHERE item_definition_id = 'common.items.crafting_ing.gold_ingot'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.gold' WHERE item_definition_id = 'common.items.crafting_ing.gold_ore'; +UPDATE item +SET item_definition_id = 'common.items.mineral.stone.granite' WHERE item_definition_id = 'common.items.crafting_ing.granite'; +UPDATE item +SET item_definition_id = 'common.items.log.hardwood' WHERE item_definition_id = 'common.items.crafting_ing.hardwood_logs'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.large_horn' WHERE item_definition_id = 'common.items.crafting_ing.horn'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.icy_fang' WHERE item_definition_id = 'common.items.crafting_ing.icy_fang'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.iron' WHERE item_definition_id = 'common.items.crafting_ing.iron_ingot'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.iron' WHERE item_definition_id = 'common.items.crafting_ing.iron_ore'; +UPDATE item +SET item_definition_id = 'common.items.log.ironwood' WHERE item_definition_id = 'common.items.crafting_ing.ironwood_logs'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.leather.simple_leather' WHERE item_definition_id = 'common.items.crafting_ing.leather'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.leather.leather_strips' WHERE item_definition_id = 'common.items.crafting_ing.leather_scraps'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.hide.leather_troll' WHERE item_definition_id = 'common.items.crafting_ing.leather_troll'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.cloth.lifecloth' WHERE item_definition_id = 'common.items.crafting_ing.lifecloth'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.cloth.linen' WHERE item_definition_id = 'common.items.crafting_ing.linen'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.cloth.moonweave' WHERE item_definition_id = 'common.items.crafting_ing.moonweave'; +UPDATE item +SET item_definition_id = 'common.items.mineral.stone.obsidian' WHERE item_definition_id = 'common.items.crafting_ing.obsidian'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.orichalcum' WHERE item_definition_id = 'common.items.crafting_ing.orichalcum_ingot'; +UPDATE item +SET item_definition_id = 'common.items.flowers.plant_fiber' WHERE item_definition_id = 'common.items.crafting_ing.plant_fiber'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.hide.plate' WHERE item_definition_id = 'common.items.crafting_ing.plate'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.raptor_feather' WHERE item_definition_id = 'common.items.crafting_ing.raptor_feather'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.leather.simple_leather' WHERE item_definition_id = 'common.items.crafting_ing.rawhide'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.stones' WHERE item_definition_id = 'common.items.crafting_ing.rock'; +UPDATE item +SET item_definition_id = 'common.items.mineral.gem.ruby' WHERE item_definition_id = 'common.items.crafting_ing.ruby'; +UPDATE item +SET item_definition_id = 'common.items.mineral.gem.sapphire' WHERE item_definition_id = 'common.items.crafting_ing.sapphire'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.hide.scales' WHERE item_definition_id = 'common.items.crafting_ing.scales'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.cloth.silk' WHERE item_definition_id = 'common.items.crafting_ing.silk'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.silver' WHERE item_definition_id = 'common.items.crafting_ing.silver_ingot'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.silver' WHERE item_definition_id = 'common.items.crafting_ing.silver_ore'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.steel' WHERE item_definition_id = 'common.items.crafting_ing.steel_ingot'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.cloth.sunsilk' WHERE item_definition_id = 'common.items.crafting_ing.sunsilk'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ingot.tin' WHERE item_definition_id = 'common.items.crafting_ing.tin_ingot'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.tin' WHERE item_definition_id = 'common.items.crafting_ing.tin_ore'; +UPDATE item +SET item_definition_id = 'common.items.mineral.gem.topaz' WHERE item_definition_id = 'common.items.crafting_ing.topaz'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.venom_sac' WHERE item_definition_id = 'common.items.crafting_ing.venomsac'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.lively_vine' WHERE item_definition_id = 'common.items.crafting_ing.vine'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.animal_misc.viscous_ooze' WHERE item_definition_id = 'common.items.crafting_ing.viscous_ooze'; +UPDATE item +SET item_definition_id = 'common.items.log.wood' WHERE item_definition_id = 'common.items.crafting_ing.wood_logs'; +UPDATE item +SET item_definition_id = 'common.items.crafting_ing.cloth.wool' WHERE item_definition_id = 'common.items.crafting_ing.wool'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.velorite' WHERE item_definition_id = 'common.items.ore.velorite'; +UPDATE item +SET item_definition_id = 'common.items.mineral.ore.veloritefrag' WHERE item_definition_id = 'common.items.ore.veloritefrag'; +UPDATE item +SET item_definition_id = 'common.items.food.meat.fish_raw' WHERE item_definition_id = 'common.items.food.fish'; +UPDATE item +SET item_definition_id = 'common.items.tool.pickaxe_stone' WHERE item_definition_id = 'common.items.tool.pick'; \ No newline at end of file diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs index 5a066a7f0e..940297025d 100644 --- a/server/src/rtsim/entity.rs +++ b/server/src/rtsim/entity.rs @@ -91,7 +91,7 @@ impl Entity { let back = match rng.gen_range(0..5) { 0 => Some(comp::Item::new_from_asset_expect( - "common.items.armor.agile.back", + "common.items.armor.hide.rawhide.back", )), 1 => Some(comp::Item::new_from_asset_expect( "common.items.armor.misc.back.backpack", @@ -127,7 +127,7 @@ impl Entity { "common.items.npc_armor.pants.leather_blue", )); let shoulder = Some(comp::Item::new_from_asset_expect( - "common.items.armor.swift.shoulder", + "common.items.armor.hide.leather.shoulder", )); LoadoutBuilder::build_loadout(self.get_body(), Some(main_tool), None, None) diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 761405f684..d2d34f96e5 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -147,6 +147,7 @@ pub enum CraftingTab { Tool, Utility, Glider, + ProcessedMaterial, } impl CraftingTab { fn name_key(&self) -> &str { @@ -161,6 +162,7 @@ impl CraftingTab { CraftingTab::Utility => "hud.crafting.tabs.utility", CraftingTab::Weapon => "hud.crafting.tabs.weapon", CraftingTab::Bag => "hud.crafting.tabs.bag", + CraftingTab::ProcessedMaterial => "hud.crafting.tabs.processed_material", } } @@ -176,6 +178,7 @@ impl CraftingTab { CraftingTab::Utility => imgs.icon_utility, CraftingTab::Weapon => imgs.icon_weapon, CraftingTab::Bag => imgs.icon_bag, + CraftingTab::ProcessedMaterial => imgs.icon_processed_material, } } @@ -189,6 +192,12 @@ impl CraftingTab { }, CraftingTab::Glider => matches!(item.kind(), ItemKind::Glider(_)), CraftingTab::Potion => item.tags().contains(&ItemTag::Potion), + CraftingTab::ProcessedMaterial => { + item.tags().contains(&ItemTag::MetalIngot) + | item.tags().contains(&ItemTag::Textile) + | item.tags().contains(&ItemTag::Leather) + | item.tags().contains(&ItemTag::BaseMaterial) + }, CraftingTab::Bag => item.tags().contains(&ItemTag::Bag), CraftingTab::Tool => item.tags().contains(&ItemTag::CraftingTool), CraftingTab::Utility => item.tags().contains(&ItemTag::Utility), @@ -688,6 +697,10 @@ impl<'a> Widget for Crafting<'a> { Some(SpriteKind::Cauldron) => "Cauldron", Some(SpriteKind::CookingPot) => "CookingPot", Some(SpriteKind::CraftingBench) => "CraftingBench", + Some(SpriteKind::Forge) => "Forge", + Some(SpriteKind::Loom) => "Loom", + Some(SpriteKind::SpinningWheel) => "SpinningWheel", + Some(SpriteKind::TanningRack) => "TanningRack", None => "CraftsmanHammer", _ => "CraftsmanHammer", }; @@ -707,6 +720,10 @@ impl<'a> Widget for Crafting<'a> { Some(SpriteKind::Cauldron) => "hud.crafting.cauldron", Some(SpriteKind::CookingPot) => "hud.crafting.cooking_pot", Some(SpriteKind::CraftingBench) => "hud.crafting.crafting_bench", + Some(SpriteKind::Forge) => "hud.crafting.forge", + Some(SpriteKind::Loom) => "hud.crafting.loom", + Some(SpriteKind::SpinningWheel) => "hud.crafting.spinning_wheel", + Some(SpriteKind::TanningRack) => "hud.crafting.tanning_rack", _ => "", }; Text::new(&self.localized_strings.get(station_name)) diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 3619f0b1cb..f4ab8b2ec1 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -107,6 +107,7 @@ image_ids! { icon_utility: "voxygen.element.ui.crafting.icons.utilities", icon_weapon: "voxygen.element.ui.crafting.icons.weapons", icon_bag: "voxygen.element.items.item_bag_leather_large", + icon_processed_material: "voxygen.element.ui.crafting.icons.processed_material", // Group Window member_frame: "voxygen.element.ui.groups.group_member_frame", diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 9199993816..7f93c96049 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -4,7 +4,7 @@ use common::{ item::{ armor::{Armor, ArmorKind, Protection}, tool::{Hands, StatKind, Stats, Tool, ToolKind}, - Item, ItemKind, MaterialStatManifest, ModularComponent, + Item, ItemKind, MaterialKind, MaterialStatManifest, ModularComponent, }, BuffKind, }, @@ -73,6 +73,16 @@ pub fn kind_text<'a>(kind: &ItemKind, i18n: &'a Localization) -> Cow<'a, str> { } } +pub fn material_kind_text<'a>(kind: &MaterialKind, i18n: &'a Localization) -> &'a str { + match kind { + MaterialKind::Metal { .. } => i18n.get("common.material.metal"), + MaterialKind::Wood { .. } => i18n.get("common.material.wood"), + MaterialKind::Stone { .. } => i18n.get("common.material.stone"), + MaterialKind::Cloth { .. } => i18n.get("common.material.cloth"), + MaterialKind::Hide { .. } => i18n.get("common.material.hide"), + } +} + // TODO: localization, refactor when mc are player facing pub fn modular_component_desc( mc: &ModularComponent, @@ -180,7 +190,7 @@ fn armor_kind<'a>(armor: &Armor, i18n: &'a Localization) -> &'a str { kind } -//Tool +// Tool fn tool_kind<'a>(tool: &Tool, i18n: &'a Localization) -> &'a str { let kind = match tool.kind { ToolKind::Sword => i18n.get("common.weapons.sword"), @@ -201,6 +211,7 @@ fn tool_kind<'a>(tool: &Tool, i18n: &'a Localization) -> &'a str { kind } +/// Output the number of hands needed to hold a tool pub fn tool_hands<'a>(tool: &Tool, i18n: &'a Localization) -> &'a str { let hands = match tool.hands { Hands::One => i18n.get("common.hands.one"), @@ -215,14 +226,10 @@ fn statblock_desc(stats: &Stats) -> String { stats.power * 10.0, stats.poise_strength * 10.0, stats.speed, - ) + &format!( - "Crit chance: {:0.1}%\n\nCrit damage: x{:0.1}\n\n", - stats.crit_chance * 100.0, - stats.crit_mult, - ) + ) + &format!("Crit chance: {:0.1}%\n\n", stats.crit_chance * 100.0,) } -// Compare two type, output a colored character to show comparison +/// Compare two type, output a colored character to show comparison pub fn comparison(first: T, other: T) -> (&'static str, conrod_core::Color) { if first == other { ("•", conrod_core::color::GREY) @@ -233,6 +240,7 @@ pub fn comparison(first: T, other: T) -> (&'static str, conrod_co } } +/// Output protection as a string pub fn protec2string(stat: Protection) -> String { match stat { Protection::Normal(a) => format!("{:.1}", a), diff --git a/voxygen/src/render/pipelines/particle.rs b/voxygen/src/render/pipelines/particle.rs index e067f906f3..947c861695 100644 --- a/voxygen/src/render/pipelines/particle.rs +++ b/voxygen/src/render/pipelines/particle.rs @@ -82,6 +82,7 @@ pub enum ParticleMode { Bubbles = 29, Water = 30, IceSpikes = 31, + Drip = 32, } impl ParticleMode { diff --git a/voxygen/src/scene/particle.rs b/voxygen/src/scene/particle.rs index 0bb3297d83..33452ec101 100644 --- a/voxygen/src/scene/particle.rs +++ b/voxygen/src/scene/particle.rs @@ -1047,6 +1047,14 @@ impl ParticleMgr { mode: ParticleMode::Leaf, cond: |_| true, }, + BlockParticles { + blocks: |boi| &boi.drip, + range: 4, + rate: 0.004, + lifetime: 20.0, + mode: ParticleMode::Drip, + cond: |_| true, + }, BlockParticles { blocks: |boi| &boi.fires, range: 2, diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs index 3b32b2f6a3..5544ca9c03 100644 --- a/voxygen/src/scene/terrain/watcher.rs +++ b/voxygen/src/scene/terrain/watcher.rs @@ -16,6 +16,7 @@ pub enum Interaction { #[derive(Default)] pub struct BlocksOfInterest { pub leaves: Vec>, + pub drip: Vec>, pub grass: Vec>, pub river: Vec>, pub fires: Vec>, @@ -41,6 +42,7 @@ impl BlocksOfInterest { pub fn from_chunk(chunk: &TerrainChunk) -> Self { span!(_guard, "from_chunk", "BlocksOfInterest::from_chunk"); let mut leaves = Vec::new(); + let mut drip = Vec::new(); let mut grass = Vec::new(); let mut river = Vec::new(); let mut fires = Vec::new(); @@ -70,6 +72,7 @@ impl BlocksOfInterest { .for_each(|(pos, block)| { match block.kind() { BlockKind::Leaves if thread_rng().gen_range(0..16) == 0 => leaves.push(pos), + BlockKind::WeakRock if thread_rng().gen_range(0..6) == 0 => drip.push(pos), BlockKind::Grass => { if thread_rng().gen_range(0..16) == 0 { grass.push(pos); @@ -101,6 +104,7 @@ impl BlocksOfInterest { }, Some(SpriteKind::WallSconce) => fire_bowls.push(pos + Vec3::unit_z()), Some(SpriteKind::Beehive) => beehives.push(pos), + Some(SpriteKind::CrystalHigh) => fireflies.push(pos), Some(SpriteKind::Reed) => { reeds.push(pos); fireflies.push(pos); @@ -121,6 +125,14 @@ impl BlocksOfInterest { Some(SpriteKind::Forge) => { interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle))) }, + Some(SpriteKind::TanningRack) => interactables + .push((pos, Interaction::Craft(CraftingTab::ProcessedMaterial))), + Some(SpriteKind::SpinningWheel) => { + interactables.push((pos, Interaction::Craft(CraftingTab::All))) + }, + Some(SpriteKind::Loom) => { + interactables.push((pos, Interaction::Craft(CraftingTab::All))) + }, Some(SpriteKind::Cauldron) => { interactables.push((pos, Interaction::Craft(CraftingTab::Potion))) }, @@ -143,6 +155,7 @@ impl BlocksOfInterest { Self { leaves, + drip, grass, river, fires, diff --git a/voxygen/src/ui/widgets/item_tooltip.rs b/voxygen/src/ui/widgets/item_tooltip.rs index 7d66c154d9..c1a64ed74b 100644 --- a/voxygen/src/ui/widgets/item_tooltip.rs +++ b/voxygen/src/ui/widgets/item_tooltip.rs @@ -13,7 +13,7 @@ use common::{ combat, comp::item::{ armor::{ArmorKind, Protection}, - Item, ItemDesc, ItemKind, MaterialStatManifest, Quality, + Item, ItemDesc, ItemKind, ItemTag, MaterialStatManifest, Quality, }, trade::SitePrices, }; @@ -434,10 +434,10 @@ impl<'a> Widget for ItemTooltip<'a> { if matches!(armor.kind, ArmorKind::Bag(_)) { 0 } else { - 1 + 5 } }, - ItemKind::Tool(_) => 5, + ItemKind::Tool(_) => 4, ItemKind::Consumable { .. } => 1, _ => 0, }; @@ -463,7 +463,24 @@ impl<'a> Widget for ItemTooltip<'a> { let (title, desc) = (item.name().to_string(), item.description().to_string()); - let subtitle = util::kind_text(item.kind(), i18n); + let item_kind = util::kind_text(item.kind(), i18n).to_string(); + + let material_tag = item.tags().iter().find_map(|t| match t { + ItemTag::Material(material) => Some(material), + _ => None, + }); + + let subtitle = if let Some(material_tag) = material_tag { + format!( + "{} ({})", + item_kind, + util::material_kind_text(&material_tag.material().material_kind(), i18n) + ) + } else { + item_kind + }; + + let style = self.style.desc; let text_color = conrod_core::color::WHITE; @@ -564,7 +581,6 @@ impl<'a> Widget for ItemTooltip<'a> { let speed = tool.base_speed(self.msm, item.components()); let poise_str = tool.base_poise_strength(self.msm, item.components()) * 10.0; let crit_chance = tool.base_crit_chance(self.msm, item.components()) * 100.0; - let crit_mult = tool.base_crit_mult(self.msm, item.components()); let combat_rating = combat::weapon_rating(&item, self.msm) * 10.0; // Combat Rating @@ -640,18 +656,6 @@ impl<'a> Widget for ItemTooltip<'a> { .down_from(state.ids.stats[2], V_PAD_STATS) .set(state.ids.stats[3], ui); - // Crit mult - widget::Text::new(&format!( - "{} : x{:.1}", - i18n.get("common.stats.crit_mult"), - crit_mult - )) - .graphics_for(id) - .parent(id) - .with_style(self.style.desc) - .color(text_color) - .down_from(state.ids.stats[3], V_PAD_STATS) - .set(state.ids.stats[4], ui); if let Some(equipped_item) = equip_slot.cloned().next() { if let ItemKind::Tool(equipped_tool) = equipped_item.kind() { let tool_stats = tool @@ -675,8 +679,6 @@ impl<'a> Widget for ItemTooltip<'a> { tool_stats.crit_chance, equipped_tool_stats.crit_chance, ); - let crit_mult_diff = - util::comparison(tool_stats.crit_mult, equipped_tool_stats.crit_mult); let equipped_combat_rating = combat::weapon_rating(&equipped_item, self.msm) * 10.0; let diff_main_stat = @@ -692,70 +694,40 @@ impl<'a> Widget for ItemTooltip<'a> { .set(state.ids.diff_main_stat, ui); } - if diff.power.abs() > f32::EPSILON { - widget::Text::new(&format!( - "{} {:.1}", - &power_diff.0, - &diff.power * 10.0 - )) - .align_middle_y_of(state.ids.stats[0]) - .right_from(state.ids.stats[0], H_PAD) - .graphics_for(id) - .parent(id) - .with_style(self.style.desc) - .color(power_diff.1) - .set(state.ids.diffs[0], ui); - } - if diff.speed.abs() > f32::EPSILON { - widget::Text::new(&format!("{} {:.1}", &speed_diff.0, &diff.speed)) - .align_middle_y_of(state.ids.stats[1]) - .right_from(state.ids.stats[1], H_PAD) + let mut diff_text = |text: String, color, id_index| { + widget::Text::new(&*text) + .align_middle_y_of(state.ids.stats[id_index]) + .right_from(state.ids.stats[id_index], H_PAD) .graphics_for(id) .parent(id) - .with_style(self.style.desc) - .color(speed_diff.1) - .set(state.ids.diffs[1], ui); + .with_style(style) + .color(color) + .set(state.ids.diffs[id_index], ui) + }; + + if diff.power.abs() > f32::EPSILON { + let text = format!("{} {:.1}", &power_diff.0, &diff.power * 10.0); + diff_text(text, power_diff.1, 0) + } + if diff.speed.abs() > f32::EPSILON { + let text = format!("{} {:.1}", &speed_diff.0, &diff.speed); + diff_text(text, speed_diff.1, 1) } if diff.poise_strength.abs() > f32::EPSILON { - widget::Text::new(&format!( + let text = format!( "{} {:.1}", &poise_strength_diff.0, &diff.poise_strength * 10.0 - )) - .align_middle_y_of(state.ids.stats[2]) - .right_from(state.ids.stats[2], H_PAD) - .graphics_for(id) - .parent(id) - .with_style(self.style.desc) - .color(poise_strength_diff.1) - .set(state.ids.diffs[2], ui); + ); + diff_text(text, poise_strength_diff.1, 2) } if diff.crit_chance.abs() > f32::EPSILON { - widget::Text::new(&format!( + let text = format!( "{} {:.1}%", &crit_chance_diff.0, &diff.crit_chance * 100.0 - )) - .align_middle_y_of(state.ids.stats[3]) - .right_from(state.ids.stats[3], H_PAD) - .graphics_for(id) - .parent(id) - .with_style(self.style.desc) - .color(crit_chance_diff.1) - .set(state.ids.diffs[3], ui); - } - if diff.crit_mult.abs() > f32::EPSILON { - widget::Text::new(&format!( - "{} {:.1}", - &crit_mult_diff.0, &diff.crit_mult - )) - .align_middle_y_of(state.ids.stats[4]) - .right_from(state.ids.stats[4], H_PAD) - .graphics_for(id) - .parent(id) - .with_style(self.style.desc) - .color(crit_mult_diff.1) - .set(state.ids.diffs[4], ui); + ); + diff_text(text, crit_chance_diff.1, 3) } } } @@ -780,8 +752,13 @@ impl<'a> Widget for ItemTooltip<'a> { }, _ => { // Armour - let protection = armor.get_protection(); - let poise_res = armor.get_poise_resilience(); + let protection = armor.protection(); + let poise_res = armor.poise_resilience(); + let energy_max = armor.energy_max() / 10; + let energy_reward = armor.energy_reward() * 10.0; + let crit_power = armor.crit_power(); + let stealth = armor.stealth(); + widget::Text::new(&util::protec2string(protection)) .graphics_for(id) .parent(id) @@ -815,6 +792,58 @@ impl<'a> Widget for ItemTooltip<'a> { .down_from(state.ids.item_frame, V_PAD) .set(state.ids.stats[0], ui); + // Max Energy + widget::Text::new(&format!( + "{} : {}", + i18n.get("common.stats.energy_max"), + energy_max + )) + .graphics_for(id) + .parent(id) + .with_style(self.style.desc) + .color(text_color) + .down_from(state.ids.stats[0], V_PAD_STATS) + .set(state.ids.stats[1], ui); + + // Energy Recovery + widget::Text::new(&format!( + "{} : {}", + i18n.get("common.stats.energy_reward"), + energy_reward + )) + .graphics_for(id) + .parent(id) + .with_style(self.style.desc) + .color(text_color) + .down_from(state.ids.stats[1], V_PAD_STATS) + .set(state.ids.stats[2], ui); + + // Crit Power + widget::Text::new(&format!( + "{} : {}", + i18n.get("common.stats.crit_power"), + crit_power + )) + .graphics_for(id) + .parent(id) + .with_style(self.style.desc) + .color(text_color) + .down_from(state.ids.stats[2], V_PAD_STATS) + .set(state.ids.stats[3], ui); + + // Stealth + widget::Text::new(&format!( + "{} : {}", + i18n.get("common.stats.stealth"), + stealth + )) + .graphics_for(id) + .parent(id) + .with_style(self.style.desc) + .color(text_color) + .down_from(state.ids.stats[3], V_PAD_STATS) + .set(state.ids.stats[4], ui); + // Slots if item.num_slots() > 0 { widget::Text::new(&format!( @@ -826,9 +855,8 @@ impl<'a> Widget for ItemTooltip<'a> { .parent(id) .with_style(self.style.desc) .color(text_color) - .x_align_to(state.ids.item_frame, conrod_core::position::Align::Start) - .down_from(state.ids.stats[0], V_PAD_STATS) - .set(state.ids.stats[1], ui); + .down_from(state.ids.stats[4], V_PAD_STATS) + .set(state.ids.stats[5], ui); } }, } @@ -836,16 +864,23 @@ impl<'a> Widget for ItemTooltip<'a> { if let Some(equipped_item) = equip_slot.cloned().next() { if let ItemKind::Armor(equipped_armor) = equipped_item.kind() { let diff = armor.stats - equipped_armor.stats; - let protection_diff = util::comparison( - &armor.get_protection(), - &equipped_armor.get_protection(), - ); + let protection_diff = + util::comparison(&armor.protection(), &equipped_armor.protection()); let poise_res_diff = util::comparison( - &armor.get_poise_resilience(), - &equipped_armor.get_poise_resilience(), + &armor.poise_resilience(), + &equipped_armor.poise_resilience(), ); - - if diff.get_protection() != Protection::Normal(0.0) { + let energy_max_diff = + util::comparison(&armor.energy_max(), &equipped_armor.energy_max()); + let energy_reward_diff = util::comparison( + &armor.energy_reward(), + &equipped_armor.energy_reward(), + ); + let crit_power_diff = + util::comparison(&armor.crit_power(), &equipped_armor.crit_power()); + let stealth_diff = + util::comparison(&armor.stealth(), &equipped_armor.stealth()); + if diff.protection() != Protection::Normal(0.0) { widget::Text::new(&protection_diff.0) .right_from(state.ids.main_stat_text, H_PAD) .graphics_for(id) @@ -855,19 +890,48 @@ impl<'a> Widget for ItemTooltip<'a> { .set(state.ids.diff_main_stat, ui); } - if diff.get_poise_resilience() != Protection::Normal(0.0) { - widget::Text::new(&format!( + let mut diff_text = |text: String, color, id_index| { + widget::Text::new(&*text) + .align_middle_y_of(state.ids.stats[id_index]) + .right_from(state.ids.stats[id_index], H_PAD) + .graphics_for(id) + .parent(id) + .with_style(style) + .color(color) + .set(state.ids.diffs[id_index], ui) + }; + + if diff.poise_resilience() != Protection::Normal(0.0) { + let text = format!( "{} {}", &poise_res_diff.0, - util::protec2string(diff.get_poise_resilience()) - )) - .align_middle_y_of(state.ids.stats[0]) - .right_from(state.ids.stats[0], H_PAD) - .graphics_for(id) - .parent(id) - .with_style(self.style.desc) - .color(poise_res_diff.1) - .set(state.ids.diffs[0], ui); + util::protec2string(diff.poise_resilience()) + ); + diff_text(text, poise_res_diff.1, 0) + } + + if diff.energy_max() != 0.0 as i32 { + let text = format!("{} {}", &energy_max_diff.0, diff.energy_max() / 10); + diff_text(text, energy_max_diff.1, 1) + } + + if diff.energy_reward() != 0.0_f32 { + let text = format!( + "{} {}", + &energy_reward_diff.0, + diff.energy_reward() * 10.0 + ); + diff_text(text, energy_reward_diff.1, 2) + } + + if diff.crit_power() != 0.0_f32 { + let text = format!("{} {}", &crit_power_diff.0, diff.crit_power()); + diff_text(text, crit_power_diff.1, 3) + } + + if diff.stealth() != 0.0_f32 { + let text = format!("{} {}", &stealth_diff.0, diff.stealth()); + diff_text(text, stealth_diff.1, 4) } } } @@ -981,10 +1045,10 @@ impl<'a> Widget for ItemTooltip<'a> { if matches!(armor.kind, ArmorKind::Bag(_)) { 0 } else { - 1 + 5 } }, - ItemKind::Tool(_) => 5, + ItemKind::Tool(_) => 4, ItemKind::Consumable { .. } => 1, ItemKind::ModularComponent { .. } => 1, _ => 0, diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index 9785b7b01a..c44d21492e 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -30,6 +30,11 @@ use vek::*; pub struct Colors { pub bridge: (u8, u8, u8), pub stalagtite: (u8, u8, u8), + pub cave_floor: (u8, u8, u8), + pub cave_roof: (u8, u8, u8), + pub dirt: (u8, u8, u8), + pub scaffold: (u8, u8, u8), + pub vein: (u8, u8, u8), } const EMPTY_AIR: Block = Block::air(SpriteKind::Empty); @@ -118,6 +123,8 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { let cave_x = (cave_dist / cave.width).min(1.0); // Relative units + let cave_depth = (col.alt - cave.alt).max(0.0); + let cave_floor = 0.0 - 0.5 * (1.0 - cave_x.powi(2)).max(0.0).sqrt() * cave.width; let cave_height = (1.0 - cave_x.powi(2)).max(0.0).sqrt() * cave.width; @@ -144,13 +151,30 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { }); } } + let noisy_color = |color: Rgb, factor: u32| { + let nz = RandomField::new(0).get(Vec3::new(wpos2d.x, wpos2d.y, surface_z)); + color.map(|e| { + (e as u32 + nz % (factor * 2)) + .saturating_sub(factor) + .min(255) as u8 + }) + }; + let ridge_condition = cave_depth % 10.0 > 8.0 && cave_depth > 10.0; + let pit_condition = cave_depth % 42.0 > 37.0 && cave_x > 0.6 && cave_depth > 200.0; + let pit_depth = 30; + let floor_dist = pit_condition as i32 * pit_depth as i32; + let vein_condition = + cave_depth % 12.0 > 11.5 && cave_x > 0.1 && cave_x < 0.6 && cave_depth > 200.0; + let stalagtite_condition = cave_depth > 150.0; + let vein_depth = 3; + let vein_floor = cave_base - vein_depth; // Stalagtites let stalagtites = info .index() .noise .cave_nz - .get(wpos2d.map(|e| e as f64 * 0.125).into_array()) + .get(wpos2d.map(|e| e as f64 * 0.18).into_array()) .sub(0.5) .max(0.0) .mul( @@ -164,31 +188,215 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { if canvas .get(Vec3::new(wpos2d.x, wpos2d.y, cave_roof)) .is_filled() + && stalagtite_condition { for z in cave_roof - stalagtites..cave_roof { canvas.set( Vec3::new(wpos2d.x, wpos2d.y, z), Block::new( BlockKind::WeakRock, - info.index().colors.layer.stalagtite.into(), + noisy_color(info.index().colors.layer.stalagtite.into(), 8), ), ); } } - let cave_depth = (col.alt - cave.alt).max(0.0); - let difficulty = cave_depth / 100.0; + let ground_colors = if cave_roof - cave_base > 23 { + noisy_color(info.index().colors.layer.cave_floor.into(), 8) + } else { + noisy_color(info.index().colors.layer.dirt.into(), 8) + }; - // Scatter things in caves - if rng.gen::() < 0.001 * difficulty.powf(1.5) && cave_base < surface_z as i32 - 25 + //make pits + for z in cave_base - pit_depth..cave_base { + if pit_condition && (cave_roof - cave_base) > 10 { + canvas.set( + Vec3::new(wpos2d.x, wpos2d.y, z), + Block::new( + BlockKind::Air, + noisy_color(info.index().colors.layer.scaffold.into(), 8), + ), + ); + } + } + //fill bottom of pits + for z in cave_base - pit_depth + ..cave_base - pit_depth + ((cave_x.powf(4.0) * (pit_depth as f32 + 3.0)) as i32) + 1 { - let kind = *Lottery::::load_expect("common.cave_scatter") + if (cave_roof - cave_base) > 10 && pit_condition { + canvas.set( + Vec3::new(wpos2d.x, wpos2d.y, z), + Block::new(BlockKind::WeakRock, ground_colors), + ); + } + } + //empty veins + for z in cave_base - vein_depth..cave_base { + if vein_condition { + canvas.set( + Vec3::new(wpos2d.x, wpos2d.y, z), + Block::new( + BlockKind::Air, + noisy_color(info.index().colors.layer.scaffold.into(), 8), + ), + ); + } + } + + //fill veins except bottom later + for z in cave_base - vein_depth + 1..cave_base { + if vein_condition { + canvas.set( + Vec3::new(wpos2d.x, wpos2d.y, z), + Block::new( + BlockKind::WeakRock, + noisy_color(info.index().colors.layer.vein.into(), 16), + ), + ); + } + } + //fill some of bottom + for z in cave_base - vein_depth..cave_base - vein_depth + 1 { + if rng.gen::() < 0.5 && vein_condition { + canvas.set( + Vec3::new(wpos2d.x, wpos2d.y, z), + Block::new( + BlockKind::WeakRock, + noisy_color(info.index().colors.layer.vein.into(), 16), + ), + ); + } + } + if vein_condition && rng.gen::() > 0.7 { + let kind = *Lottery::::load_expect("common.cave_scatter.vein") .read() .choose(); - canvas.map(Vec3::new(wpos2d.x, wpos2d.y, cave_base), |block| { + canvas.map(Vec3::new(wpos2d.x, wpos2d.y, vein_floor), |block| { block.with_sprite(kind) }); } + + //fill normal floor + for z in cave_base..cave_base + 1 { + if cave_depth > 15.0 + && (cave_roof - cave_base) > 10 + && !pit_condition + && !vein_condition + { + canvas.set( + Vec3::new(wpos2d.x, wpos2d.y, z), + Block::new(BlockKind::WeakRock, ground_colors), + ); + } + } + //fill roof + for z in cave_roof - 1..cave_roof { + if cave_depth > 30.0 && (cave_roof - cave_base) > 10 { + canvas.set( + Vec3::new(wpos2d.x, wpos2d.y, z), + Block::new( + BlockKind::WeakRock, + noisy_color(info.index().colors.layer.cave_roof.into(), 8), + ), + ); + } + } + //add ridges + for z in cave_roof - 4..cave_roof { + if ridge_condition && (cave_roof - cave_base) > 10 { + canvas.set( + Vec3::new(wpos2d.x, wpos2d.y, z), + Block::new( + BlockKind::WeakRock, + noisy_color(info.index().colors.layer.scaffold.into(), 8), + ), + ); + } + } + + let cave_roof_adjusted = if (cave_roof - cave_base) > 10 { + cave_roof - 1 + } else { + cave_roof + }; + + let cave_floor_adjusted = if (cave_roof - cave_base) > 10 { + cave_base + 1 - floor_dist + } else { + cave_base - floor_dist + }; + + // Scatter things in caves + if cave_depth > 40.0 && cave_depth < 80.0 { + if rng.gen::() < 0.2 * (cave_x.max(0.5).powf(4.0)) && !vein_condition { + let kind = + *Lottery::::load_expect("common.cave_scatter.shallow_floor") + .read() + .choose(); + canvas.map( + Vec3::new(wpos2d.x, wpos2d.y, cave_floor_adjusted), + |block| block.with_sprite(kind), + ); + } + if rng.gen::() < 0.3 * (cave_x.max(0.5).powf(4.0)) && !ridge_condition { + let kind = + *Lottery::::load_expect("common.cave_scatter.shallow_ceiling") + .read() + .choose(); + canvas.map( + Vec3::new(wpos2d.x, wpos2d.y, cave_roof_adjusted - 1), + |block| block.with_sprite(kind), + ); + } + } else if cave_depth < 200.0 && cave_depth > 80.0 { + if rng.gen::() < 0.12 * (cave_x.max(0.5).powf(4.0)) && !vein_condition { + let kind = + *Lottery::::load_expect("common.cave_scatter.deep_floor") + .read() + .choose(); + canvas.map( + Vec3::new(wpos2d.x, wpos2d.y, cave_floor_adjusted), + |block| block.with_sprite(kind), + ); + } + if rng.gen::() < 0.3 * (cave_x.max(0.5).powf(4.0)) && !ridge_condition { + let kind = + *Lottery::::load_expect("common.cave_scatter.deep_ceiling") + .read() + .choose(); + canvas.map( + Vec3::new(wpos2d.x, wpos2d.y, cave_roof_adjusted - 1), + |block| block.with_sprite(kind), + ); + } + } else { + if rng.gen::() < 0.12 * (cave_x.max(0.5).powf(4.0)) + && cave_depth > 40.0 + && !vein_condition + { + let kind = + *Lottery::::load_expect("common.cave_scatter.dark_floor") + .read() + .choose(); + canvas.map( + Vec3::new(wpos2d.x, wpos2d.y, cave_floor_adjusted), + |block| block.with_sprite(kind), + ); + } + if rng.gen::() < 0.02 * (cave_x.max(0.5).powf(4.0)) + && !ridge_condition + && cave_depth > 40.0 + { + let kind = + *Lottery::::load_expect("common.cave_scatter.dark_ceiling") + .read() + .choose(); + canvas.map( + Vec3::new(wpos2d.x, wpos2d.y, cave_roof_adjusted - 1), + |block| block.with_sprite(kind), + ); + } + }; } }); } @@ -228,11 +436,10 @@ pub fn apply_caves_supplement<'a>( // Abs units let cave_base = (cave.alt + cave_floor) as i32; - let cave_depth = (col_sample.alt - cave.alt).max(0.0); - let difficulty = cave_depth / 200.0; + let cave_depth = (col_sample.alt - cave.alt).max(0.0); //slightly different from earlier cave depth? // Scatter things in caves - if RandomField::new(index.seed).chance(wpos2d.into(), 0.001 * difficulty) + if RandomField::new(index.seed).chance(wpos2d.into(), 0.0018) && cave_base < surface_z as i32 - 40 { let is_hostile: bool; @@ -241,59 +448,44 @@ pub fn apply_caves_supplement<'a>( wpos2d.y as f32, cave_base as f32, )) - .with_body(match dynamic_rng.gen_range(0..5) { - 0 => { - is_hostile = false; - let species = match dynamic_rng.gen_range(0..4) { - 0 => comp::quadruped_small::Species::Truffler, - 1 => comp::quadruped_small::Species::Dodarock, - 2 => comp::quadruped_small::Species::Holladon, - _ => comp::quadruped_small::Species::Batfox, - }; - comp::quadruped_small::Body::random_with(dynamic_rng, &species).into() - }, - 1 => { - is_hostile = true; - let species = match dynamic_rng.gen_range(0..2) { - 0 => comp::quadruped_medium::Species::Tarasque, - _ => comp::quadruped_medium::Species::Bonerattler, - }; - comp::quadruped_medium::Body::random_with(dynamic_rng, &species).into() - }, - 2 => { - is_hostile = true; - let species = match dynamic_rng.gen_range(0..3) { - 0 => comp::quadruped_low::Species::Rocksnapper, - 1 => comp::quadruped_low::Species::Lavadrake, - _ => comp::quadruped_low::Species::Salamander, - }; - comp::quadruped_low::Body::random_with(dynamic_rng, &species).into() - }, - 3 => { - is_hostile = true; - let species = match dynamic_rng.gen_range(0..5) { - 0 => comp::theropod::Species::Sandraptor, - 1 => comp::theropod::Species::Snowraptor, - 2 => comp::theropod::Species::Woodraptor, - 3 => comp::theropod::Species::Odonto, - _ => comp::theropod::Species::Archaeos, - }; - comp::theropod::Body::random_with(dynamic_rng, &species).into() - }, - _ => { - is_hostile = true; - let species = match dynamic_rng.gen_range(0..5) { - 0 => comp::biped_large::Species::Ogre, - 1 => comp::biped_large::Species::Cyclops, - 2 => comp::biped_large::Species::Wendigo, - 3 => match dynamic_rng.gen_range(0..2) { - 0 => comp::biped_large::Species::Blueoni, - _ => comp::biped_large::Species::Redoni, - }, - _ => comp::biped_large::Species::Troll, - }; - comp::biped_large::Body::random_with(dynamic_rng, &species).into() - }, + .with_body(if cave_depth < 70.0 { + is_hostile = false; + let species = match dynamic_rng.gen_range(0..4) { + 0 => comp::quadruped_small::Species::Truffler, + 1 => comp::quadruped_small::Species::Dodarock, + 2 => comp::quadruped_small::Species::Holladon, + _ => comp::quadruped_small::Species::Batfox, + }; + comp::quadruped_small::Body::random_with(dynamic_rng, &species).into() + } else if cave_depth < 120.0 { + is_hostile = true; + let species = match dynamic_rng.gen_range(0..3) { + 0 => comp::quadruped_low::Species::Rocksnapper, + 1 => comp::quadruped_low::Species::Salamander, + _ => comp::quadruped_low::Species::Asp, + }; + comp::quadruped_low::Body::random_with(dynamic_rng, &species).into() + } else if cave_depth < 200.0 { + is_hostile = true; + let species = match dynamic_rng.gen_range(0..3) { + 0 => comp::quadruped_low::Species::Rocksnapper, + 1 => comp::quadruped_low::Species::Lavadrake, + _ => comp::quadruped_low::Species::Basilisk, + }; + comp::quadruped_low::Body::random_with(dynamic_rng, &species).into() + } else { + is_hostile = true; + let species = match dynamic_rng.gen_range(0..5) { + 0 => comp::biped_large::Species::Ogre, + 1 => comp::biped_large::Species::Cyclops, + 2 => comp::biped_large::Species::Wendigo, + 3 => match dynamic_rng.gen_range(0..2) { + 0 => comp::biped_large::Species::Blueoni, + _ => comp::biped_large::Species::Redoni, + }, + _ => comp::biped_large::Species::Troll, + }; + comp::biped_large::Body::random_with(dynamic_rng, &species).into() }) .with_alignment(if is_hostile { comp::Alignment::Enemy @@ -375,10 +567,7 @@ pub fn apply_coral_to(canvas: &mut Canvas) { }); if is_coral { - let _ = canvas.set( - wpos, - Block::new(BlockKind::WeakRock, Rgb::new(170, 220, 210)), - ); + let _ = canvas.set(wpos, Block::new(BlockKind::Rock, Rgb::new(170, 220, 210))); } } }); diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs index 46d4f9f07e..9bbfb0593d 100644 --- a/world/src/layer/scatter.rs +++ b/world/src/layer/scatter.rs @@ -85,6 +85,18 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { Some((100.0, 0.1)), ) }), + (Cotton, false, |c, col| { + ( + close(c.temp, CONFIG.temperate_temp, 0.7).min(close( + c.humidity, + CONFIG.jungle_hum, + 0.4, + )) * col.tree_density + * MUSH_FACT + * 75.0, + Some((256.0, 0.25)), + ) + }), (Sunflower, false, |c, col| { ( close(c.temp, 0.0, 0.7).min(close(c.humidity, CONFIG.jungle_hum, 0.4)) @@ -94,6 +106,15 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { Some((100.0, 0.15)), ) }), + (WildFlax, false, |c, col| { + ( + close(c.temp, 0.0, 0.7).min(close(c.humidity, CONFIG.jungle_hum, 0.4)) + * col.tree_density + * MUSH_FACT + * 600.0, + Some((100.0, 0.15)), + ) + }), // Herbs and Spices (LingonBerry, false, |c, _| { ( @@ -141,6 +162,12 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { (Stones, false, |c, _| { ((c.rockiness - 0.5).max(0.025) * 1.0e-3, None) }), + (Copper, false, |c, _| { + ((c.rockiness - 0.1).max(0.025) * 1.5e-3, None) + }), + (Tin, false, |c, _| { + ((c.rockiness - 0.5).max(0.025) * 1.5e-3, None) + }), // Don't spawn Mushrooms in snowy regions (Mushroom, false, |c, _| { ( @@ -196,6 +223,16 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { Some((48.0, 0.2)), ) }), + (Moonbell, false, |c, _| { + ( + close(c.temp, CONFIG.snow_temp - 0.2, 0.4).min(close( + c.humidity, + CONFIG.forest_hum, + 0.5, + )) * 0.003, + Some((48.0, 0.2)), + ) + }), // Savanna Plants (SavannaGrass, false, |c, _| { ( @@ -244,6 +281,12 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { None, ) }), + (Pyrebloom, false, |c, _| { + ( + close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.35, + None, + ) + }), (LargeCactus, false, |c, _| { ( close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1)) * MUSH_FACT * 3.5, diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index 55cd251541..266fba7ed4 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -1207,7 +1207,7 @@ fn mini_boss_0(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3) -> Vec) -> Vec { - let chosen = Lottery::::load_expect("common.loot_tables.creature.quad_small.default"); + let chosen = Lottery::::load_expect("common.loot_tables.creature.quad_small.generic"); let mut entities = Vec::new(); entities.resize_with(8, || { EntityInfo::at(tile_wcenter.map(|e| e as f32)) @@ -1224,7 +1224,7 @@ fn mini_boss_1(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3) -> Vec) -> Vec { - let chosen = Lottery::::load_expect("common.loot_tables.creature.quad_low.default"); + let chosen = Lottery::::load_expect("common.loot_tables.creature.quad_low.fanged"); let mut entities = Vec::new(); entities.resize_with(6, || { EntityInfo::at(tile_wcenter.map(|e| e as f32)) @@ -1242,7 +1242,7 @@ fn mini_boss_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3) -> Vec) -> Vec { let chosen = - Lottery::::load_expect("common.loot_tables.creature.quad_medium.default"); + Lottery::::load_expect("common.loot_tables.creature.quad_medium.carapace"); let mut entities = Vec::new(); entities.resize_with(3, || { EntityInfo::at(tile_wcenter.map(|e| e as f32)) diff --git a/world/src/site/settlement/building/archetype/house.rs b/world/src/site/settlement/building/archetype/house.rs index 7aecd69def..71c5516e4c 100644 --- a/world/src/site/settlement/building/archetype/house.rs +++ b/world/src/site/settlement/building/archetype/house.rs @@ -524,13 +524,13 @@ impl Archetype for House { && center_offset.map(|e| e % 3 == 0).reduce_and() && self .noise - .chance(Vec3::new(center_offset.x, center_offset.y, z), 0.2) + .chance(Vec3::new(center_offset.x, center_offset.y, z), 0.8) { let furniture = match self.noise.get(Vec3::new( center_offset.x, center_offset.y, z + 100, - )) % 8 + )) % 12 { 0..=1 => SpriteKind::Crate, 2 => SpriteKind::Bench, @@ -539,7 +539,10 @@ impl Archetype for House { 5 => SpriteKind::CraftingBench, 6 => SpriteKind::FireBowlGround, 7 => SpriteKind::Cauldron, - //8 => SpriteKind::Forge, + 8 => SpriteKind::Forge, + 9 => SpriteKind::Loom, + 10 => SpriteKind::SpinningWheel, + 11 => SpriteKind::TanningRack, _ => unreachable!(), };