Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Armor name to object, volume to string, fix looks_like #38070

Merged
merged 1 commit into from
Feb 16, 2020
Merged

Armor name to object, volume to string, fix looks_like #38070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions data/json/items/armor/arms_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@
"id": "armguard_larmor",
"type": "ARMOR",
"category": "armor",
"name": "pair of leather arm guards",
"name_plural": "pairs of leather arm guards",
"name": { "str": "pair of leather arm guards", "str_pl": "pairs of leather arm guards" },
"description": "A pair of tough leather arm guards. Light and comfortable.",
"weight": "430 g",
"volume": "2 L",
Expand Down Expand Up @@ -125,8 +124,7 @@
"id": "armguard_metal",
"type": "ARMOR",
"category": "armor",
"name": "pair of metal arm guards",
"name_plural": "pairs of metal arm guards",
"name": { "str": "pair of metal arm guards", "str_pl": "pairs of metal arm guards" },
"//": "They're not actually FANCY, so calling them 'very stylish' seemed inaccurate.",
"description": "A pair of arm guards hammered out from metal. Perfect for the Post-Apocalyptic Warrior look.",
"weight": "1080 g",
Expand Down Expand Up @@ -256,16 +254,15 @@
"id": "vambrace_larmor",
"type": "ARMOR",
"category": "armor",
"name": "pair of leather vambraces",
"name_plural": "pairs of leather vambraces",
"name": { "str": "pair of leather vambraces", "str_pl": "pairs of leather vambraces" },
"description": "A pair of light leather arm guards, made for archery.",
"weight": "362 g",
"volume": "1 L",
"price": 2000,
"to_hit": 1,
"material": [ "leather" ],
"symbol": "[",
"looks_like": "armguards_larmor",
"looks_like": "armguard_larmor",
"color": "brown",
"covers": [ "ARMS" ],
"coverage": 50,
Expand Down
27 changes: 9 additions & 18 deletions data/json/items/armor/boots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,7 @@
"id": "boots_hiking",
"repairs_like": "boots_larmor",
"type": "ARMOR",
"name": "pair of hiking boots",
"name_plural": "pairs of hiking boots",
"name": { "str": "pair of hiking boots", "str_pl": "pairs of hiking boots" },
"description": "Tough yet light leather boots. Durable and comfortable.",
"weight": "960 g",
"volume": "2 L",
Expand Down Expand Up @@ -276,8 +275,7 @@
"id": "boots_larmor",
"type": "ARMOR",
"category": "armor",
"name": "pair of leather armor boots",
"name_plural": "pairs of leather armor boots",
"name": { "str": "pair of leather armor boots", "str_pl": "pairs of leather armor boots" },
"description": "Thick leather boots made specifically to protect the feet. Light and tough.",
"weight": "902 g",
"volume": "2 L",
Expand Down Expand Up @@ -727,8 +725,7 @@
{
"id": "footrags_leather",
"type": "ARMOR",
"name": "pair of leather foot wraps",
"name_plural": "pairs of leather foot wraps",
"name": { "str": "pair of leather foot wraps", "str_pl": "pairs of leather foot wraps" },
"description": "Leather patches tied around your feet. Not much of an improvement over being barefoot, still better than nothing.",
"weight": "120 g",
"volume": "500 ml",
Expand Down Expand Up @@ -793,8 +790,7 @@
"id": "heels",
"repairs_like": "boots",
"type": "ARMOR",
"name": "pair of heels",
"name_plural": "pairs of heels",
"name": { "str": "pair of heels", "str_pl": "pairs of heels" },
"description": "A pair of high heels. Difficult to even walk in.",
"weight": "640 g",
"volume": "750 ml",
Expand All @@ -816,8 +812,7 @@
"id": "knee_high_boots",
"repairs_like": "boots_larmor",
"type": "ARMOR",
"name": "pair of knee-high boots",
"name_plural": "pairs of knee-high boots",
"name": { "str": "pair of knee-high boots", "str_pl": "pairs of knee-high boots" },
"description": "Very long leather boots that cover the lower legs. Difficult to wear but extremely durable.",
"weight": "1520 g",
"volume": "3750 ml",
Expand All @@ -840,8 +835,7 @@
{
"id": "leathersandals",
"type": "ARMOR",
"name": "pair of leather sandals",
"name_plural": "pairs of leather sandals",
"name": { "str": "pair of leather sandals", "str_pl": "pairs of leather sandals" },
"description": "Sturdy leather hiking sandals with a heel strap. Offers little in the way of protection, but keeps you cool during warmer months.",
"weight": "94 g",
"volume": "250 ml",
Expand All @@ -862,8 +856,7 @@
"id": "lowtops",
"repairs_like": "boots",
"type": "ARMOR",
"name": "pair of lowtop tennis shoes",
"name_plural": "pairs of lowtop tennis shoes",
"name": { "str": "pair of lowtop tennis shoes", "str_pl": "pairs of lowtop tennis shoes" },
"description": "Lightweight shoes made of cloth and rubber.",
"weight": "114 g",
"volume": "750 ml",
Expand Down Expand Up @@ -1153,8 +1146,7 @@
"id": "roller_shoes_off",
"repairs_like": "boots",
"type": "ARMOR",
"name": "pair of heelys (off)",
"name_plural": "pairs of heelys (off)",
"name": { "str": "pair of heelys (off)", "str_pl": "pairs of heelys (off)" },
"description": "A pair of sneakers with wheels, currently the wheels are hidden.",
"weight": "840 g",
"volume": "1500 ml",
Expand All @@ -1175,8 +1167,7 @@
{
"id": "roller_shoes_on",
"type": "ARMOR",
"name": "pair of heelys (on)",
"name_plural": "pairs of heelys (on)",
"name": { "str": "pair of heelys (on)", "str_pl": "pairs of heelys (on)" },
"description": "A pair of sneakers with wheels, currently the wheels are out.",
"weight": "840 g",
"volume": "1500 ml",
Expand Down
17 changes: 6 additions & 11 deletions data/json/items/armor/gloves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@
"id": "gauntlets_larmor",
"type": "ARMOR",
"category": "armor",
"name": "pair of leather armor gauntlets",
"name_plural": "pairs of leather armor gauntlets",
"name": { "str": "pair of leather armor gauntlets", "str_pl": "pairs of leather armor gauntlets" },
"description": "Heavy fingerless leather gloves. Very flexible and comfortable.",
"weight": "350 g",
"volume": "750 ml",
Expand Down Expand Up @@ -332,8 +331,7 @@
{
"id": "gloves_leather",
"type": "ARMOR",
"name": "pair of leather gloves",
"name_plural": "pairs of leather gloves",
"name": { "str": "pair of leather gloves", "str_pl": "pairs of leather gloves" },
"description": "A thin pair of black leather gloves.",
"weight": "160 g",
"volume": "250 ml",
Expand All @@ -354,8 +352,7 @@
{
"id": "gloves_light",
"type": "ARMOR",
"name": "pair of light gloves",
"name_plural": "pairs of light gloves",
"name": { "str": "pair of light gloves", "str_pl": "pairs of light gloves" },
"description": "A pair of cotton gloves.",
"weight": "118 g",
"volume": "250 ml",
Expand Down Expand Up @@ -440,11 +437,10 @@
"id": "gloves_medical",
"repairs_like": "gloves_light",
"type": "ARMOR",
"name": "pair of medical gloves",
"name_plural": "pairs of medical gloves",
"name": { "str": "pair of medical gloves", "str_pl": "pairs of medical gloves" },
"description": "A pair of thin latex gloves, designed to limit the spread of disease.",
"weight": "10 g",
"volume": 0,
"volume": "2 ml",
"price": 1000,
"to_hit": 1,
"material": [ "plastic" ],
Expand Down Expand Up @@ -677,8 +673,7 @@
{
"id": "gloves_wraps_leather",
"type": "ARMOR",
"name": "pair of leather hand wraps",
"name_plural": "pairs of leather hand wraps",
"name": { "str": "pair of leather hand wraps", "str_pl": "pairs of leather hand wraps" },
"description": "Pieces of leather that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.",
"weight": "200 g",
"volume": "500 ml",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/armor/legs_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@
"id": "knee_pads",
"type": "ARMOR",
"category": "armor",
"name": "pair of knee pads",
"name_plural": "pairs of knee pads",
"name": { "str": "pair of knee pads", "str_pl": "pairs of knee pads" },
"description": "A pair of knee pads made of stout plastic and cloth.",
"weight": "210 g",
"volume": "1500 ml",
Expand Down Expand Up @@ -198,8 +197,7 @@
"id": "legguard_metal",
"type": "ARMOR",
"category": "armor",
"name": "pair of iron greaves",
"name_plural": "pairs of iron greaves",
"name": { "str": "pair of iron greaves", "str_pl": "pairs of iron greaves" },
"description": "A pair of iron leg guards with a simple leather lining.",
"weight": "2260 g",
"volume": "5500 ml",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/armor/undergarment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,7 @@
{
"id": "leg_warmers",
"type": "ARMOR",
"name": "pair of leg warmers",
"name_plural": "pairs of leg warmers",
"name": { "str": "pair of leg warmers", "str_pl": "pairs of leg warmers" },
"description": "Snug, soft cloth sleeves to keep your legs warm.",
"weight": "46 g",
"volume": "500 ml",
Expand Down