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

Jump to bottom

Modernize more volume and weight #41704

Merged
merged 1 commit into from
Jul 1, 2020
Merged

Modernize more volume and weight #41704

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
4 changes: 2 additions & 2 deletions data/core/basic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"category": "food",
"name": { "str_sp": "water" },
"description": "Water, the stuff of life, the best thirst-quencher available. It would be safer to drink once purified.",
"weight": 250,
"volume": 1,
"weight": "250 g",
"volume": "250 ml",
"price": 50,
"symbol": "~",
"color": "light_blue",
Expand Down
116 changes: 58 additions & 58 deletions data/legacy/1/obsolete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"color": "yellow",
"description": "Conical Ball .22 is a variety of .22 ammunition with a very small propellant charge and generally lacks gunpowder. The end result is a subsonic round. It is nearly silent, but is so weak as to be nearly useless. This one has been handmade using an intact casing.",
"material": [ "steel", "powder" ],
"volume": 1,
"weight": 3,
"volume": "250 ml",
"weight": "3 g",
"bashing": 1,
"ammo_type": "22",
"casing": "22_casing",
Expand All @@ -30,8 +30,8 @@
"color": "yellow",
"description": "Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or other small vermin while being unable to damage walls. It has an extremely short range and is unable to injure all but the smallest creatures. This one has been handmade using an intact casing.",
"material": [ "steel", "powder" ],
"volume": 1,
"weight": 3,
"volume": "250 ml",
"weight": "3 g",
"bashing": 1,
"ammo_type": "22",
"casing": "22_casing",
Expand All @@ -52,8 +52,8 @@
"color": "red",
"description": "A hand-reloaded beanbag round for shotguns, not deadly but designed to disable.",
"material": [ "plastic", "powder" ],
"volume": 1,
"weight": 46,
"volume": "250 ml",
"weight": "46 g",
"ammo_type": "shot",
"casing": "shot_hull",
"damage": 8,
Expand All @@ -72,8 +72,8 @@
"description": "A homemade, rechargeable power cell built from salvaged electronics. With enough electronics skill, you could attach it to an electric-powered device to provide it with energy. The power cell is not compatible with standard batteries; it must be re-energized via a special recharging station.",
"price": 2000,
"material": [ "plastic", "aluminum" ],
"weight": 142,
"volume": 1,
"weight": "142 g",
"volume": "250 ml",
"to_hit": -2,
"category": "spare_parts"
},
Expand All @@ -82,7 +82,7 @@
"id": "brew_bum_wine",
"name": "cheap wine must",
"description": "Unfermented grape wine. A hearty mix of pressed grapes, with some added brandy to fortify it.",
"weight": 46,
"weight": "46 g",
"color": "red",
"container": "jug_plastic",
"flags": [ "TRADER_AVOID" ],
Expand All @@ -92,7 +92,7 @@
"fun": -15,
"price": 0,
"material": [ "fruit", "water" ],
"volume": 1,
"volume": "250 ml",
"charges": 7,
"phase": "liquid",
"comestible_type": "DRINK",
Expand All @@ -110,8 +110,8 @@
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ],
"skill": "shotgun",
"ammo": [ "shot" ],
"weight": 1814,
"volume": 4,
"weight": "1814 g",
"volume": "1 L",
"bashing": 12,
"to_hit": -1,
"ranged_damage": 4,
Expand Down Expand Up @@ -146,8 +146,8 @@
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ],
"skill": "shotgun",
"ammo": [ "shot" ],
"weight": 1133,
"volume": 6,
"weight": "1133 g",
"volume": "1500 ml",
"bashing": 12,
"to_hit": -1,
"ranged_damage": 1,
Expand All @@ -166,12 +166,12 @@
"name": "spare magazine",
"description": "A spare magazine you can keep on hand to make reloads faster, but must itself be reloaded before it can be used again.",
"location": "accessories",
"weight": 330,
"weight": "330 g",
"color": "light_gray",
"symbol": ":",
"material": [ "steel", "plastic" ],
"mod_targets": [ "pistol", "shotgun", "smg", "rifle" ],
"volume": 1,
"volume": "250 ml",
"price": 5000
},
{
Expand All @@ -181,13 +181,13 @@
"clip_size_modifier": 50,
"description": "Increases the ammunition capacity of your firearm by 50%.",
"location": "magazine",
"weight": 495,
"weight": "495 g",
"to_hit": -1,
"color": "light_gray",
"symbol": ":",
"material": [ "steel", "plastic" ],
"mod_targets": [ "pistol", "shotgun", "smg", "rifle" ],
"volume": 1,
"volume": "250 ml",
"price": 5600
},
{
Expand All @@ -197,12 +197,12 @@
"clip_size_modifier": 100,
"description": "Completely doubles the ammunition capacity of your firearm.",
"location": "magazine",
"weight": 660,
"weight": "660 g",
"color": "light_gray",
"symbol": ":",
"material": [ "steel", "plastic" ],
"mod_targets": [ "shotgun", "smg", "rifle", "pistol" ],
"volume": 2,
"volume": "500 ml",
"price": 7200
},
{
Expand All @@ -215,8 +215,8 @@
"description": "10 plastic bags, folded smooth and wrapped tightly together with a string.",
"price": 500,
"material": [ "plastic" ],
"weight": 10,
"volume": 1,
"weight": "10 g",
"volume": "250 ml",
"to_hit": 1
},
{
Expand All @@ -227,12 +227,12 @@
"dispersion_modifier": 90,
"damage_modifier": 6,
"description": "This is a complete conversion kit, designed to turn a rifle into a powerful battle rifle. It reduces accuracy, and increases noise and recoil, but also increases damage and fire rate.",
"weight": 589,
"weight": "589 g",
"color": "magenta",
"symbol": ":",
"material": [ "steel" ],
"mod_targets": [ "rifle" ],
"volume": 2,
"volume": "500 ml",
"integral_volume": 0,
"burst_modifier": 4,
"recoil_modifier": 60,
Expand All @@ -248,12 +248,12 @@
"dispersion_modifier": -150,
"damage_modifier": 8,
"description": "This is a complete conversion kit, designed to turn a rifle into a deadly sniper rifle. It removes any automatic fire capabilities but also increases accuracy and damage.",
"weight": 589,
"weight": "589 g",
"color": "green",
"symbol": ":",
"material": [ "steel" ],
"mod_targets": [ "rifle" ],
"volume": 2,
"volume": "500 ml",
"integral_volume": 0,
"burst_modifier": -99,
"price": 66000,
Expand All @@ -270,8 +270,8 @@
"description": "A large block of semi-processed coal.",
"price": 60000,
"material": [ "stone" ],
"weight": 13840,
"volume": 72,
"weight": "13840 g",
"volume": "18 L",
"bashing": 8,
"to_hit": -5
},
Expand All @@ -285,8 +285,8 @@
"color": "dark_gray",
"description": "These are smaller pieces of charcoal used in smaller heating devices.",
"material": [ "wood" ],
"volume": 1,
"weight": 22,
"volume": "250 ml",
"weight": "22 g",
"phase": "solid",
"ammo_type": "charcoal",
"count": 10,
Expand All @@ -302,8 +302,8 @@
"color": "dark_gray",
"description": "These are smaller pieces of coal used in smaller heating devices.",
"material": [ "wood" ],
"volume": 1,
"weight": 22,
"volume": "250 ml",
"weight": "22 g",
"ammo_type": "charcoal",
"count": 10,
"stack_size": 20
Expand All @@ -317,8 +317,8 @@
"color": "white",
"description": "Also known as a flight, this item provides aerodynamic stabilization of arrows. You'll need to put these on your arrows to make them functional.",
"material": [ "paper" ],
"volume": 1,
"weight": 1,
"volume": "250 ml",
"weight": "1 g",
"bashing": 1,
"ammo_type": "components",
"count": 10,
Expand All @@ -328,7 +328,7 @@
"type": "ARMOR",
"id": "helmet_netting",
"name": "helmet netting",
"weight": 25,
"weight": "25 g",
"color": "green",
"covers": [ "HEAD" ],
"to_hit": -1,
Expand All @@ -337,7 +337,7 @@
"flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY" ],
"price": 2000,
"material": [ "cotton" ],
"volume": 0,
"volume": "0 L",
"coverage": 12,
"material_thickness": 1
},
Expand All @@ -350,8 +350,8 @@
"category": "other",
"description": "A small metal tank for holding gas or liquids. Useful for crafting.",
"price": 6000,
"weight": 3200,
"volume": 45,
"weight": "3200 g",
"volume": "11250 ml",
"bashing": 5,
"to_hit": -3,
"material": [ "steel" ]
Expand All @@ -367,8 +367,8 @@
"material": [ "steel", "plastic" ],
"flags": [ "CHARGE", "NO_UNLOAD", "NEVER_JAMS", "NO_UNLOAD" ],
"skill": "rifle",
"weight": 1814,
"volume": 13,
"weight": "1814 g",
"volume": "3250 ml",
"bashing": 8,
"to_hit": -1,
"dispersion": 10,
Expand Down Expand Up @@ -396,17 +396,17 @@
"color": "yellow",
"description": "A single capacitor charged with current to be used by a laser weapon or similar armament.",
"material": [ "steel" ],
"volume": 1,
"weight": 5
"volume": "250 ml",
"weight": "5 g"
},
{
"id": "inhaler_stimgas",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "stimgas inhaler",
"description": "A powerful stimulant with no risk of addiction.",
"weight": 10,
"volume": 1,
"weight": "10 g",
"volume": "250 ml",
"price": 750,
"charges": 25,
"material": [ "plastic" ],
Expand All @@ -422,8 +422,8 @@
"comestible_type": "MED",
"name": "sewagas inhaler",
"description": "A powerful hallucinogen with low risk of addiction.",
"weight": 10,
"volume": 1,
"weight": "10 g",
"volume": "250 ml",
"price": 500,
"charges": 25,
"material": [ "plastic" ],
Expand Down Expand Up @@ -451,8 +451,8 @@
"flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON" ],
"skill": "archery",
"ammo": [ "dart" ],
"weight": 440,
"volume": 4,
"weight": "440 g",
"volume": "1 L",
"bashing": 8,
"to_hit": -2,
"dispersion": 75,
Expand All @@ -470,8 +470,8 @@
"color": "yellow",
"description": "A handful of darts, useful as ammunition for blowguns.",
"material": [ "wood" ],
"volume": 1,
"weight": 1,
"volume": "250 ml",
"weight": "1 g",
"ammo_type": "dart",
"damage": 1,
"range": 30,
Expand All @@ -490,8 +490,8 @@
"description": "An electrode plate from a lead-acid battery.",
"price": 10,
"material": [ "steel" ],
"weight": 400,
"volume": 1,
"weight": "400 g",
"volume": "250 ml",
"bashing": 4,
"to_hit": -2
},
Expand All @@ -501,8 +501,8 @@
"name": "active nail bomb",
"description": "This is an active nail bomb, likely to explode any second now. Better throw it!",
"category": "weapons",
"weight": 290,
"volume": 2,
"weight": "290 g",
"volume": "500 ml",
"price": 0,
"material": [ "steel", "plastic" ],
"symbol": "*",
Expand All @@ -528,8 +528,8 @@
"name": "forged sword",
"description": "A common short sword, forged from several pieces of steel. The pointy end is the dangerous one.",
"material": [ "steel" ],
"volume": 8,
"weight": 700,
"volume": "2 L",
"weight": "700 g",
"bashing": 4,
"cutting": 14,
"to_hit": 2,
Expand All @@ -546,8 +546,8 @@
"category": "other",
"material": [ "wood" ],
"flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
"weight": 6,
"volume": 0,
"weight": "6 g",
"volume": "0 L",
"to_hit": -5,
"qualities": [ [ "COOK", 1 ] ]
},
Expand Down
8 changes: 4 additions & 4 deletions data/legacy/3/crazy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"category": "weapons",
"name": "Granade",
"description": "Attached to this grenade is a name tag with the name Kevin written on it. Does not seem to work like a grenade, handle with care.",
"weight": 180,
"volume": 1,
"weight": "180 g",
"volume": "250 ml",
"price": 40000,
"to_hit": -1,
"bashing": 6,
Expand All @@ -25,8 +25,8 @@
"category": "weapons",
"name": "active Granade",
"description": "Attached to this grenade is a name tag with the name Kevin written on it. Does not seem to work like a grenade, handle with care. Better throw it!",
"weight": 180,
"volume": 1,
"weight": "180 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
"bashing": 6,
Expand Down
Loading