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.

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

Replace weight int with string in mods #36333

Merged
merged 1 commit into from
Dec 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions data/mods/Aftershock/items/afs__items.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"type": "CONTAINER",
"name": "basin",
"description": "A wide, shallow basin used to hold liquid, hammered from a piece of sheet metal. Ideal for collecting water.",
"weight": 5000,
"weight": "5 kg",
"looks_like": "ceramic_bowl",
"volume": "2500 ml",
"price": 1000,
Expand All @@ -48,7 +48,7 @@
"description": "A household refrigerator with impressive capacity. Its power connection has been refurbished, and it can be mounted onto a vehicle to draw from its power.",
"symbol": "{",
"color": "white",
"weight": 142882,
"weight": "142882 g",
"volume": "300 L",
"price": 40000,
"price_postapoc": 10000,
Expand Down Expand Up @@ -79,7 +79,7 @@
"price": 1000,
"material": "titanium",
"looks_like": "scrap",
"weight": 100,
"weight": "100 g",
"volume": "250 ml",
"bashing": 1,
"to_hit": -2
Expand All @@ -89,7 +89,7 @@
"id": "afs_titanium_frame",
"name": "ultralight frame",
"description": "A sturdy, lightweight frame made from titanium. Useful for crafting.",
"weight": 1000,
"weight": "1 kg",
"to_hit": -3,
"color": "white",
"symbol": "]",
Expand Down Expand Up @@ -131,7 +131,7 @@
"name": "nuclear waste",
"description": "A small pellet of silvery metal, still warm to the touch.",
"looks_like": "medium_atomic_battery_cell",
"weight": 30,
"weight": "30 g",
"volume": "250 ml",
"price": 0,
"material": "iron",
Expand Down
18 changes: 9 additions & 9 deletions data/mods/Aftershock/items/afs_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "ARMOR",
"name": "bag of holding",
"description": "A sleek, unfathomably-complicated machine covered in dozens of blinking lights, worn on the back by sturdy faux-leather straps. An electrode dangles from the back, attaching to your forehead. How it operates without annihilating spacetime isn't quite clear, but a localized portal allows things to be stored in an extradimensional space.",
"weight": 3401,
"weight": "3401 g",
"volume": "3 L",
"//": "sci-fantasy extradimensional gadget = pricey",
"price": 1000000000,
Expand All @@ -27,7 +27,7 @@
"type": "ARMOR",
"name": "boot quiver",
"description": "This is a makeshift quiver made from a thigh-high boot with the heel removed and patched shut, and strings used as a strap run through a hole punched into its side. It can hold 40 arrows or bolts for easy access.",
"weight": 770,
"weight": "770 g",
"volume": "2 L",
"price": 500,
"bashing": 4,
Expand All @@ -49,7 +49,7 @@
"description": "Developed for the exploration of alien planes, the lightweight, orange-black HEV suit covers everything below the neck. While it possesses only modest physical protection, it provides excellent protection from most environmental hazards. A hatch in the front opens to provide a small amount of storage.",
"symbol": "[",
"color": "yellow",
"weight": 3501,
"weight": "3501 g",
"volume": "2500 ml",
"price": 100000000,
"price_postapoc": 50000,
Expand Down Expand Up @@ -81,7 +81,7 @@
"description": "Meant to pair with a compatible HEV suit, this helmet's physical protection is basic at best, but makes up for it with an air recycler that provides excellent protection from airborne contaminants. It has a mounted LED headlamp, powered by standard batteries.",
"symbol": "[",
"color": "yellow",
"weight": 581,
"weight": "581 g",
"volume": "2 L",
"price": 10000000,
"price_postapoc": 5000,
Expand Down Expand Up @@ -138,7 +138,7 @@
"type": "ARMOR",
"name": "quilt",
"description": "A big, comfy quilt made of thick wool in a triangle pattern. Extremely cozy!",
"weight": 1814,
"weight": "1814 g",
"volume": "5 L",
"price": 5500,
"to_hit": -1,
Expand Down Expand Up @@ -190,7 +190,7 @@
"type": "ARMOR",
"name": "brigandine",
"description": "A piece of body armor from the Middle Ages consisting of boiled leather with riveted metal plates lying underneath. Typically used to protect from arrows, it has very good protection against cuts.",
"weight": 3268,
"weight": "3268 g",
"volume": "1500 ml",
"price": 5000,
"to_hit": -3,
Expand All @@ -210,7 +210,7 @@
"type": "ARMOR",
"name": "crafted brigandine",
"description": "Modelled after a proper brigandine from medieval times, this makeshift piece of body armor consists of layered cloth with small pieces of sheet metal affixed to the underside. While not as protective as a proper piece of armor, it'll still keep you relatively safe.",
"weight": 3268,
"weight": "3268 g",
"volume": "1500 ml",
"price": 1000,
"to_hit": -3,
Expand All @@ -230,7 +230,7 @@
"type": "ARMOR",
"name": "titanium vest",
"description": "A lightweight armor vest made of pieces of titanium sewn together, with cloth padding for comfort. Brittle against blunt force, but highly resistant to cuts and corrosion.",
"weight": 939,
"weight": "939 g",
"volume": "500 ml",
"price": 1000,
"to_hit": -3,
Expand All @@ -250,7 +250,7 @@
"name": "MBR vest (titanium)",
"name_plural": "MBR vests (titanium)",
"description": "A Modular Bullet Resistant Vest. Titanium scraps have been inserted to improve its protection. It has four pouches capable of carrying magazines.",
"weight": 3108,
"weight": "3108 g",
"volume": "6 L",
"price": 110000,
"to_hit": -3,
Expand Down
12 changes: 6 additions & 6 deletions data/mods/Aftershock/items/afs_books.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "original copy of Housefly",
"name_plural": "original copies of Housefly",
"description": "The only copy of Housefly in existence - a long book about three individuals drawn together by fate in the early 1800s to save their English town of Victoria from a mysterious threat. You never got to publish it, but reading it lets you forget the horrors of the Cataclysm, if only for a moment.",
"weight": 700,
"weight": "700 g",
"volume": "750 ml",
"price": 5000,
"price_postapoc": 1000,
Expand All @@ -23,7 +23,7 @@
"type": "BOOK",
"name": "USMC M1014 technical manual",
"description": "A pocket-sized book printed in 2000 by the United States Marine Corps for official use. It describes the operation, repair, and cleaning of the Benilli M1014 shotgun. Though specific to the M4, it can provide a wealth of information to the trained eye.",
"weight": 600,
"weight": "600 g",
"volume": "250 ml",
"price": 3000,
"material": [ "paper" ],
Expand All @@ -42,7 +42,7 @@
"name": "Black Powder to Berettas",
"name_plural": "copies of Black Powder to Berettas",
"description": "This hardcover book, aimed at the gun nut, provides an illustrated, concise history of the handgun throughout history, including technical specifications and use techniques. It's difficult to follow without a passing knowledge in pistols, but an experienced handgun user could glean much from it.",
"weight": 732,
"weight": "732 g",
"volume": "750 ml",
"price": 3000,
"material": [ "paper" ],
Expand All @@ -61,7 +61,7 @@
"name": "America's Rifle",
"name_plural": "copies of America's Rifle",
"description": "A history book penned by an anonymous author. Starting from its design by John Garand and ending with the Vietnam War, it provides a detailed run-down of the M1 Garand rifle's use throughout history as well as its design and quirks with the weapon.",
"weight": 600,
"weight": "600 g",
"volume": "500 ml",
"price": 3000,
"material": [ "paper" ],
Expand All @@ -80,7 +80,7 @@
"name": "Jane's Flamethrowers and Firestarters",
"name_plural": "copies of Jane's Flamethrowers and Firestarters",
"description": "A detailed, full-colored guide to flamethrowers, incendiary weapons, and napalm. It builds off of information provided in its sister book, Jane's Mortars and Rocket Launchers, and so it's mostly incomprehensible to anyone without prior knowledge.",
"weight": 734,
"weight": "734 g",
"volume": "250 ml",
"price": 2000,
"material": [ "paper" ],
Expand All @@ -99,7 +99,7 @@
"name": "Nuclear Physics Made Easy",
"name_plural": "Nuclear Physics Made Easy",
"description": "A book detailing the workings of state of the art atomic technology, and the physics behind it.",
"weight": 2063,
"weight": "2063 g",
"volume": "2 L",
"price": 9200,
"bashing": 8,
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/items/afs_comestibles.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "afs_calorie_pill",
"type": "COMESTIBLE",
"name": "nutriment",
"weight": 10,
"weight": "10 g",
"color": "white",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -39,7 +39,7 @@
"type": "COMESTIBLE",
"name": "sundew",
"copy-from": "water_clean",
"weight": 10,
"weight": "10 g",
"color": "yellow",
"healthy": 2,
"description": "Water treated with some sort of chemical compound. It's incapable of freezing, is very light, and glows faintly. Drinking it seems to sharpen the senses.",
Expand Down
10 changes: 5 additions & 5 deletions data/mods/Aftershock/items/afs_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "TOOL",
"name": "atomic smartphone",
"description": "Never charge your phone again with the Rivtech atomic smartphone. Rated for 10 million years of use, this cutting-edge gadget had been on public markets for less than a week when the Cataclysm hit, and their eye-watering price made them a rarity. It includes an alarm clock, a high-resolution camera, and a bright flashlight.",
"weight": 300,
"weight": "300 g",
"volume": "50 ml",
"price": 200000,
"price_postapoc": 2500,
Expand Down Expand Up @@ -60,7 +60,7 @@
"name": "chain wrench",
"name_plural": "chain wrenches",
"description": "An adjustable chain wrench, designed for hard-to-reach places. Being handmade, it lacks the precision of a proper wrench.",
"weight": 1614,
"weight": "1614 g",
"volume": "250 ml",
"price": 4000,
"price_postapoc": 1200,
Expand All @@ -79,7 +79,7 @@
"name": "power cutter (off)",
"name_plural": "power cutter (off)",
"description": "A huge, gas-powered saw with a diamond blade. If it has gasoline, it can be turned on to turn it into a powerful metal cutting tool.",
"weight": 9979,
"weight": "9979 g",
"volume": "3 L",
"price": 100000,
"price_postapoc": 10000,
Expand Down Expand Up @@ -116,7 +116,7 @@
"name": "murdersaw (off)",
"name_plural": "murdersaws (off)",
"description": "This former power cutter has been lightened and stripped of all those unnecessary safety measures, turning it into a gas-powered killing machine. Use it to turn it on.",
"weight": 4301,
"weight": "4301 g",
"volume": "2 L",
"price": 100000,
"price_postapoc": 30000,
Expand Down Expand Up @@ -153,7 +153,7 @@
"type": "TOOL",
"name": "rope lighter",
"description": "A rope lighter made from simple materials. Windproof and flameless, it consists of a length of rope run through a copper tube; a flint strike sparks embers in the rope that smolder and are used to ignite fires. Specialized for outdoor use, it lasts for a very long time, but it's much slower to use than a normal lighter.",
"weight": 200,
"weight": "200 g",
"volume": "100 ml",
"price": 500,
"material": [ "cotton", "copper" ],
Expand Down
12 changes: 6 additions & 6 deletions data/mods/Aftershock/items/afs_weapons.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "TOOL",
"name": "energy saber",
"description": "A hefty black tube the size of your hand. Activate to produce a hard-light blade, running off of UPS.",
"weight": 240,
"weight": "240 g",
"volume": "250 ml",
"price": 10000000,
"price_postapoc": 20000,
Expand Down Expand Up @@ -45,7 +45,7 @@
"type": "TOOL",
"name": "energy saber (active)",
"description": "This glittering blue saber of cyan light hums gently, extending from its superalloy handle. Its edge is lethally sharp, and being made of light, it's weightless, and immune to being damaged. It's not white-hot like in pop culture, so it can't cut through anything, but there's not much in the way of flesh that it won't slice through easily.",
"weight": 240,
"weight": "240 g",
"volume": "1 L",
"price": 10000000,
"price_postapoc": 20000,
Expand Down Expand Up @@ -81,7 +81,7 @@
"flags": [ "FIRE_TWOHAND", "STR_DRAW", "PRIMITIVE_RANGED_WEAPON", "BELTED", "NO_UNLOAD" ],
"skill": "archery",
"min_strength": 4,
"weight": 113,
"weight": "113 g",
"volume": "1500 ml",
"bashing": 8,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 7 },
Expand All @@ -101,7 +101,7 @@
"type": "GENERIC",
"name": "hydraulic gauntlet",
"description": "A huge, heavy metal gauntlet lined with tubing and gauges. Slow and unwieldy, it uses internal pressure to deliver devastating blows, but takes tremendous strength to use effectively. Thanks to an internal microreactor, it doesn't require power of its own.",
"weight": 3778,
"weight": "3778 g",
"volume": "2 L",
"price": 10000000,
"price_postapoc": 20000,
Expand All @@ -120,7 +120,7 @@
"copy-from": "rolling_pin",
"name": "barbed-wire rolling pin",
"description": "Typically used to flatten dough, this rolling pin has been repurposed as a weapon, with barbed wire adding some extra power and weight to its swing. It has some real heft to it; perfect for the bakers of the apocalypse.",
"weight": 923,
"weight": "923 g",
"volume": "1500 ml",
"price_postapoc": 1500,
"material": [ "steel", "wood" ],
Expand Down Expand Up @@ -164,7 +164,7 @@
"type": "GUN",
"name": "shoddy laser rifle",
"description": "This is a cheap laser rifle made from common components. Weak, but can be powered with rechargeable batteries.",
"weight": 8000,
"weight": "8 kg",
"volume": "2500 ml",
"price": 40000,
"to_hit": -1,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/items/obsolete.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "afs_dough",
"type": "COMESTIBLE",
"name": "dough",
"weight": 226,
"weight": "226 g",
"color": "yellow",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"//": "Rare, location specific only",
"description": "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic enhancements. These hounds defend Prep Phyle lands from all comers undead and otherwise.",
"volume": "57500 ml",
"weight": 57500,
"weight": "57500 g",
"hp": 86,
"speed": 100,
"aggression": 3,
Expand Down Expand Up @@ -39,7 +39,7 @@
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"volume": "750 ml",
"weight": 1000,
"weight": "1 kg",
"hp": 15,
"speed": 65,
"material": [ "flesh" ],
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/mobs/afs_robots.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"species": [ "ROBOT" ],
"diff": 20,
"volume": "30000 ml",
"weight": 40750,
"weight": "40750 g",
"hp": 45,
"speed": 100,
"material": "alien_resin",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/mobs/afs_zombies.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"categories": [ "CLASSIC" ],
"species": [ "ZOMBIE", "HUMAN" ],
"volume": "60000 ml",
"weight": 78500,
"weight": "78500 g",
"hp": 60,
"speed": 50,
"material": [ "flesh" ],
Expand Down Expand Up @@ -49,7 +49,7 @@
"categories": [ "CLASSIC" ],
"species": [ "ZOMBIE", "HUMAN" ],
"volume": "875000 ml",
"weight": 200000,
"weight": "200 kg",
"hp": 300,
"speed": 240,
"material": [ "flesh" ],
Expand Down
6 changes: 3 additions & 3 deletions data/mods/Aftershock/vehicles/afs_part_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"id": "afs_hauling_space",
"name": "hauling space",
"description": "A huge metal space used in conjunction with extension of a vehicle's roof to create a very large amount of space for transporting goods.",
"weight": 120000,
"weight": "120 kg",
"to_hit": -6,
"color": "cyan",
"symbol": "]",
Expand All @@ -20,7 +20,7 @@
"id": "afs_titanium_frame",
"name": "ultralight frame",
"description": "A sturdy, lightweight frame made from titanium. Useful for crafting.",
"weight": 1000,
"weight": "1 kg",
"to_hit": -3,
"color": "white",
"symbol": "]",
Expand Down Expand Up @@ -62,7 +62,7 @@
"name": "control station",
"looks_like": "vehicle_dashboard",
"description": "A large and complex piloting station from a military vehicle, including a camera station, steering tools, and electronics controls.",
"weight": 9000,
"weight": "9 kg",
"to_hit": -4,
"color": "red",
"symbol": "$",
Expand Down
Loading