From 81f3e3bae7d82f0e0ad72d89ea5a5fdae8804712 Mon Sep 17 00:00:00 2001 From: historia <[not public]> Date: Sun, 5 Jul 2026 00:41:11 -0400 Subject: fix: remove redundant 'quality' on items, fix ranged str on ammo, item admin ui updates --- data/items/ammo/adamant_arrow.yaml | 3 +-- data/items/ammo/adamant_bolts.yaml | 2 +- data/items/ammo/bronze_arrow.yaml | 2 +- data/items/ammo/bronze_bolts.yaml | 2 +- data/items/ammo/diamond_bolts.yaml | 4 ++-- data/items/ammo/diamond_bolts_e.yaml | 4 ++-- data/items/ammo/emerald_bolts.yaml | 4 ++-- data/items/ammo/emerald_bolts_e.yaml | 4 ++-- data/items/ammo/iron_arrow.yaml | 2 +- data/items/ammo/iron_bolts.yaml | 2 +- data/items/ammo/mithril_arrow.yaml | 2 +- data/items/ammo/mithril_bolts.yaml | 2 +- data/items/ammo/ruby_bolts.yaml | 4 ++-- data/items/ammo/ruby_bolts_e.yaml | 4 ++-- data/items/ammo/rune_arrow.yaml | 2 +- data/items/ammo/rune_bolts.yaml | 2 +- data/items/ammo/sapphire_bolts.yaml | 4 ++-- data/items/ammo/sapphire_bolts_e.yaml | 4 ++-- data/items/ammo/steel_arrow.yaml | 2 +- data/items/ammo/steel_bolts.yaml | 2 +- data/items/consumables/bread_dough.yaml | 1 - data/items/tools/lighter.yaml | 1 - 22 files changed, 28 insertions(+), 31 deletions(-) (limited to 'data/items') diff --git a/data/items/ammo/adamant_arrow.yaml b/data/items/ammo/adamant_arrow.yaml index 9cacf2f..4c732ce 100644 --- a/data/items/ammo/adamant_arrow.yaml +++ b/data/items/ammo/adamant_arrow.yaml @@ -22,13 +22,12 @@ craft: description: An adamant-tipped arrow. equipment: other: - ranged: 31 + ranged_strength: 31 slot: ammo type: ammo id: adamant_arrow max_quality: 0 name: adamant arrow -quality: 0 recoverable: true stackable: true value: 20 diff --git a/data/items/ammo/adamant_bolts.yaml b/data/items/ammo/adamant_bolts.yaml index 90476ad..587825d 100644 --- a/data/items/ammo/adamant_bolts.yaml +++ b/data/items/ammo/adamant_bolts.yaml @@ -15,7 +15,7 @@ craft: description: Adamant crossbow bolts. equipment: other: - ranged: 43 + ranged_strength: 43 slot: ammo type: ammo name: adamant bolts diff --git a/data/items/ammo/bronze_arrow.yaml b/data/items/ammo/bronze_arrow.yaml index 855b141..16b109a 100644 --- a/data/items/ammo/bronze_arrow.yaml +++ b/data/items/ammo/bronze_arrow.yaml @@ -15,7 +15,7 @@ craft: description: A bronze-tipped arrow. equipment: other: - ranged: 7 + ranged_strength: 7 slot: ammo type: ammo name: bronze arrow diff --git a/data/items/ammo/bronze_bolts.yaml b/data/items/ammo/bronze_bolts.yaml index ab04b3e..6d293b5 100644 --- a/data/items/ammo/bronze_bolts.yaml +++ b/data/items/ammo/bronze_bolts.yaml @@ -15,7 +15,7 @@ craft: description: Bronze crossbow bolts. equipment: other: - ranged: 10 + ranged_strength: 10 slot: ammo type: ammo name: bronze bolts diff --git a/data/items/ammo/diamond_bolts.yaml b/data/items/ammo/diamond_bolts.yaml index bff23ac..5c8e2a3 100644 --- a/data/items/ammo/diamond_bolts.yaml +++ b/data/items/ammo/diamond_bolts.yaml @@ -14,8 +14,8 @@ craft: xp: 7 description: Bolts tipped with diamond. Can be enchanted via science. equipment: - attack: - ranged: 9 + other: + ranged_strength: 9 slot: ammo type: ammo name: diamond bolts diff --git a/data/items/ammo/diamond_bolts_e.yaml b/data/items/ammo/diamond_bolts_e.yaml index 86209f2..42e4493 100644 --- a/data/items/ammo/diamond_bolts_e.yaml +++ b/data/items/ammo/diamond_bolts_e.yaml @@ -1,8 +1,8 @@ color: FF bold description: Enchanted diamond-tipped bolts. Have a chance to ignore the target's defense. equipment: - attack: - ranged: 10 + other: + ranged_strength: 10 slot: ammo type: ammo name: diamond bolts e diff --git a/data/items/ammo/emerald_bolts.yaml b/data/items/ammo/emerald_bolts.yaml index 4f1a123..a07a5be 100644 --- a/data/items/ammo/emerald_bolts.yaml +++ b/data/items/ammo/emerald_bolts.yaml @@ -14,8 +14,8 @@ craft: xp: 5 description: Bolts tipped with emerald. Can be enchanted via science. equipment: - attack: - ranged: 5 + other: + ranged_strength: 5 slot: ammo type: ammo name: emerald bolts diff --git a/data/items/ammo/emerald_bolts_e.yaml b/data/items/ammo/emerald_bolts_e.yaml index 59f3883..5440c25 100644 --- a/data/items/ammo/emerald_bolts_e.yaml +++ b/data/items/ammo/emerald_bolts_e.yaml @@ -1,8 +1,8 @@ color: 22 bold description: Enchanted emerald-tipped bolts. Have a chance to poison the target. equipment: - attack: - ranged: 6 + other: + ranged_strength: 6 slot: ammo type: ammo name: emerald bolts e diff --git a/data/items/ammo/iron_arrow.yaml b/data/items/ammo/iron_arrow.yaml index baaa64e..f739521 100644 --- a/data/items/ammo/iron_arrow.yaml +++ b/data/items/ammo/iron_arrow.yaml @@ -15,7 +15,7 @@ craft: description: An iron-tipped arrow. equipment: other: - ranged: 10 + ranged_strength: 10 slot: ammo type: ammo name: iron arrow diff --git a/data/items/ammo/iron_bolts.yaml b/data/items/ammo/iron_bolts.yaml index 2b93900..f939c80 100644 --- a/data/items/ammo/iron_bolts.yaml +++ b/data/items/ammo/iron_bolts.yaml @@ -15,7 +15,7 @@ craft: description: Iron crossbow bolts. equipment: other: - ranged: 17 + ranged_strength: 17 slot: ammo type: ammo name: iron bolts diff --git a/data/items/ammo/mithril_arrow.yaml b/data/items/ammo/mithril_arrow.yaml index 8e37103..9dd438a 100644 --- a/data/items/ammo/mithril_arrow.yaml +++ b/data/items/ammo/mithril_arrow.yaml @@ -15,7 +15,7 @@ craft: description: A mithril-tipped arrow. equipment: other: - ranged: 22 + ranged_strength: 22 slot: ammo type: ammo name: mithril arrow diff --git a/data/items/ammo/mithril_bolts.yaml b/data/items/ammo/mithril_bolts.yaml index d21d769..b443ba5 100644 --- a/data/items/ammo/mithril_bolts.yaml +++ b/data/items/ammo/mithril_bolts.yaml @@ -15,7 +15,7 @@ craft: description: Mithril crossbow bolts. equipment: other: - ranged: 32 + ranged_strength: 32 slot: ammo type: ammo name: mithril bolts diff --git a/data/items/ammo/ruby_bolts.yaml b/data/items/ammo/ruby_bolts.yaml index f539b4f..8862503 100644 --- a/data/items/ammo/ruby_bolts.yaml +++ b/data/items/ammo/ruby_bolts.yaml @@ -14,8 +14,8 @@ craft: xp: 6 description: Bolts tipped with ruby. Can be enchanted via science. equipment: - attack: - ranged: 7 + other: + ranged_strength: 7 slot: ammo type: ammo name: ruby bolts diff --git a/data/items/ammo/ruby_bolts_e.yaml b/data/items/ammo/ruby_bolts_e.yaml index 618cf62..b66b0b2 100644 --- a/data/items/ammo/ruby_bolts_e.yaml +++ b/data/items/ammo/ruby_bolts_e.yaml @@ -1,8 +1,8 @@ color: C4 bold description: Enchanted ruby-tipped bolts. Have a chance to deal extra damage based on the target's remaining HP. equipment: - attack: - ranged: 8 + other: + ranged_strength: 8 slot: ammo type: ammo name: ruby bolts e diff --git a/data/items/ammo/rune_arrow.yaml b/data/items/ammo/rune_arrow.yaml index 3db9665..bd663f6 100644 --- a/data/items/ammo/rune_arrow.yaml +++ b/data/items/ammo/rune_arrow.yaml @@ -15,7 +15,7 @@ craft: description: A rune-tipped arrow. equipment: other: - ranged: 49 + ranged_strength: 49 slot: ammo type: ammo name: rune arrow diff --git a/data/items/ammo/rune_bolts.yaml b/data/items/ammo/rune_bolts.yaml index 5875f05..5022d80 100644 --- a/data/items/ammo/rune_bolts.yaml +++ b/data/items/ammo/rune_bolts.yaml @@ -15,7 +15,7 @@ craft: description: Rune crossbow bolts. equipment: other: - ranged: 55 + ranged_strength: 55 slot: ammo type: ammo name: rune bolts diff --git a/data/items/ammo/sapphire_bolts.yaml b/data/items/ammo/sapphire_bolts.yaml index 893ddc3..5b6b698 100644 --- a/data/items/ammo/sapphire_bolts.yaml +++ b/data/items/ammo/sapphire_bolts.yaml @@ -14,8 +14,8 @@ craft: xp: 4 description: Bolts tipped with sapphire. Can be enchanted via science. equipment: - attack: - ranged: 3 + other: + ranged_strength: 3 slot: ammo type: ammo name: sapphire bolts diff --git a/data/items/ammo/sapphire_bolts_e.yaml b/data/items/ammo/sapphire_bolts_e.yaml index 07694ea..aa28211 100644 --- a/data/items/ammo/sapphire_bolts_e.yaml +++ b/data/items/ammo/sapphire_bolts_e.yaml @@ -1,8 +1,8 @@ color: 27 bold description: Enchanted sapphire-tipped bolts. Have a chance to drain the target's Science level. equipment: - attack: - ranged: 4 + other: + ranged_strength: 4 slot: ammo type: ammo name: sapphire bolts e diff --git a/data/items/ammo/steel_arrow.yaml b/data/items/ammo/steel_arrow.yaml index d1094ad..8a6063d 100644 --- a/data/items/ammo/steel_arrow.yaml +++ b/data/items/ammo/steel_arrow.yaml @@ -15,7 +15,7 @@ craft: description: A steel-tipped arrow. equipment: other: - ranged: 16 + ranged_strength: 16 slot: ammo type: ammo name: steel arrow diff --git a/data/items/ammo/steel_bolts.yaml b/data/items/ammo/steel_bolts.yaml index ab42ad7..2d0bc5c 100644 --- a/data/items/ammo/steel_bolts.yaml +++ b/data/items/ammo/steel_bolts.yaml @@ -15,7 +15,7 @@ craft: description: Steel crossbow bolts. equipment: other: - ranged: 25 + ranged_strength: 25 slot: ammo type: ammo name: steel bolts diff --git a/data/items/consumables/bread_dough.yaml b/data/items/consumables/bread_dough.yaml index 9909c58..8b9405e 100644 --- a/data/items/consumables/bread_dough.yaml +++ b/data/items/consumables/bread_dough.yaml @@ -29,6 +29,5 @@ description: A ball of uncooked bread dough. It needs to be baked. id: bread_dough max_quality: 0 name: bread dough -quality: 0 stackable: false value: 3 diff --git a/data/items/tools/lighter.yaml b/data/items/tools/lighter.yaml index 9f47a45..ee73da3 100644 --- a/data/items/tools/lighter.yaml +++ b/data/items/tools/lighter.yaml @@ -5,7 +5,6 @@ equipment: type: tool max_quality: 100 name: lighter -quality: 100 stackable: false tool: speed: 4 -- cgit v1.2.3