diff --git a/data/mods/Aftershock/items/afs__items.json b/data/mods/Aftershock/items/afs__items.json index 772eb05b3bf81..57e4f2510b691 100644 --- a/data/mods/Aftershock/items/afs__items.json +++ b/data/mods/Aftershock/items/afs__items.json @@ -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, @@ -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, @@ -79,7 +79,7 @@ "price": 1000, "material": "titanium", "looks_like": "scrap", - "weight": 100, + "weight": "100 g", "volume": "250 ml", "bashing": 1, "to_hit": -2 @@ -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": "]", @@ -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", diff --git a/data/mods/Aftershock/items/afs_armor.json b/data/mods/Aftershock/items/afs_armor.json index 293fd2c1a7225..5059bb5b40cc0 100644 --- a/data/mods/Aftershock/items/afs_armor.json +++ b/data/mods/Aftershock/items/afs_armor.json @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/data/mods/Aftershock/items/afs_books.json b/data/mods/Aftershock/items/afs_books.json index 01e924570ff91..be5f18f9a451c 100644 --- a/data/mods/Aftershock/items/afs_books.json +++ b/data/mods/Aftershock/items/afs_books.json @@ -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, @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" ], @@ -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, diff --git a/data/mods/Aftershock/items/afs_comestibles.json b/data/mods/Aftershock/items/afs_comestibles.json index ed42135b078db..a73f11e34e478 100644 --- a/data/mods/Aftershock/items/afs_comestibles.json +++ b/data/mods/Aftershock/items/afs_comestibles.json @@ -3,7 +3,7 @@ "id": "afs_calorie_pill", "type": "COMESTIBLE", "name": "nutriment", - "weight": 10, + "weight": "10 g", "color": "white", "comestible_type": "FOOD", "symbol": "%", @@ -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.", diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json index 838eb3de2c4c5..e256f1b6bd594 100644 --- a/data/mods/Aftershock/items/afs_tools.json +++ b/data/mods/Aftershock/items/afs_tools.json @@ -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, @@ -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, @@ -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, @@ -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, @@ -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" ], diff --git a/data/mods/Aftershock/items/afs_weapons.json b/data/mods/Aftershock/items/afs_weapons.json index 9a46d95dc47b4..456095e720a88 100644 --- a/data/mods/Aftershock/items/afs_weapons.json +++ b/data/mods/Aftershock/items/afs_weapons.json @@ -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, @@ -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, @@ -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 }, @@ -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, @@ -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" ], @@ -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, diff --git a/data/mods/Aftershock/items/obsolete.json b/data/mods/Aftershock/items/obsolete.json index 057f019c75337..88966e1568b0c 100644 --- a/data/mods/Aftershock/items/obsolete.json +++ b/data/mods/Aftershock/items/obsolete.json @@ -2,7 +2,7 @@ "id": "afs_dough", "type": "COMESTIBLE", "name": "dough", - "weight": 226, + "weight": "226 g", "color": "yellow", "comestible_type": "FOOD", "symbol": "%", diff --git a/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json b/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json index 19539cecf196f..dbd46c13b8e03 100644 --- a/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json +++ b/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json @@ -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, @@ -39,7 +39,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 15, "speed": 65, "material": [ "flesh" ], diff --git a/data/mods/Aftershock/mobs/afs_robots.json b/data/mods/Aftershock/mobs/afs_robots.json index 42e052301ade5..bfc177bcb3ab1 100644 --- a/data/mods/Aftershock/mobs/afs_robots.json +++ b/data/mods/Aftershock/mobs/afs_robots.json @@ -8,7 +8,7 @@ "species": [ "ROBOT" ], "diff": 20, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 45, "speed": 100, "material": "alien_resin", diff --git a/data/mods/Aftershock/mobs/afs_zombies.json b/data/mods/Aftershock/mobs/afs_zombies.json index 40b91ce57b03f..9287228359caf 100644 --- a/data/mods/Aftershock/mobs/afs_zombies.json +++ b/data/mods/Aftershock/mobs/afs_zombies.json @@ -8,7 +8,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "60000 ml", - "weight": 78500, + "weight": "78500 g", "hp": 60, "speed": 50, "material": [ "flesh" ], @@ -49,7 +49,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 300, "speed": 240, "material": [ "flesh" ], diff --git a/data/mods/Aftershock/vehicles/afs_part_items.json b/data/mods/Aftershock/vehicles/afs_part_items.json index 8a9289a90f032..656b993ed2376 100644 --- a/data/mods/Aftershock/vehicles/afs_part_items.json +++ b/data/mods/Aftershock/vehicles/afs_part_items.json @@ -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": "]", @@ -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": "]", @@ -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": "$", diff --git a/data/mods/Animatronics/animatronics.json b/data/mods/Animatronics/animatronics.json index cd42908839fdf..20167fde7c3fe 100644 --- a/data/mods/Animatronics/animatronics.json +++ b/data/mods/Animatronics/animatronics.json @@ -8,7 +8,7 @@ "symbol": "F", "color": "red", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 100, "morale": 100, @@ -40,7 +40,7 @@ "symbol": "F", "color": "white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -72,7 +72,7 @@ "symbol": "F", "color": "white", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "material": "steel", "aggression": 50, "morale": 100, @@ -104,7 +104,7 @@ "symbol": "B", "color": "light_blue", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -136,7 +136,7 @@ "symbol": "B", "color": "blue", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 100, "morale": 100, @@ -168,7 +168,7 @@ "symbol": "C", "color": "yellow", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 100, "morale": 100, @@ -200,7 +200,7 @@ "symbol": "C", "color": "yellow", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -232,7 +232,7 @@ "symbol": "B", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 100, "morale": 100, @@ -264,7 +264,7 @@ "symbol": "B", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -296,7 +296,7 @@ "symbol": "B", "color": "dark_gray", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -327,7 +327,7 @@ "symbol": "b", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -358,7 +358,7 @@ "symbol": "c", "color": "yellow", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -389,7 +389,7 @@ "symbol": "c", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -420,7 +420,7 @@ "symbol": "C", "color": "white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -451,7 +451,7 @@ "symbol": "C", "color": "dark_gray", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -482,7 +482,7 @@ "symbol": "D", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -513,7 +513,7 @@ "symbol": "H", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -544,7 +544,7 @@ "symbol": "P", "color": "pink", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -575,7 +575,7 @@ "symbol": "S", "color": "white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -606,7 +606,7 @@ "symbol": "S", "color": "red", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -637,7 +637,7 @@ "symbol": "c", "color": "yellow", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "material": "steel", "aggression": 50, "morale": 100, @@ -669,7 +669,7 @@ "symbol": "m", "color": "dark_gray", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "material": "steel", "aggression": 100, "morale": 100, @@ -701,7 +701,7 @@ "symbol": "W", "color": "dark_gray", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, diff --git a/data/mods/Animatronics/dead_animatronics.json b/data/mods/Animatronics/dead_animatronics.json index 4229c0ba9a3be..672cc09954061 100644 --- a/data/mods/Animatronics/dead_animatronics.json +++ b/data/mods/Animatronics/dead_animatronics.json @@ -10,7 +10,7 @@ "description": "A broken animatronic fox. If it was in bad shape before, it's a wreck now. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -27,7 +27,7 @@ "description": "A broken animatronic bunny. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -43,7 +43,7 @@ "description": "A broken animatronic chicken. It doesn't look as attractive now.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -59,7 +59,7 @@ "description": "A broken animatronic chicken. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -75,7 +75,7 @@ "description": "A broken animatronic bear. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -91,7 +91,7 @@ "description": "A broken animatronic bear. Limp and lifeless.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -107,7 +107,7 @@ "description": "A broken animatronic bat. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -123,7 +123,7 @@ "description": "A broken animatronic beaver. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -139,7 +139,7 @@ "description": "A broken animatronic cat. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -155,7 +155,7 @@ "description": "A broken animatronic chipmunk. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -171,7 +171,7 @@ "description": "A broken animatronic cow. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -187,7 +187,7 @@ "description": "A broken animatronic coyote. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -204,7 +204,7 @@ "description": "A broken animatronic deer. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -220,7 +220,7 @@ "description": "A broken animatronic horse. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -236,7 +236,7 @@ "description": "A broken animatronic pig. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -253,7 +253,7 @@ "description": "A broken animatronic sheep. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -269,7 +269,7 @@ "description": "A broken animatronic squirrel. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -286,7 +286,7 @@ "description": "A broken animatronic child. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -303,7 +303,7 @@ "description": "A broken animatronic fox. It seems like it's still looking at you, enraged in what you've done to her.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -320,7 +320,7 @@ "description": "A broken, wrecked animatronic fox. You have no idea if it's actually dead, as it doesn't look that different from the condition you found it in.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -337,7 +337,7 @@ "description": "A broken animatronic wolf. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -353,7 +353,7 @@ "description": "A broken marionette. How creepy.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, @@ -370,7 +370,7 @@ "description": "A broken animatronic bunny. Limp and lifeless.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, + "weight": "17023 g", "volume": "7500 ml", "bashing": 10, "cutting": 6, diff --git a/data/mods/Battery_Migration/items/batt_mag.json b/data/mods/Battery_Migration/items/batt_mag.json index 6feaf446d08a0..b34c63e2583b1 100644 --- a/data/mods/Battery_Migration/items/batt_mag.json +++ b/data/mods/Battery_Migration/items/batt_mag.json @@ -12,7 +12,7 @@ "flags": "TRADER_AVOID", "material": "iron", "volume": "250 ml", - "weight": 1, + "weight": "1 g", "ammo_type": "battery", "count": 100, "//": "1 battery is 1 kJ of energy. 40 batteries is an alkaline C-cell.", @@ -24,7 +24,7 @@ "category": "spare_parts", "name": "ultra-light battery cell", "description": "This is a light battery cell designed for small size over everything else. It retains its universal compatibility, though.", - "weight": 5, + "weight": "5 g", "volume": 0, "price": 1500, "material": [ "iron" ], @@ -41,7 +41,7 @@ "category": "spare_parts", "name": "light battery cell", "description": "This is a light battery cell, universally compatible with all kinds of small devices.", - "weight": 50, + "weight": "50 g", "volume": "75ml", "price": 3500, "material": [ "iron" ], @@ -59,7 +59,7 @@ "name": "light battery cell (high-capacity)", "name_plural": "light battery cells (high-capacity)", "description": "This is a high-capacity light battery cell, universally compatible with all kinds of personal electronic devices.", - "weight": 75, + "weight": "75 g", "volume": "115ml", "price": 5000, "material": [ "iron" ], @@ -76,7 +76,7 @@ "category": "spare_parts", "name": "medium battery cell", "description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools.", - "weight": 250, + "weight": "250 g", "volume": "375ml", "price": 10000, "material": [ "iron" ], @@ -94,7 +94,7 @@ "name": "medium battery cell (high-capacity)", "name_plural": "medium battery cells (high-capacity)", "description": "This is a high-capacity medium battery cell, universally compatible with all kinds of appliances and power tools.", - "weight": 350, + "weight": "350 g", "volume": "450ml", "price": 12500, "material": [ "iron" ], @@ -111,7 +111,7 @@ "category": "spare_parts", "name": "heavy battery cell", "description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.", - "weight": 500, + "weight": "500 g", "volume": "750ml", "price": 10000, "material": [ "iron" ], @@ -129,7 +129,7 @@ "name": "heavy battery cell (high-capacity)", "name_plural": "heavy battery cells (high-capacity)", "description": "This is a high-capacity heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.", - "weight": 950, + "weight": "950 g", "volume": "1000ml", "price": 12500, "material": [ "iron" ], diff --git a/data/mods/CRT_EXPANSION/crt_materials.json b/data/mods/CRT_EXPANSION/crt_materials.json index e3f7dd4b204f1..ef039e86f09ae 100644 --- a/data/mods/CRT_EXPANSION/crt_materials.json +++ b/data/mods/CRT_EXPANSION/crt_materials.json @@ -34,7 +34,7 @@ "description": "A chunk of useful rubber, can be molded easily.", "material": "rubber", "volume": "250 ml", - "weight": 38, + "weight": "38 g", "ammo_type": "components", "flags": "NO_SALVAGE" } diff --git a/data/mods/CRT_EXPANSION/items/crt_ammo.json b/data/mods/CRT_EXPANSION/items/crt_ammo.json index 0f0cdf9d5978b..98683ce367a7f 100644 --- a/data/mods/CRT_EXPANSION/items/crt_ammo.json +++ b/data/mods/CRT_EXPANSION/items/crt_ammo.json @@ -9,7 +9,7 @@ "description": "A round tin of small light grain .177 lead pellets. These are common, tipped field pellets that can deal some light damage but are generally used for plinking.", "material": "steel", "volume": "200ml", - "weight": 2, + "weight": "2 g", "ammo_type": "pellets", "damage": 4, "dispersion": 100, @@ -63,7 +63,7 @@ "description": "A helical magazine of hollow-point alloy bullets propelled by pockets of primer. Not the most lethal thing out there, but it still packs a punch without the worry of having a stray shot seriously damaging the environment.", "material": [ "steel", "powder" ], "volume": "250ml", - "weight": 2, + "weight": "2 g", "ammo_type": "pulsesb", "damage": { "damage_type": "bash", "amount": 3 }, "dispersion": 150, diff --git a/data/mods/CRT_EXPANSION/items/crt_armor.json b/data/mods/CRT_EXPANSION/items/crt_armor.json index bb0035f233c94..29f1b80488402 100644 --- a/data/mods/CRT_EXPANSION/items/crt_armor.json +++ b/data/mods/CRT_EXPANSION/items/crt_armor.json @@ -5,7 +5,7 @@ "category": "armor", "name": "CRIT face mask", "description": "This is the C.R.I.T standard issue face mask, lined with kevlar for extra protection. A few filters provide decent enviromental safety, but it was not intended for extended use. It has a basic integrated HUD.", - "weight": 5000, + "weight": "5 kg", "volume": "1 L", "price": 2500000, "to_hit": 1, @@ -28,7 +28,7 @@ "name": "pair of CRIT boots", "description": "C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and hygenic during long-term missions while absorbing shock and heat from outside-sources. Superalloy mesh and rubber offer quite a bit of chemical protection as well. Decently heavy though", "color": "dark_gray", - "weight": 1500, + "weight": "1500 g", "price": 250000, "warmth": 40, "encumbrance": 17, @@ -42,7 +42,7 @@ "name": "pair of CRIT LA boots", "name_plural": "pairs of CRIT LA boots", "description": "C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor variant was created for missions in warmer climates. The LA boots keep most of the old features of the standard issue boots but trade in protection for easier movement.", - "weight": 1060, + "weight": "1060 g", "volume": "1500 ml", "price": 100000, "to_hit": -1, @@ -119,7 +119,7 @@ "description": "C.R.I.T standard-issue leg armor. Simple design and durable material allows for easy movement and the padding keeps the legs safe and warm in colder conditions.", "color": "dark_gray", "material": [ "superalloy", "rubber", "neoprene" ], - "weight": 1300, + "weight": "1300 g", "volume": "1500 ml", "price": 20000, "warmth": 17, @@ -133,7 +133,7 @@ "name": "pair of CRIT arm guards", "name_plural": "pairs of C.R.I.T arm guards", "description": "A pair of arm guards made from superalloy molded upon neoprene, and then insulated with rubber. They are sturdy and will block attacks, but they are ridiculously heavy.", - "weight": 1820, + "weight": "1820 g", "volume": "3 L", "price": 200000, "to_hit": 1, @@ -164,7 +164,7 @@ "category": "armor", "name": "CRIT infantry duster", "description": "A thick full-length duster coat with rubber insulation. More than mildly encumbering, but rather protective against any anti-infantry electrical discharges from the robots. Has several pockets for storage.", - "weight": 2120, + "weight": "2120 g", "volume": "5750 ml", "price": 25500, "to_hit": -1, @@ -186,7 +186,7 @@ "category": "armor", "name": "CRIT S-I G.E.A.R", "description": "C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your spinal cord, this device improves your overall physique and provides basic information on your surroundings.", - "weight": 500, + "weight": "500 g", "volume": 0, "price": 25000000, "to_hit": -3, @@ -207,7 +207,7 @@ "category": "armor", "name": "CRIT Engineering Suit", "description": "An airtight, flexible suit of woven composite fibers complete with segmented plates of armor. A complex system digitizes items in an individual pocket universe for storage while built in joint-torsion ratchets generate the neccessary energy required to power the interface.", - "weight": 13460, + "weight": "13460 g", "volume": "14250 ml", "price": 900000000, "to_hit": -5, @@ -231,7 +231,7 @@ "category": "armor", "name": "CRIT Armored Anomaly Suit", "description": "A relatively simple suit of armor. A suit of woven composite fibers combined with a cleansuit core and strategically placed segmented kevlar plates keep the suit light-weight and the one wearing it alive while offering superb resistance to the elements and ambient radiation. ", - "weight": 11460, + "weight": "11460 g", "volume": "11250 ml", "price": 900000000, "to_hit": -5, @@ -254,7 +254,7 @@ "name": "CRIT drop leg pouch", "name_plural": "C.R.I.T drop leg pouches", "description": "A set of pouches that can be worn on the thighs using buckled straps. This variety is more compact and is favored by the C.R.I.T for its ease of use.", - "weight": 255, + "weight": "255 g", "volume": "500 ml", "price": 3000, "material": [ "plastic", "cotton", "rubber" ], @@ -273,7 +273,7 @@ "category": "armor", "name": "CRIT Enforcer armor assembly", "description": "A series of plates, guards and buckles which assemble into a suit of sturdy body-armor which usually goes over other armor. Overlapping steel plates on top of kevlar plates cover vast expanses as the armor juts off in places so it can deflect attacks. Built with the idea that comfort is less important than safety, this heavy suit is difficult to move about in but highly protective. Various adjustable conectors such as straps and clips hold it together.", - "weight": 21460, + "weight": "21460 g", "volume": "11250 ml", "price": 900000000, "to_hit": -5, @@ -297,7 +297,7 @@ "name": "pair of CRIT Enforcer docks", "name_plural": "pairs of CRIT Enforcer docks", "description": "C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of oversized feet which clamp down onto your owm footwear keep your feet out of harms way. It looks terrible and feels clunky unlike most of C.R.I.T's designs, but they do seem to be worth using if you were to be in the middle of a warzone.", - "weight": 2060, + "weight": "2060 g", "volume": "1500 ml", "price": 100000, "to_hit": -1, @@ -319,7 +319,7 @@ "category": "armor", "name": "CRIT Soldier Suit", "description": "A suit of modern body-armor. Strategically placed superalloy plates keep the suit's weight minimal while kevlar plates other areas and a lining of soft neoprene pads areas for extra comfort. Most importantly, this can be worn comfortably under other armor.", - "weight": 5439, + "weight": "5439 g", "volume": "6250 ml", "price": 900000000, "material": [ "neoprene", "kevlar", "superalloy" ], @@ -340,7 +340,7 @@ "category": "armor", "name": "CRIT Lone Wolf Series Armor", "description": "A matte black suit of outdated and bulky looking plate armor fitted onto a soft kevlar body-suit. Retrofitted with new armor improvements, this heavy armor will definitely protect you from practically anything. Just make sure you can actually walk with it on though.", - "weight": 42563, + "weight": "42563 g", "volume": "12500 ml", "price": 100000000, "material": [ "hardsteel", "steel", "kevlar" ], diff --git a/data/mods/CRT_EXPANSION/items/crt_clothes.json b/data/mods/CRT_EXPANSION/items/crt_clothes.json index 7585a99a310ef..22d0149c874a6 100644 --- a/data/mods/CRT_EXPANSION/items/crt_clothes.json +++ b/data/mods/CRT_EXPANSION/items/crt_clothes.json @@ -54,7 +54,7 @@ "name": "pair of C.R.I.T shoes", "name_plural": "pairs of C.R.I.T dress shoes", "description": "A sleek pair of dress shoes. Fancy but easy on the eyes.", - "weight": 1060, + "weight": "1060 g", "volume": "1500 ml", "price": 100000, "to_hit": -1, @@ -75,7 +75,7 @@ "type": "ARMOR", "name": "pair of C.R.I.T rec gloves", "description": "C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are made with cotton with a neoprene lining for grip-pads and warmth. ", - "weight": 558, + "weight": "558 g", "volume": "250 ml", "price": 100000, "to_hit": -1, @@ -115,7 +115,7 @@ "category": "armor", "name": "C.R.I.T rec duster", "description": "A waterproofed full-length duster coat. Made with neoprene, comfort and functionality meet together to form a fancy but sleek contemporary design. It has several pockets for storage.", - "weight": 1520, + "weight": "1520 g", "volume": "5750 ml", "price": 25500, "to_hit": -1, @@ -136,7 +136,7 @@ "type": "ARMOR", "name": "C.R.I.T rec hat", "description": "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec cover. Thick enough to provide warmth in colder weather, this hat shares the same sleek design of most of C.R.I.T's gear.", - "weight": 253, + "weight": "253 g", "volume": "1250 ml", "price": 4500, "material": [ "cotton", "neoprene", "rubber" ], diff --git a/data/mods/CRT_EXPANSION/items/crt_generic.json b/data/mods/CRT_EXPANSION/items/crt_generic.json index 8ce56920c77a9..b4660477c53f3 100644 --- a/data/mods/CRT_EXPANSION/items/crt_generic.json +++ b/data/mods/CRT_EXPANSION/items/crt_generic.json @@ -5,7 +5,7 @@ "category": "spare_parts", "name": "withered plant bundle", "description": "A bundle of plant matter", - "weight": 80, + "weight": "80 g", "volume": "500 ml", "material": [ "paper" ], "symbol": ";", diff --git a/data/mods/CRT_EXPANSION/items/crt_gun.json b/data/mods/CRT_EXPANSION/items/crt_gun.json index 9fa7b86dc878e..2ec1f43db2220 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gun.json +++ b/data/mods/CRT_EXPANSION/items/crt_gun.json @@ -4,7 +4,7 @@ "type": "GUN", "name": "CRIT .5 LP", "description": "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP is a relatively weak but accurate laser pistol. The double-barrel design compensates for the lack of raw power and yet the gun manages to be relatively easy to aim and lightweight due to the superalloy construction.", - "weight": 650, + "weight": "650 g", "volume": "750 ml", "price": 1000000, "to_hit": -2, @@ -40,7 +40,7 @@ "type": "GUN", "name": "CRIT Chain Laser", "description": "A tried and true favorite from the bowels of R&D hell. Based off of a researcher's video on three taped-together .5 LPs on a hand held power drill, this gun is a relatively light weapon for the amount of UPS it eats and destruction it can cause.", - "weight": 2650, + "weight": "2650 g", "volume": "2500 ml", "price": 1000000, "to_hit": -2, @@ -67,7 +67,7 @@ "type": "GUN", "name": "CRIT Laser Carbine", "description": "A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly developed to test out a new breakthrough in laser weapons.", - "weight": 2150, + "weight": "2150 g", "volume": "2 L", "price": 1100000, "to_hit": -1, @@ -103,7 +103,7 @@ "type": "GUN", "name": "CRIT Energy Rifle", "description": "A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a new breakthrough in hybrid weaponry.", - "weight": 5150, + "weight": "5150 g", "volume": "2500 ml", "price": 1800000, "to_hit": -1, @@ -139,7 +139,7 @@ "type": "GUN", "name": "CRIT CQB Standard Issue", "description": "A simple combination gun. This military-grade semi-auto carbine couples the mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To further compliment the CQB aspect, the stock is built to amplify the user's force and the rugged construction with tonfa-like grip can handle bashing in enemy heads. An integrated magazine makes it a pain to reload, but keeps your clip from ejecting accidently.", - "weight": 1650, + "weight": "1650 g", "volume": "750 ml", "price": 1000000, "to_hit": 2, @@ -165,7 +165,7 @@ "type": "GUN", "name": "CRIT Fire Glove", "description": "Experimental CQB weapon system under development in C.R.I.T R&D.", - "weight": 650, + "weight": "650 g", "volume": "750 ml", "price": 1000000, "to_hit": 1, @@ -209,7 +209,7 @@ "flags": [ "STR_RELOAD", "NON-FOULING", "NON-FOULING" ], "skill": "rifle", "ammo": "pellets", - "weight": 5023, + "weight": "5023 g", "volume": "2 L", "bashing": 10, "to_hit": -1, @@ -228,7 +228,7 @@ "type": "GUN", "name": "Plasma Cutter", "description": "Experimental cutting tool under development in C.R.I.T R&D. It fires an extremely hot wave of plasma that slices into materials.", - "weight": 1650, + "weight": "1650 g", "volume": "750 ml", "price": 1000000, "to_hit": -2, @@ -256,7 +256,7 @@ "type": "GUN", "name": "Rivet Driver", "description": "Experimental double purpose tool under development in C.R.I.T R&D. It takes a regular nail and then enlongates it within a fraction of a second before firing it out, upon reaching a target, the fragile stake explodes into shards.", - "weight": 1650, + "weight": "1650 g", "volume": "750 ml", "price": 1000000, "to_hit": -2, @@ -283,7 +283,7 @@ "type": "GUN", "name": "Line Gun", "description": "Experimental high power cutting tool under development in C.R.I.T R&D. It fires plasma in a wide line for slicing into dense materials.", - "weight": 2650, + "weight": "2650 g", "volume": "1500 ml", "price": 1000000, "to_hit": -1, @@ -312,7 +312,7 @@ "type": "GUN", "name": "Pulse Rifle", "description": "Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which instantly mushroom out upon impact.", - "weight": 2250, + "weight": "2250 g", "volume": "1 L", "price": 1000000, "to_hit": -2, @@ -340,7 +340,7 @@ "type": "GUN", "name": "Ripper", "description": "Experimental EM saw under development in C.R.I.T R&D. Great for distance cutting of material.", - "weight": 2250, + "weight": "2250 g", "volume": "1 L", "price": 1000000, "to_hit": -2, diff --git a/data/mods/CRT_EXPANSION/items/crt_gunmods.json b/data/mods/CRT_EXPANSION/items/crt_gunmods.json index 904729c5ab81c..482f08e7cdbf0 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gunmods.json +++ b/data/mods/CRT_EXPANSION/items/crt_gunmods.json @@ -4,7 +4,7 @@ "type": "GUNMOD", "name": "Underslung flare launcher", "description": "A small barrel which launches signal flares. However, due to its awkward position, it has lower accuracy compared to an actual flaregun.", - "weight": 500, + "weight": "500 g", "volume": "250 ml", "price": 8000, "material": "steel", @@ -21,7 +21,7 @@ "type": "GUNMOD", "name": "CQB SI shotgun", "description": "The integrated underbarrel shotgun of this gun which holds a single shot. It's irremovable.", - "weight": 2600, + "weight": "2600 g", "volume": 0, "price": 95000, "to_hit": -1, @@ -39,7 +39,7 @@ "type": "GUNMOD", "name": "butt hook stock", "description": ", A military-grade stock which folds reducing the guns volume. The weight and the pivoting hook which latches onto your forearm allows for greater stability. ", - "weight": 500, + "weight": "500 g", "volume": "125 ml", "integral_volume": 0, "price": 42000, @@ -70,7 +70,7 @@ "type": "GUNMOD", "name": "tactical flashlight", "description": "A compact flashlight which is mounted to the side of your weapon, not powerful, but good enough for tight hallways.", - "weight": 250, + "weight": "250 g", "volume": "125 ml", "integral_volume": 0, "price": 42000, @@ -98,7 +98,7 @@ "type": "GUNMOD", "name": "tactical flashlight (on)", "description": "A compact flashlight which is attatched to the side of your weapon, not powerful, but good enough for tight hallways.", - "weight": 250, + "weight": "250 g", "volume": "125 ml", "integral_volume": 0, "price": 42000, diff --git a/data/mods/CRT_EXPANSION/items/crt_toolarmor.json b/data/mods/CRT_EXPANSION/items/crt_toolarmor.json index a8242f3c39621..1ef8980277d86 100644 --- a/data/mods/CRT_EXPANSION/items/crt_toolarmor.json +++ b/data/mods/CRT_EXPANSION/items/crt_toolarmor.json @@ -5,7 +5,7 @@ "category": "armor", "name": "CRIT gasmask (off)", "description": "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line electronics and lined with kevlar for extra protection in order to keep one's head where it should be. Various filters and other high tech wizardry allow for enhanced oxygen intake and safety even under bombardment. It has an integrated HUD and the option to turn it on for more features.", - "weight": 5000, + "weight": "5 kg", "volume": "1 L", "price": 2500000, "to_hit": 1, @@ -37,7 +37,7 @@ "category": "armor", "name": "CRIT gasmask (on)", "description": "This is the C.R.I.T Spec Ops modified gasmask. It is currently on and draining power for the HUD, low-level nightvision and other protective elements.", - "weight": 5000, + "weight": "5 kg", "volume": "1 L", "price": 2500000, "to_hit": -3, @@ -79,7 +79,7 @@ "category": "armor", "name": "CRIT EM vest (off)", "description": "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech filaments and reactive servos which protects its wearer and assists in movement at the cost high power usage. It is commonly worn by C.R.I.T Spec Ops for its ease of use and manuverability. Turn it on for suit mode, extra protection and movement.", - "weight": 10000, + "weight": "10 kg", "volume": "6250 ml", "price": 7000000, "to_hit": -3, @@ -114,7 +114,7 @@ "category": "armor", "name": "CRIT EM vest (on)", "description": "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech filaments, reactive servos and a generator which pumps a crystallized liquid that protects its wearer from most heavy combat situations at the cost of extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is currently in suit form and draining your UPS power at high rates.", - "weight": 10000, + "weight": "10 kg", "volume": "6250 ml", "price": 7000000, "to_hit": -3, @@ -224,7 +224,7 @@ "type": "ARMOR", "name": "wet bandana", "description": "A dampened cotton bandana, worn over the mouth for a extra protection from dust and other contaminants.", - "weight": 42, + "weight": "42 g", "volume": "250 ml", "price": 600, "to_hit": -1, diff --git a/data/mods/CRT_EXPANSION/items/crt_tools.json b/data/mods/CRT_EXPANSION/items/crt_tools.json index c096090318988..4bfb1cd8219d5 100644 --- a/data/mods/CRT_EXPANSION/items/crt_tools.json +++ b/data/mods/CRT_EXPANSION/items/crt_tools.json @@ -4,7 +4,7 @@ "type": "TOOL", "name": "CRIT mess kit", "description": "C.R.I.T standard-issue mess kit designed for ease of transport. Based off of the normal military mess kit, but made to be telescopic, the parts are made from a thin sheet of a stainless superalloy composite and are insulated with ceramic. Sadly, this compact reimagining loses much of its battery life but does have a rather small (useless) solar panel installed. Also comes with an absurdly small integrated fpoon and knife spatula set!", - "weight": 850, + "weight": "850 g", "volume": "750 ml", "price": 6500, "to_hit": -1, @@ -30,7 +30,7 @@ "description": "C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked pry bar at the bottom for opening simple things and bashing in heads. Matte black finish helps it avoid flash in dim-light situations and tanto tip allows for light-armor penetration. Blade length allows for decent reach.", "color": "dark_gray", "material": [ "hardsteel" ], - "weight": 350, + "weight": "350 g", "volume": "750 ml", "price": 20000, "damage": { "damage_type": "cold", "amount": 100 }, @@ -52,7 +52,7 @@ "description": "C.R.I.T CQB knuckledusters. Not too different from any normal pair other than weight.", "color": "dark_gray", "material": [ "hardsteel" ], - "weight": 550, + "weight": "550 g", "volume": "750 ml", "price": 20000, "bashing": 10, @@ -71,7 +71,7 @@ "color": "dark_gray", "material": [ "hardsteel" ], "artifact_data": { "charge_type": "ARTC_NULL", "effects_wielded": [ "AEP_DEX_UP", "AEP_SPEED_UP", "AEP_SPEED_UP" ] }, - "weight": 2500, + "weight": "2500 g", "volume": "2500 ml", "price": 20000000, "cutting": 5, @@ -107,7 +107,7 @@ "AEP_SAP_LIFE" ] }, - "weight": 50000, + "weight": "50 kg", "volume": "5 L", "price": 20000000, "cutting": 80, @@ -130,7 +130,7 @@ "price_postapoc": 5000, "material": [ "hardsteel", "plastic", "rubber" ], "techniques": [ "CHOP", "INERTIAL", "SMASH" ], - "weight": 1807, + "weight": "1807 g", "volume": "500 ml", "bashing": 8, "cutting": 10, @@ -144,7 +144,7 @@ "type": "TOOL", "name": "CRIT entrenching tool", "description": "C.R.I.T standard-issue collapsible spade. A built in vibration system that is powered by the user's movement allows the smaller spade to clear soil like a larger shovel.", - "weight": 578, + "weight": "578 g", "volume": "750 ml", "price": 4000, "to_hit": 1, @@ -162,7 +162,7 @@ "type": "TOOL", "name": "CRIT night stick", "description": "C.R.I.T standard issue guard tonfa. The length allows for great reach and the domed tip allows for greater impact than a cylinder style baton.", - "weight": 1028, + "weight": "1028 g", "volume": "1250 ml", "price": 4000, "to_hit": 2, diff --git a/data/mods/CRT_EXPANSION/monsters/crt_monster.json b/data/mods/CRT_EXPANSION/monsters/crt_monster.json index a54a8bef9ff88..5632c88b31483 100644 --- a/data/mods/CRT_EXPANSION/monsters/crt_monster.json +++ b/data/mods/CRT_EXPANSION/monsters/crt_monster.json @@ -8,7 +8,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 105, "material": [ "flesh" ], @@ -51,7 +51,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 60, "material": [ "flesh" ], @@ -93,7 +93,7 @@ "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 50, "speed": 90, "material": [ "bone" ], @@ -126,7 +126,7 @@ "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 110, "material": [ "flesh" ], @@ -163,7 +163,7 @@ "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 140, "material": [ "flesh" ], @@ -211,7 +211,7 @@ "default_faction": "zombie", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 25, "speed": 100, "material": [ "flesh" ], @@ -256,7 +256,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 65, "speed": 80, "material": [ "flesh" ], diff --git a/data/mods/CRT_EXPANSION/monsters/monster.json b/data/mods/CRT_EXPANSION/monsters/monster.json index a119db3d816f0..4e1ef063455ae 100644 --- a/data/mods/CRT_EXPANSION/monsters/monster.json +++ b/data/mods/CRT_EXPANSION/monsters/monster.json @@ -8,7 +8,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 10, "speed": 15, "material": [ "flesh" ], @@ -38,7 +38,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 10, "speed": 15, "material": [ "flesh" ], diff --git a/data/mods/CrazyCataclysm/crazy_aperturepotato.json b/data/mods/CrazyCataclysm/crazy_aperturepotato.json index 44f411f8cfb98..e44c2b8f9506e 100644 --- a/data/mods/CrazyCataclysm/crazy_aperturepotato.json +++ b/data/mods/CrazyCataclysm/crazy_aperturepotato.json @@ -22,7 +22,7 @@ "type": "TOOL", "name": "companion potato", "description": "Seems like some kind of Genetic Lifeform and Disk Operating System, attached to a potato.", - "weight": 900, + "weight": "900 g", "volume": "500 ml", "price": 9000, "to_hit": -1, diff --git a/data/mods/CrazyCataclysm/crazy_items.json b/data/mods/CrazyCataclysm/crazy_items.json index 5cacf61698bf4..c0a134a30f431 100644 --- a/data/mods/CrazyCataclysm/crazy_items.json +++ b/data/mods/CrazyCataclysm/crazy_items.json @@ -5,7 +5,7 @@ "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, + "weight": "180 g", "volume": "250 ml", "price": 40000, "to_hit": -1, @@ -21,7 +21,7 @@ "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, + "weight": "180 g", "volume": "250 ml", "price": 0, "to_hit": -1, @@ -59,7 +59,7 @@ "type": "GUN", "name": "Ionic Overload Generator", "description": "A powerful ion energy generator is implanted on your chest. Fires a powerful, ever-expanding energy blast that goes through various targets. The energy shot ignites oxygen creating fires as it moves and an explosion on impact.", - "weight": 2950, + "weight": "2950 g", "volume": "3 L", "price": 1600000, "to_hit": -1, @@ -85,7 +85,7 @@ "type": "GUN", "name": "Yeet Cannon", "description": "You can YEET all the bullets with this baby. YEET them right into all of the zombies in your path, all the hulks, the spiders, and those damned mole rats.", - "weight": 709, + "weight": "709 g", "volume": "539 ml", "price": 7500, "to_hit": -2, diff --git a/data/mods/CrazyCataclysm/crazy_monsters.json b/data/mods/CrazyCataclysm/crazy_monsters.json index db4a98b3fd2c0..a37833c89160d 100644 --- a/data/mods/CrazyCataclysm/crazy_monsters.json +++ b/data/mods/CrazyCataclysm/crazy_monsters.json @@ -22,7 +22,7 @@ "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 50, "speed": 60, "material": [ "bone" ], @@ -54,7 +54,7 @@ "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 10, "speed": 80, "material": [ "bone" ], diff --git a/data/mods/DinoMod/dinosaur.json b/data/mods/DinoMod/dinosaur.json index 375ac7e4ff495..18fda81786c73 100644 --- a/data/mods/DinoMod/dinosaur.json +++ b/data/mods/DinoMod/dinosaur.json @@ -14,7 +14,7 @@ "symbol": "D", "color": "green_yellow", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "material": "flesh", "aggression": -80, "morale": -8, @@ -47,7 +47,7 @@ "symbol": "D", "color": "light_green_yellow", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "material": "flesh", "aggression": -60, "morale": -20, @@ -77,7 +77,7 @@ "symbol": "D", "color": "blue_green", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": -20, "morale": 60, @@ -109,7 +109,7 @@ "symbol": "D", "color": "red_white", "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "material": "flesh", "aggression": 100, "morale": 100, @@ -141,7 +141,7 @@ "symbol": "D", "color": "light_red_white", "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "material": "flesh", "aggression": 100, "morale": 100, @@ -173,7 +173,7 @@ "symbol": "D", "color": "light_green_magenta", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": -50, "morale": 50, @@ -204,7 +204,7 @@ "symbol": "D", "color": "green_magenta", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": -50, "morale": -20, @@ -235,7 +235,7 @@ "symbol": "D", "color": "brown_magenta", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": -50, "morale": 30, @@ -266,7 +266,7 @@ "symbol": "D", "color": "brown_white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": 80, "morale": 80, @@ -298,7 +298,7 @@ "symbol": "D", "color": "dark_gray_yellow", "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "material": "flesh", "aggression": -60, "morale": -60, @@ -328,7 +328,7 @@ "symbol": "D", "color": "light_red_green", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "material": "flesh", "aggression": 0, "morale": 20, @@ -361,7 +361,7 @@ "symbol": "D", "color": "red_green", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": 1, "morale": 50, @@ -394,7 +394,7 @@ "symbol": "D", "color": "dark_gray_white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": 30, "morale": 80, @@ -427,7 +427,7 @@ "symbol": "D", "color": "dark_gray_magenta", "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "material": "flesh", "aggression": -40, "morale": -10, @@ -458,7 +458,7 @@ "symbol": "D", "color": "light_gray_yellow", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "material": "flesh", "aggression": -80, "morale": -8, @@ -490,7 +490,7 @@ "symbol": "D", "color": "magenta_green", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "material": "flesh", "aggression": 10, "morale": 30, diff --git a/data/mods/EW_Pack/ew_ammo.json b/data/mods/EW_Pack/ew_ammo.json index f3b890b655b61..b77637f58551b 100644 --- a/data/mods/EW_Pack/ew_ammo.json +++ b/data/mods/EW_Pack/ew_ammo.json @@ -10,7 +10,7 @@ "description": "A 6.54x42mm cartridge, loaded with a 120 gr. FMJBT bullet. Inspired by the improved .280 British, Alexander Sarafanov himself developed the 6.54x42mm rifle cartridge for his new SVS-24 Assault Rifle.", "material": [ "steel", "lead", "powder" ], "volume": "250 ml", - "weight": 14, + "weight": "14 g", "ammo_type": "654", "casing": "654_casing", "damage": 49, @@ -31,7 +31,7 @@ "name_plural": "6.54x42mm 9N12", "description": "The 6.54x42mm 9N12 has superior armor piercing capabilities thanks to its tungsten carbide core. Tungsten carbide was used in anti-tank rounds of the 20th and 21st century, whenever depleted uranium was unavailable or undesirable.", "material": [ "steel", "powder" ], - "weight": 12, + "weight": "12 g", "count": 50, "damage": 47, "pierce": 32, @@ -60,7 +60,7 @@ "description": "These metal pellets are propelled with the help of electromagnets, therefore they do not produce sound, flash or heat signature.", "material": "steel", "volume": "250 ml", - "weight": 4, + "weight": "4 g", "bashing": 1, "ammo_type": "wr_dread", "damage": 6, diff --git a/data/mods/EW_Pack/ew_books.json b/data/mods/EW_Pack/ew_books.json index 1ce3af1905c7c..9a98dd6058e8a 100644 --- a/data/mods/EW_Pack/ew_books.json +++ b/data/mods/EW_Pack/ew_books.json @@ -6,7 +6,7 @@ "name_plural": "Case #5846, Illegal Gun Modification", "max_level": 3, "description": "This file details illegal gun modifications. Maybe you could learn something. At least you don't have to worry about the cops anymore.", - "weight": 400, + "weight": "400 g", "color": "white", "intelligence": 4, "symbol": "?", diff --git a/data/mods/EW_Pack/ew_magazines.json b/data/mods/EW_Pack/ew_magazines.json index e407065a75c3c..00365c9454659 100644 --- a/data/mods/EW_Pack/ew_magazines.json +++ b/data/mods/EW_Pack/ew_magazines.json @@ -4,7 +4,7 @@ "type": "MAGAZINE", "name": "CW-24 auto-magazine", "description": "An advanced automagazine for the CW-24 rifle. Like the SVS magazines, it uses microrobotics to load its cartridges.", - "weight": 250, + "weight": "250 g", "volume": "500 ml", "price": 3500, "material": [ "plastic", "steel" ], @@ -21,7 +21,7 @@ "type": "MAGAZINE", "name": "CW-24 extended magazine", "description": "An extended auto-magazine for the CW-24 rifle. Like the SVS magazines, it uses microrobotics to load its cartridges.", - "weight": 290, + "weight": "290 g", "volume": "750 ml", "price": 5800, "material": [ "plastic", "steel" ], @@ -38,7 +38,7 @@ "type": "MAGAZINE", "name": "CWD-63 extended magazine", "description": "A cheap 10-round box magazine for the CWD-63. It's not as reliable.", - "weight": 120, + "weight": "120 g", "volume": "500 ml", "price": 1500, "material": [ "plastic", "steel" ], @@ -55,7 +55,7 @@ "type": "MAGAZINE", "name": "CWD-63 magazine", "description": "Since it's created for the .308 round, it doesn't need the curved shape of the original magazine.", - "weight": 160, + "weight": "160 g", "volume": "250 ml", "price": 3450, "material": [ "plastic", "steel" ], @@ -71,7 +71,7 @@ "type": "MAGAZINE", "name": "SVS-24 robodrum", "description": "An advanced 135-round drum magazine. Like the auto-magazine, it loads cartridges using microrobotics.", - "weight": 2358, + "weight": "2358 g", "volume": "1250 ml", "price": 12000, "material": [ "plastic", "steel" ], @@ -88,7 +88,7 @@ "type": "MAGAZINE", "name": "SVS-24 robomag", "description": "An advanced 42-round auto-magazine. Unlike previous generations of magazines, this one uses microrobotics to load cartridges.", - "weight": 320, + "weight": "320 g", "volume": "750 ml", "price": 4950, "material": [ "plastic", "steel" ], diff --git a/data/mods/EW_Pack/ew_weapons.json b/data/mods/EW_Pack/ew_weapons.json index dc7b15ddbd644..f11fdbe806a49 100644 --- a/data/mods/EW_Pack/ew_weapons.json +++ b/data/mods/EW_Pack/ew_weapons.json @@ -12,7 +12,7 @@ "material": [ "steel", "plastic" ], "skill": "rifle", "ammo": "654", - "weight": 3900, + "weight": "3900 g", "volume": "2 L", "bashing": 12, "to_hit": -1, @@ -49,7 +49,7 @@ "name_plural": "SVS-24C", "description": "The compact version of the standard SVS-24. It is commonly issued to tank crews or special forces due to its smaller size. The shorter barrel reduces accuracy.", "price": 440000, - "weight": 3000, + "weight": "3 kg", "volume": "1250 ml", "range": -2, "valid_mod_locations": [ @@ -80,7 +80,7 @@ "//": "Civvie version is cheaper.", "material": [ "steel", "plastic" ], "ammo": "545x39", - "weight": 3900, + "weight": "3900 g", "volume": "2 L", "bashing": 12, "to_hit": -1, @@ -170,7 +170,7 @@ "price": 170000, "material": [ "steel", "wood" ], "ammo": "308", - "weight": 4300, + "weight": "4300 g", "volume": "2750 ml", "bashing": 12, "to_hit": -1, @@ -206,7 +206,7 @@ "material": [ "steel", "plastic" ], "skill": "smg", "ammo": "wr_dread", - "weight": 1000, + "weight": "1 kg", "volume": "1 L", "bashing": 8, "to_hit": -1, diff --git a/data/mods/EW_Pack/obsolete.json b/data/mods/EW_Pack/obsolete.json index b76e01f739997..bbda9e0f7a02a 100644 --- a/data/mods/EW_Pack/obsolete.json +++ b/data/mods/EW_Pack/obsolete.json @@ -4,7 +4,7 @@ "id": "retool_545", "name": "5.45 caliber conversion kit", "location": "bore", - "weight": 114, + "weight": "114 g", "color": "green", "price": 50000, "description": "This kit is used to convert 6.54 rifle to the 5.45 caliber. The conversion results in slight reductions to recoil.", @@ -21,7 +21,7 @@ "id": "retool_654", "name": "6.54 caliber conversion kit", "location": "bore", - "weight": 114, + "weight": "114 g", "color": "green", "price": 50000, "description": "This kit is used to convert 5.45 rifle to the 6.54 caliber. The conversion results in increased recoil.", @@ -38,7 +38,7 @@ "id": "retool_762", "name": "7.62 caliber conversion kit", "location": "bore", - "weight": 114, + "weight": "114 g", "color": "green", "price": 50000, "description": "This kit is used to convert 6.54 rifle to the 7.62 caliber. The conversion results in increased recoil.", diff --git a/data/mods/FictonalWeapons/fic_mods.json b/data/mods/FictonalWeapons/fic_mods.json index 3915dafb7c96c..0010bc74ef993 100644 --- a/data/mods/FictonalWeapons/fic_mods.json +++ b/data/mods/FictonalWeapons/fic_mods.json @@ -9,7 +9,7 @@ "location": "accessories", "price": 48000, "material": "steel", - "weight": 226, + "weight": "226 g", "volume": "250 ml", "bashing": 3, "to_hit": -1, @@ -24,7 +24,7 @@ "type": "GUNMOD", "name": "integral flamethrower", "description": "This genuine Herostratus flamethrower is ideal for light brush clearing and self-defense.", - "weight": 1500, + "weight": "1500 g", "volume": "750 ml", "price": 100000, "material": [ "steel", "ceramic" ], @@ -51,7 +51,7 @@ "damage_modifier": 4, "description": "ElectroMagnetic Acceleration System is an array of electromagnets attached to the front of the barrel, accelerating any projectile fired to even higher velocities, increasing damage, recoil and reducing accuracy. It does however drain UPS charges when firing and due to extensive modifications the gun can no longer operate without a UPS.", "location": "barrel", - "weight": 450, + "weight": "450 g", "color": "light_gray", "symbol": ":", "material": [ "steel" ], diff --git a/data/mods/FictonalWeapons/fic_weapons.json b/data/mods/FictonalWeapons/fic_weapons.json index e66fb6a1233cc..0096787d6edc6 100644 --- a/data/mods/FictonalWeapons/fic_weapons.json +++ b/data/mods/FictonalWeapons/fic_weapons.json @@ -5,7 +5,7 @@ "type": "GUN", "name": "JHEC M128", "description": "The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis.", - "weight": 1500, + "weight": "1500 g", "volume": "750 ml", "price": 250000, "to_hit": -1, @@ -34,7 +34,7 @@ "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ], "skill": "pistol", "ammo": "454", - "weight": 1500, + "weight": "1500 g", "volume": "500 ml", "bashing": 10, "to_hit": -1, @@ -71,7 +71,7 @@ "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "SHEATH_SWORD", "DURABLE_MELEE", "NON-FOULING" ], "skill": "pistol", "ammo": "500", - "weight": 1800, + "weight": "1800 g", "volume": "2250 ml", "bashing": 2, "cutting": 22, @@ -98,7 +98,7 @@ "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "SHEATH_KNIFE", "STAB", "DURABLE_MELEE", "NON-FOULING" ], "skill": "pistol", "ammo": "500", - "weight": 700, + "weight": "700 g", "volume": "500 ml", "bashing": 2, "cutting": 14, @@ -127,7 +127,7 @@ "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], "skill": "pistol", "ammo": "50", - "weight": 3800, + "weight": "3800 g", "volume": "2 L", "bashing": 11, "to_hit": -4, @@ -156,7 +156,7 @@ "color": "dark_gray", "name": "M919", "description": "Manufactured by Sarah and Suhl machine company of Portland, Maine, the M919 submachine gun is the most accurate 9x19mm submachine gun on the market. Intended for police use, it is fitted with an integral grenade launcher.", - "weight": 3100, + "weight": "3100 g", "volume": "1250 ml", "price": 430000, "to_hit": -1, @@ -187,7 +187,7 @@ "material": [ "steel", "plastic" ], "skill": "smg", "ammo": "44", - "weight": 3400, + "weight": "3400 g", "volume": "1250 ml", "bashing": 10, "to_hit": -2, @@ -230,7 +230,7 @@ "mode_modifier": [ [ "DEFAULT", "auto", 5 ] ], "ups_charges": 6, "skill": "smg", - "weight": 2100, + "weight": "2100 g", "volume": "1500 ml", "bashing": 7, "ranged_damage": 10, @@ -264,7 +264,7 @@ "ammo_effects": [ "LIGHTNING", "BOUNCE", "BEANBAG" ], "ups_charges": 120, "skill": "rifle", - "weight": 2700, + "weight": "2700 g", "volume": "2 L", "bashing": 7, "ranged_damage": 16, @@ -281,7 +281,7 @@ "type": "GUN", "name": "M1911 DS", "description": "The M1911 Darkstalker is a very modified M1911, it has a fully integrated crossbow and added rails. Professional looking with a ebony black finish, laced with lime green details. Now they will know why they fear the night. Bat hood sold separately.", - "weight": 1135, + "weight": "1135 g", "volume": "750 ml", "price": 150000, "bashing": 7, diff --git a/data/mods/FictonalWeapons/ficmags.json b/data/mods/FictonalWeapons/ficmags.json index 482f89bb90ac4..8d589b3ab0390 100644 --- a/data/mods/FictonalWeapons/ficmags.json +++ b/data/mods/FictonalWeapons/ficmags.json @@ -4,7 +4,7 @@ "type": "MAGAZINE", "name": ".454 6-round speedloader", "description": "This speedloader can hold 6 rounds of .454 and quickly reload a compatible revolver.", - "weight": 116, + "weight": "116 g", "volume": "250 ml", "price": 2400, "material": "steel", @@ -19,7 +19,7 @@ "type": "MAGAZINE", "name": ".454 8-round speedloader", "description": "This speedloader can hold 8 rounds of .454 and quickly reload a compatible revolver.", - "weight": 132, + "weight": "132 g", "volume": "250 ml", "price": 2800, "material": "steel", @@ -34,7 +34,7 @@ "type": "MAGAZINE", "name": "Eagle 1776 magazine", "description": "An american-made box magazine, designed to deliver 24 .44 Magnum cartridges to the Eagle 1776.", - "weight": 195, + "weight": "195 g", "volume": "500 ml", "price": 1776, "material": "steel", diff --git a/data/mods/Fuji_Structures/items/items_games.json b/data/mods/Fuji_Structures/items/items_games.json index 80022648a6a0d..32c29eaff814b 100644 --- a/data/mods/Fuji_Structures/items/items_games.json +++ b/data/mods/Fuji_Structures/items/items_games.json @@ -4,7 +4,7 @@ "type": "BOOK", "name": "chess set", "description": "A wooden box containing all the equipment needed to play a game of chess.", - "weight": 907, + "weight": "907 g", "volume": "2 L", "price": 7500, "material": [ "wood" ], @@ -20,7 +20,7 @@ "type": "BOOK", "name": "checkers set", "description": "A wooden box containing a set of round tokens used to play checkers.", - "weight": 788, + "weight": "788 g", "volume": "1500 ml", "price": 2000, "material": [ "wood" ], @@ -37,7 +37,7 @@ "name": "deck of cards", "name_plural": "decks of cards", "description": "A collection of 52 cards made to play poker.", - "weight": 96, + "weight": "96 g", "volume": "125 ml", "price": 599, "material": [ "paper" ], @@ -54,7 +54,7 @@ "name": "deck of Sorcery cards", "name_plural": "decks of Sorcery cards", "description": "A set of cards meant to play the game \"Sorcery.\" Each card has a fun picture of a different monster.", - "weight": 210, + "weight": "210 g", "volume": "250 ml", "price": 2300, "material": [ "paper" ], @@ -70,7 +70,7 @@ "type": "BOOK", "name": "Picturesque", "description": "A game where one draws an image, and the others attempt to guess what it is.", - "weight": 350, + "weight": "350 g", "volume": "500 ml", "price": 1500, "material": [ "plastic" ], @@ -86,7 +86,7 @@ "type": "BOOK", "name": "Capitalism", "description": "A game where players traverse around the board buying property and swindling their friends.", - "weight": 300, + "weight": "300 g", "volume": "500 ml", "price": 99, "material": [ "plastic" ], @@ -102,7 +102,7 @@ "type": "BOOK", "name": "Blobs and Bandits", "description": "A roleplaying game set in the post-apocalypse, so you can pretend to survive the apocalypse while surviving the apocalypse.", - "weight": 680, + "weight": "680 g", "volume": "1250 ml", "price": 12950, "material": [ "plastic" ], @@ -118,7 +118,7 @@ "type": "BOOK", "name": "Battlehammer", "description": "A strategy game featuring a set of tiny figurines of fantasy creatures.", - "weight": 680, + "weight": "680 g", "volume": "1250 ml", "price": 10880, "material": [ "plastic" ], @@ -134,7 +134,7 @@ "type": "BOOK", "name": "Battlehammer 20k", "description": "A strategy game featuring a set of tiny figurines of space aliens and grotesque space marines.", - "weight": 680, + "weight": "680 g", "volume": "1250 ml", "price": 10880, "material": [ "plastic" ], @@ -150,7 +150,7 @@ "type": "BOOK", "name": "Settlers of the Ranch", "description": "A strategy game where players build settlements and trade for supplies.", - "weight": 804, + "weight": "804 g", "volume": "1250 ml", "price": 7050, "material": [ "wood" ], @@ -166,7 +166,7 @@ "type": "BOOK", "name": "Warships", "description": "A game where players try to guess where the opponent placed their ships on the board.", - "weight": 450, + "weight": "450 g", "volume": "500 ml", "price": 2000, "material": [ "plastic" ], @@ -182,7 +182,7 @@ "type": "BOOK", "name": "Murder Mystery", "description": "A game where players try to figure out who murdered the butler.", - "weight": 370, + "weight": "370 g", "volume": "500 ml", "price": 2480, "material": [ "paper" ], diff --git a/data/mods/Generic_Guns/gg_guns.json b/data/mods/Generic_Guns/gg_guns.json index e14ae6bdd6a67..c3408dc4117bb 100644 --- a/data/mods/Generic_Guns/gg_guns.json +++ b/data/mods/Generic_Guns/gg_guns.json @@ -6,7 +6,7 @@ "name": "pipe gun: revolver ammo", "name_plural": "pipe guns: revolver ammo", "description": "A home-made breech-loading gun made from a metal pipe. It can hold a single revolver round.", - "weight": 1953, + "weight": "1953 g", "volume": "1750 ml", "price": 10000, "to_hit": -2, @@ -31,7 +31,7 @@ "reload_noise_volume": 10, "name": "lever action carbine", "description": "A rugged lever-action carbine reminiscent of the Wild West. It holds twelve revolver rounds in a tubular internal magazine.", - "weight": 3175, + "weight": "3175 g", "volume": "3 L", "price": 85000, "to_hit": 1, diff --git a/data/mods/Growable_pots/items.json b/data/mods/Growable_pots/items.json index fea2f3c745bf0..67e93d056381f 100644 --- a/data/mods/Growable_pots/items.json +++ b/data/mods/Growable_pots/items.json @@ -8,7 +8,7 @@ "description": "A special pot for growing plants, maintaining them at comfortable conditions for maximum yield. It can be crafted with various seeds to plant them.", "price": 600, "material": "clay", - "weight": 280, + "weight": "280 g", "volume": "2 L", "contains": "1250 ml", "bashing": 1, @@ -21,7 +21,7 @@ "abstract": "gp_pot_growing", "name": "garden pot (growing)", "description": "A garden pot growing some tasty, unnameable plants. You shouldn't see this item.", - "weight": 480, + "weight": "480 g", "symbol": ")", "color": "brown", "price": 1300, diff --git a/data/mods/Magiclysm/enchanted/enchanted_melee.json b/data/mods/Magiclysm/enchanted/enchanted_melee.json index f6222d3ca52cd..0d9e0764c061c 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_melee.json +++ b/data/mods/Magiclysm/enchanted/enchanted_melee.json @@ -761,7 +761,7 @@ "name": "Biomancer spear", "//": "Effectively a durable stone spear +1 with IMPALE tech. based off Wicked Bonespear. Lorewise, it would make sense for novice Biomancers to be developing their skills in spears so they can adequately use the Bonespear(No whips/REACH3 for you!) once they're proficient enough to summon one. Should be weaker than other school weapons DPSwise due to reach.", "description": "A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune embedded at the base of the head.", - "weight": 988, + "weight": "988 g", "volume": "1250 ml", "price": 3900, "to_hit": 2, @@ -780,7 +780,7 @@ "name": "Technomancer toolbar", "//": "Combat stats based off crowbar +1, techniques off Halligan bar(closest non-magical substitute), weight based on 75% of hammer & wrench(since their handles aren't included) + 100% crowbar with benefit from +1 enchantment", "description": "This staff incorporates a sturdy cresent wrench on top of a prybar and a hammer on the other in a convienent package. There is a Technomancer rune embedded in the hammerhead.", - "weight": 1536, + "weight": "1536 g", "volume": "1750 ml", "price": 3900, "to_hit": 1, @@ -799,7 +799,7 @@ "name": { "str": "Magus staff", "str_pl": "Magus staves" }, "//": "The classical vision of the wizard gets a classic weapon. DPS Stats are between the regular and ironshod versions. Stats are slightly worse than the QS+1 due to the glass weight slowing attack speed.", "description": "A quarterstaff with runes carved into it and two glass jars, heat-tempered and infused with mana for durability, to act as mana receptacles. There are two Magi runes embedded at the tips.", - "weight": 1530, + "weight": "1530 g", "volume": "1500 ml", "price": 3900, "to_hit": 2, @@ -816,7 +816,7 @@ "name": "Kelvinist flamberge", "//": "Flame-bladed sword covers half of Kelvinist's heat-cold theme. Combat stats equivalent to cutlass +1 with BRUTAL technique.", "description": "A sword with an undulating blade, reminiscent of a flame. There is a Kelvinist rune embedded in the pommel.", - "weight": 1530, + "weight": "1530 g", "volume": "1250 ml", "price": 3900, "to_hit": 3, @@ -836,7 +836,7 @@ "name": "Stormshaper axe", "//": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons. Metals chosen for being two most conductive metals + balancing reasons", "description": "A forged copper axe with silver trimmings and a wooden handle. There is a Stormshaper rune embedded in the eye.", - "weight": 3330, + "weight": "3330 g", "volume": "2 L", "price": 3900, "to_hit": 3, @@ -856,7 +856,7 @@ "name": "Animist athame", "//": "Tool qualities equivalent to steak knife, combat equiv. to copper knife + 1 w/ RAPID and BLOCK1, size/weight off combat knife +1", "description": "A steel ritual knife used by Animists to draw blood for summoning. Their school rune is embedded in the crossguard.", - "weight": 504, + "weight": "504 g", "volume": "500 ml", "price": 3000, "bashing": 2, diff --git a/data/mods/Magiclysm/enchanted/enchanted_ranged.json b/data/mods/Magiclysm/enchanted/enchanted_ranged.json index 314624f1cfc91..dfce3b08b7dc6 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_ranged.json +++ b/data/mods/Magiclysm/enchanted/enchanted_ranged.json @@ -23,7 +23,7 @@ "skill": "archery", "min_strength": 5, "ammo": "arrow", - "weight": 360, + "weight": "360 g", "volume": "1750 ml", "bashing": 9, "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 13 }, diff --git a/data/mods/Magiclysm/enchanted/enchanted_unarmed.json b/data/mods/Magiclysm/enchanted/enchanted_unarmed.json index 7f5acf82fb7f7..38c2f1af78cf7 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_unarmed.json +++ b/data/mods/Magiclysm/enchanted/enchanted_unarmed.json @@ -28,7 +28,7 @@ "looks_like": "cestus", "material": [ "steel", "leather" ], "volume": "500 ml", - "weight": 970, + "weight": "970 g", "to_hit": 2, "bashing": 12, "qualities": [ [ "HAMMER", 1 ] ], @@ -62,7 +62,7 @@ "description": "A large gleaming metal gauntlet covered in magical symbols that allows you to land astoundingly powerful blows.", "material": [ "superalloy" ], "volume": "1 L", - "weight": 981, + "weight": "981 g", "bashing": 34, "to_hit": 3, "qualities": [ [ "HAMMER", 2 ] ], @@ -105,7 +105,7 @@ "description": "A stone battle glove with carved runes encasing the hand, protecting it while increasing striking power. There is an Earthshaper rune embedded in the palm.", "material": [ "stone", "leather", "steel" ], "volume": "500 ml", - "weight": 873, + "weight": "873 g", "bashing": 13, "to_hit": 1, "qualities": [ [ "HAMMER", 1 ] ], diff --git a/data/mods/Magiclysm/enchanted/enchanted_wands.json b/data/mods/Magiclysm/enchanted/enchanted_wands.json index 00a0ac0059590..976f2611dbe47 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_wands.json +++ b/data/mods/Magiclysm/enchanted/enchanted_wands.json @@ -3,7 +3,7 @@ "abstract": "spell_wand", "name": "Magic Wand", "type": "TOOL", - "weight": 230, + "weight": "230 g", "volume": "500 ml", "price": 10000, "bashing": 3, @@ -21,7 +21,7 @@ "abstract": "disp_wand", "name": "Disposable Wand", "type": "TOOL", - "weight": 230, + "weight": "230 g", "volume": "500 ml", "price": 10000, "bashing": 3, diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json index 3ba59a3ec0317..0012a2c417698 100644 --- a/data/mods/Magiclysm/items/alchemy_items.json +++ b/data/mods/Magiclysm/items/alchemy_items.json @@ -4,7 +4,7 @@ "type": "TOOL", "name": "owlbear gastrolith", "description": "This strangely shaped rock was once a part of an owlbear's complex digestive system, creating a link between owl throat and bear stomach. It is possible that it could serve a similar purpose in alchemy, helping to bind together two disparate halves.", - "weight": 2000, + "weight": "2 kg", "volume": "750 ml", "price": 0, "bashing": 9, @@ -24,7 +24,7 @@ "name": "stone shell", "description": "The broken fragment of an owlbear egg. With luck it might still contain some of its former power, though if nothing else it's still a bit sharp.", "material": "stone", - "weight": 250, + "weight": "250 g", "volume": "150 ml", "bashing": 5, "cutting": 3, @@ -57,7 +57,7 @@ "name": "copper circlet", "name_plural": "copper circlets", "description": "A wooden band with copper trimmings to be worn on the head. Touching your temples with it on makes you feel very calm.", - "weight": 700, + "weight": "700 g", "volume": "600ml", "price": 1500, "price_postapoc": 100, @@ -79,7 +79,7 @@ "name_plural": "stone chisels", "looks_like": "chisel", "description": "This is a short stone chisel. It can be used to engrave on stone, wood, or soft metals.", - "weight": 660, + "weight": "660 g", "volume": "250 ml", "price": 1600, "to_hit": 2, @@ -116,7 +116,7 @@ "name": "glow dust", "description": "The powdered remains of a will-o-wisps's phsyical form. It seems to still possess an otherworldly glow.", "material": "powder", - "weight": 5, + "weight": "5 g", "volume": 1 }, { @@ -125,7 +125,7 @@ "category": "tools", "name": "magical reading light", "description": "Powered by the magic of glow powder and lesser mana potions, this extremely expensive little light will provide just enough light to read by for at least a decade. Use it to close the cover and hide the light.", - "weight": 270, + "weight": "270 g", "volume": "250 ml", "price": 125000, "material": "glass", @@ -146,7 +146,7 @@ "name": "magical reading light (covered)", "name_plural": "magical reading lights (covered)", "description": "Powered by the magic of glow powder and lesser mana potions, this extremely expensive little light will provide just enough light to read by for at least a decade. The cover is closed. Use it to open the cover and show the light.", - "weight": 270, + "weight": "270 g", "volume": "250 ml", "price": 125000, "material": "glass", @@ -163,7 +163,7 @@ "name": "bulette plate", "description": "The great plates from behind a bulette's head have always been prized for use in shield and armor making.", "material": "arcane_skin", - "weight": 30000, + "weight": "30 kg", "volume": 12 }, { @@ -174,7 +174,7 @@ "name": "bulette pearl", "description": "As a bulette burrows through the earth its gills collect minute amounts of precious metals and gems which slowly aggregate into lustrous gemstones prized for their beauty and power.", "material": "stone", - "weight": 120, + "weight": "120 g", "volume": 1 }, { @@ -185,7 +185,7 @@ "name": "dragon essence", "description": "This is the magical essence from a dragon, distilled into a concentrated form.", "volume": "250 ml", - "weight": 300, + "weight": "300 g", "flags": [ "TRADER_AVOID", "INDEIBLE" ], "container": "flask_glass", "charges": 1, diff --git a/data/mods/Magiclysm/items/bionics.json b/data/mods/Magiclysm/items/bionics.json index b7b2de4bd6c62..e6c96d415d5a9 100644 --- a/data/mods/Magiclysm/items/bionics.json +++ b/data/mods/Magiclysm/items/bionics.json @@ -6,7 +6,7 @@ "name": "Blood Power Generator CBM", "description": "Using the latest advancement in technomancy this bionic is able to convert the innate energy stored in blood into bionic power. The stronger the blood the better. It can hold up to 100 mL of blood.", "price": 450000, - "weight": 500, + "weight": "500 g", "difficulty": 8 } ] diff --git a/data/mods/Magiclysm/items/black_dragon_items.json b/data/mods/Magiclysm/items/black_dragon_items.json index 6d8646130231a..3ebee0f3234b6 100644 --- a/data/mods/Magiclysm/items/black_dragon_items.json +++ b/data/mods/Magiclysm/items/black_dragon_items.json @@ -8,7 +8,7 @@ "name": "black dragon scale", "price": 2500, "material": "black_dragon_hide", - "weight": 380, + "weight": "380 g", "volume": "75 ml", "bashing": 0, "to_hit": -4, @@ -19,7 +19,7 @@ "id": "black_dragon_hide_raw", "category": "spare_parts", "name": "raw black dragon hide", - "weight": 2500, + "weight": "2500 g", "color": "black_white", "spoils_in": "3 day", "comestible_type": "FOOD", @@ -38,7 +38,7 @@ "category": "spare_parts", "name": "tanning black dragon hide", "description": "A treated black dragon hide which is undergoing the chemical processes required to become workable. You will be able to activate it to unroll and make use of it when it is done.", - "weight": 2500, + "weight": "2500 g", "volume": "4 L", "price": 0, "to_hit": -2, @@ -65,7 +65,7 @@ "description": "Prepared hide from a black dragon. Hard, acid-resistant, and with more scales could make a suit of armor as hard as steel and half as heavy.", "price": 50000, "material": [ "black_dragon_hide" ], - "weight": 2500, + "weight": "2500 g", "volume": "4 L", "category": "spare_parts", "to_hit": -1 @@ -77,7 +77,7 @@ "name": "pair of black dragonscale boots", "name_plural": "pairs of black dragonscale boots", "description": "Boots made of black dragonscale. Very protective, and surprisingly light.", - "weight": 945, + "weight": "945 g", "volume": "3250 ml", "price": 75000, "to_hit": -2, @@ -100,7 +100,7 @@ "name": "pair of black dragonhide boots", "name_plural": "pairs of black dragonhide boots", "description": "Boots made of black dragonhide. Very protective, and surprisingly light.", - "weight": 655, + "weight": "655 g", "volume": "3250 ml", "price": 50000, "to_hit": -2, @@ -122,7 +122,7 @@ "category": "armor", "name": "black dragonscale helmet", "description": "A helmet made from black dragonscale, held together with black dragonhide. It comes equipped with a full face visor.", - "weight": 856, + "weight": "856 g", "volume": "2500 ml", "price": 58000, "to_hit": -1, @@ -145,7 +145,7 @@ "category": "armor", "name": "black dragonhide helmet", "description": "A helmet made from black dragonhide. It protects your head well, and doesn't cover your face.", - "weight": 585, + "weight": "585 g", "volume": "2500 ml", "price": 58000, "to_hit": -1, @@ -168,7 +168,7 @@ "category": "armor", "name": "black dragonscale armor", "description": "A full suit of black dragon scale mail. It comes with all the accoutrements that cover your torso, legs, and arms, with the benefit of being very light and flexible.", - "weight": 4250, + "weight": "4250 g", "volume": "12 L", "price": 2000000, "to_hit": -3, @@ -190,7 +190,7 @@ "category": "armor", "name": "black dragonhide armor", "description": "A full suit of black dragonhide armor. It comes with all the accoutrements that cover your torso, legs, and arms, with the benefit of being very light and flexible.", - "weight": 3000, + "weight": "3 kg", "volume": "12 L", "price": 2000000, "to_hit": -3, @@ -213,7 +213,7 @@ "name": "pair of black dragonscale gauntlets", "name_plural": "pairs of black dragonscale gauntlets", "description": "A pair of heavy-duty gauntlets made of black dragonscale that covers your hands.", - "weight": 380, + "weight": "380 g", "volume": "1 L", "price": 180000, "to_hit": 2, @@ -235,7 +235,7 @@ "name": "pair of black dragonhide gloves", "name_plural": "pairs of black dragonhide gloves", "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": 230, + "weight": "230 g", "volume": "750 ml", "price": 180000, "to_hit": 2, diff --git a/data/mods/Magiclysm/items/cast_spell_items.json b/data/mods/Magiclysm/items/cast_spell_items.json index ca6421c45135b..e471f5d688140 100644 --- a/data/mods/Magiclysm/items/cast_spell_items.json +++ b/data/mods/Magiclysm/items/cast_spell_items.json @@ -5,7 +5,7 @@ "description": "You can't buy these, so you need to save them until the last boss! Actually, don't even use them there!", "use_action": { "type": "cast_spell", "spell_id": "recover_mana", "no_fail": true, "level": 0 }, "type": "COMESTIBLE", - "weight": 265, + "weight": "265 g", "quench": 10, "calories": 75, "volume": "250ml", @@ -43,7 +43,7 @@ "description": "This is a potion of Cat's Grace. It will increase your dexterity for 10 minutes.", "use_action": { "type": "cast_spell", "spell_id": "cats_grace", "no_fail": true, "level": 9 }, "type": "COMESTIBLE", - "weight": 265, + "weight": "265 g", "quench": 10, "calories": 75, "volume": "250ml", @@ -91,7 +91,7 @@ "comestible_type": "FOOD", "category": "weapons", "material": [ "leather", "flesh", "bone" ], - "weight": 225, + "weight": "225 g", "volume": "700ml", "symbol": "t", "color": "pink", @@ -124,7 +124,7 @@ "description": "This foul-smelling liquid simulates undead regeneration by accelerating your heart to dangerous levels. Drinking this in danger or at critical condition may be lethal.", "use_action": { "type": "cast_spell", "spell_id": "twisted_restore", "no_fail": true, "level": 1 }, "type": "COMESTIBLE", - "weight": 265, + "weight": "265 g", "quench": -30, "calories": 100, "volume": "250ml", diff --git a/data/mods/Magiclysm/items/class_runes.json b/data/mods/Magiclysm/items/class_runes.json index ea503ac713c0e..22ac166a3bd28 100644 --- a/data/mods/Magiclysm/items/class_runes.json +++ b/data/mods/Magiclysm/items/class_runes.json @@ -7,7 +7,7 @@ "name": "Biomancer rune", "description": "This magical pebble has an insignia of rended flesh and bones on it. It is necessary for Biomancers to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -19,7 +19,7 @@ "name": "Technomancer rune", "description": "This magical pebble has an insignia of clockwork and gears on it. It is necessary for Technomancers to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -32,7 +32,7 @@ "name_plural": "Magi runes", "description": "This magical pebble has an insignia of crystal and mana orbs on it. It is necessary for Magi to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -44,7 +44,7 @@ "name": "Earthshaper rune", "description": "This magical pebble has an insignia of steel and rocks on it. It is necessary for Earthshapers to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -56,7 +56,7 @@ "name": "Kelvinist rune", "description": "This magical pebble has an insignia of ice and flames on it. It is necessary for Kelvinists to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -68,7 +68,7 @@ "name": "Stormshaper rune", "description": "This magical pebble has an insignia of lightning and storm clouds on it. It is necessary for Stormshapers to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -80,7 +80,7 @@ "name": "Druid rune", "description": "This magical pebble has an insignia of nature and trees on it. It is necessary for Druids to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -92,7 +92,7 @@ "name": "Animist rune", "description": "This magical pebble has an insignia of summoners on it. It is necessary for Animists to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -104,7 +104,7 @@ "name": "alchemist rune", "description": "This magical pebble has an insignia of alchemy and potions on it. While versatile in use, the lack of attunement to any school prevents creation of more advanced recipes.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" } diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json index eaa53f68747a8..207d4368ff09a 100644 --- a/data/mods/Magiclysm/items/comestibles.json +++ b/data/mods/Magiclysm/items/comestibles.json @@ -3,7 +3,7 @@ "type": "COMESTIBLE", "id": "egg_owlbear_rock", "name": "owlbear egg", - "weight": 2395, + "weight": "2395 g", "color": "light_gray", "spoils_in": "14 days", "comestible_type": "FOOD", @@ -42,7 +42,7 @@ "material": [ "fur", "water" ], "primary_material": "fur", "volume": "350ml", - "weight": 15, + "weight": "15 g", "color": "brown", "symbol": "0", "name": "hairball", diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json index f197317981efb..d272a3a04468c 100644 --- a/data/mods/Magiclysm/items/ethereal_items.json +++ b/data/mods/Magiclysm/items/ethereal_items.json @@ -5,7 +5,7 @@ "name": "pair of magical armored stone gauntlets", "name_plural": "pairs of armored gauntlets", "description": "A magical flexible stonelike substance for protection and attack.", - "weight": 1, + "weight": "1 g", "volume": "250 ml", "price": 1, "to_hit": 2, @@ -30,7 +30,7 @@ "type": "TOOL", "name": "finger firelighter", "description": "This is a small flame you can hold in your hand. With a thought, you can cause it to light something on fire.", - "weight": 1, + "weight": "1 g", "volume": "1 ml", "price": 0, "symbol": ",", @@ -45,7 +45,7 @@ "name": "pair of magical armored stone gauntlets", "name_plural": "pairs of armored gauntlets", "description": "A magical flexible stonelike substance for protection and attack.", - "weight": 1, + "weight": "1 g", "volume": "250 ml", "price": 1, "to_hit": 2, @@ -69,7 +69,7 @@ "category": "tools", "name": "magic lamp", "description": "a magical light source that will light up a small area.", - "weight": 1, + "weight": "1 g", "volume": "250 ml", "price": 1, "to_hit": -2, @@ -99,7 +99,7 @@ "name": "large shield of magical ice", "category": "armor", "description": "A lightweight but tough shield crafted entirely of magical ice.", - "weight": 1000, + "weight": "1 kg", "volume": "5 L", "price": 1, "to_hit": 1, @@ -120,7 +120,7 @@ "name": "pair of slick icy coatings on your feet", "name_plural": "slick icy coatings", "description": "A magical slick icy coating on your feet. While quite fast on flat floors, they make it difficult to move on rough terrain.", - "weight": 1, + "weight": "1 g", "volume": "250 ml", "price": 1, "to_hit": -2, @@ -142,7 +142,7 @@ "id": "stormhammer", "name": "The Stormhammer", "description": "A crackling magical warhammer full of lightning to smite your foes with, and of course, smash things to bits!", - "weight": 1337, + "weight": "1337 g", "to_hit": 2, "color": "brown", "symbol": "/", @@ -193,7 +193,7 @@ "description": "Encases your arm and hand in a sheath of crackling magical lightning, you can punch and defend yourself with it in melee combat.", "material": [ "superalloy" ], "volume": "250 ml", - "weight": 1, + "weight": "1 g", "bashing": 10, "//electric": 15, "flags": [ @@ -214,7 +214,7 @@ "color": "brown", "name": "vicious tentacle whip", "description": "A long, writhing, tentacle covered in sharp bonelike blades and spikey protrusions.", - "weight": 2460, + "weight": "2460 g", "volume": "1500 ml", "material": [ "iron", "leather" ], "techniques": [ "PRECISE", "RAPID", "WBLOCK_2" ], @@ -272,7 +272,7 @@ "MAGIC_FOCUS" ], "techniques": [ "WBLOCK_2", "WIDE", "SWEEP", "BRUTAL" ], - "weight": 2175, + "weight": "2175 g", "volume": "2500 ml", "bashing": 16, "cutting": 36, @@ -301,7 +301,7 @@ ], "skill": "archery", "min_strength": 5, - "weight": 540, + "weight": "540 g", "volume": "2500 ml", "bashing": 16, "to_hit": 1, @@ -316,7 +316,7 @@ "type": "TOOL", "id": "druid_seed", "name": "seed of purification", - "weight": 1, + "weight": "1 g", "color": "white", "use_action": { "type": "transform", diff --git a/data/mods/Magiclysm/items/fuel.json b/data/mods/Magiclysm/items/fuel.json index 36afecab841a5..024d6a54e831e 100644 --- a/data/mods/Magiclysm/items/fuel.json +++ b/data/mods/Magiclysm/items/fuel.json @@ -4,7 +4,7 @@ "id": "dragon_blood", "name": "dragon blood", "name_plural": "dragon blood", - "weight": 2, + "weight": "2 g", "color": "red", "container": "flask_glass", "symbol": "~", @@ -29,7 +29,7 @@ "id": "tainted_blood", "name": "tainted blood", "name_plural": "tainted blood", - "weight": 2, + "weight": "2 g", "color": "black", "container": "flask_glass", "symbol": "~", @@ -47,7 +47,7 @@ "id": "blood", "name": "blood", "name_plural": "blood", - "weight": 265, + "weight": "265 g", "color": "red", "container": "flask_glass", "symbol": "~", diff --git a/data/mods/Magiclysm/items/mana_crystals.json b/data/mods/Magiclysm/items/mana_crystals.json index 32f3d4fe8d121..487021cfc605b 100644 --- a/data/mods/Magiclysm/items/mana_crystals.json +++ b/data/mods/Magiclysm/items/mana_crystals.json @@ -29,7 +29,7 @@ "name": "small mana crystal", "name_plural": "small mana crystals", "description": "This is a small mana crystal specifically designed to be attached to wand tips.", - "weight": 5, + "weight": "5 g", "volume": "250 ml", "price": 1500, "symbol": "=", diff --git a/data/mods/Magiclysm/items/melee.json b/data/mods/Magiclysm/items/melee.json index 56cd51b6bb707..aeb5b063cdef5 100644 --- a/data/mods/Magiclysm/items/melee.json +++ b/data/mods/Magiclysm/items/melee.json @@ -5,7 +5,7 @@ "type": "GENERIC", "name": "Mjölnir", "description": "Mjölnir, the legendary hammer of Thor. It is rumored to be able to level mountains with a single blow. You feel the power of Asgard coursing through the hammer.", - "weight": 1731, + "weight": "1731 g", "color": "light_gray", "material": [ "orichalcum_metal", "wood", "gold" ], "techniques": [ "WBLOCK_2", "BRUTAL" ], @@ -19,7 +19,7 @@ "type": "GENERIC", "name": "Gungnir", "description": "Gungnir, the spear of Odin. It is rumored to be the perfect spear, perfectly hitting any target regardless of the wielder's strength or skill. If feels like Odin's protecting you.", - "weight": 1854, + "weight": "1854 g", "material": [ "orichalcum_metal", "wood", "gold" ], "techniques": [ "WBLOCK_1", "IMPALE", "SWEEP" ], "volume": "3250 ml", @@ -33,7 +33,7 @@ "type": "GENERIC", "name": "Gram", "description": "Gram, the sword of Sigurd. It is rumored to be the sword that slayed the legendary dragon, Fafnir. Once said to have cleaved Regin's anvil in half, the edge is impeccable.", - "weight": 1132, + "weight": "1132 g", "material": [ "orichalcum_metal", "steel", "leather" ], "techniques": [ "WBLOCK_2", "PRECISE", "VORPAL" ], "volume": "2500 ml", @@ -50,7 +50,7 @@ "material": [ "steel", "gold", "orichalcum_metal" ], "flags": [ "MAGIC_FOCUS" ], "techniques": [ "WBLOCK_2", "SPIN", "RAPID", "SWEEP" ], - "weight": 1860, + "weight": "1860 g", "bashing": 20, "cutting": 35, "use_action": { "type": "cast_spell", "spell_id": "ethereal_grasp", "no_fail": true, "level": 10, "need_wielding": true } diff --git a/data/mods/Magiclysm/items/obsolete.json b/data/mods/Magiclysm/items/obsolete.json index 1167d56ad5ac2..acd51a29710e7 100644 --- a/data/mods/Magiclysm/items/obsolete.json +++ b/data/mods/Magiclysm/items/obsolete.json @@ -5,7 +5,7 @@ "name_plural": "wands of fireball", "description": "A classic, this wand shoots fireballs without fail. A more skilled Kelvinist could cast them more efficiently, though.", "type": "TOOL", - "weight": 230, + "weight": "230 g", "volume": "500 ml", "price": 10000, "bashing": 3, @@ -25,7 +25,7 @@ "name_plural": "wands of magic missile", "description": "A classic, this wand shoots magic missiles without fail. A more skilled Magus could cast them more efficiently, though.", "type": "TOOL", - "weight": 230, + "weight": "230 g", "volume": "500 ml", "price": 10000, "bashing": 3, diff --git a/data/mods/Magiclysm/items/recipe_books.json b/data/mods/Magiclysm/items/recipe_books.json index e4a2b3d606fd9..662c86f88c32e 100644 --- a/data/mods/Magiclysm/items/recipe_books.json +++ b/data/mods/Magiclysm/items/recipe_books.json @@ -83,7 +83,7 @@ "name": { "str": "The Weapons of Asgard and Beyond", "str_pl": "copies of The Weapons of Asgard and Beyond" }, "max_level": 10, "description": "An ornate book which appears to be written in Norse runes. Based on the detailed illustrations, it appears to contain information about crafting numerous weapons used by various Gods.", - "weight": 654, + "weight": "654 g", "color": "light_blue", "intelligence": 9, "symbol": "?", diff --git a/data/mods/Magiclysm/items/spell_scrolls.json b/data/mods/Magiclysm/items/spell_scrolls.json index a909202f00f29..172206a91cfc2 100644 --- a/data/mods/Magiclysm/items/spell_scrolls.json +++ b/data/mods/Magiclysm/items/spell_scrolls.json @@ -3,7 +3,7 @@ "abstract": "spell_scroll", "name": "Spell Scroll", "type": "GENERIC", - "weight": 475, + "weight": "475 g", "volume": "500 ml", "price": 4000, "material": [ "paper" ], diff --git a/data/mods/Magiclysm/items/spellbooks.json b/data/mods/Magiclysm/items/spellbooks.json index b147e1dcf4838..9e5f02d147d4f 100644 --- a/data/mods/Magiclysm/items/spellbooks.json +++ b/data/mods/Magiclysm/items/spellbooks.json @@ -4,7 +4,7 @@ "type": "GENERIC", "name": "A Technomancer's Guide to Debugging C:DDA", "description": "static std::string description( spell sp ) const;", - "weight": 1, + "weight": "1 g", "volume": "1 ml", "symbol": "?", "color": "magenta", @@ -31,7 +31,7 @@ "type": "GENERIC", "name": "A Beginner's Guide to Magic", "description": "You would describe this as more like a pamphlet than a spellbook, but it seems to have at least one interesting spell you can use.", - "weight": 585, + "weight": "585 g", "volume": "250 ml", "price": 5000, "symbol": "?", @@ -43,7 +43,7 @@ "type": "GENERIC", "name": "Wizarding Guide to Backpacking", "description": "This appears to be the spell version of a guide for what things to take with you when backpacking. It's a little bulky, but will certainly prove useful.", - "weight": 1000, + "weight": "1 kg", "volume": "1250 ml", "price": 35000, "symbol": "?", @@ -55,7 +55,7 @@ "type": "GENERIC", "name": "Pyromancy for Heretics", "description": "This charred husk of a book still contains many ways to light things aflame.", - "weight": 450, + "weight": "450 g", "volume": "1 L", "price": 1904, "symbol": "?", @@ -67,7 +67,7 @@ "type": "GENERIC", "name": "A Treatise on Magical Elements", "description": "This details complex diagrams, rituals, and choreography that describes various spells.", - "weight": 920, + "weight": "920 g", "volume": "750 ml", "price": 30000, "symbol": "?", @@ -79,7 +79,7 @@ "type": "GENERIC", "name": "Introduction to the Divine", "description": "This appears to mostly be a religious text, but it does have some notes on healing.", - "weight": 585, + "weight": "585 g", "volume": "500 ml", "price": 5000, "symbol": "?", @@ -91,7 +91,7 @@ "type": "GENERIC", "name": "The Paladin's Guide to Modern Spellcasting", "description": "Despite the title, this seems to be written in Middle English. A little obtuse, but you can make out most of the words well enough.", - "weight": 830, + "weight": "830 g", "volume": "750 ml", "price": 30000, "symbol": "?", @@ -103,7 +103,7 @@ "type": "GENERIC", "name": "Winter's Eternal Grasp", "description": "This slim book almost seems to be made from ice, it's cold to the touch.", - "weight": 450, + "weight": "450 g", "volume": "1 L", "price": 1904, "symbol": "?", @@ -115,7 +115,7 @@ "type": "GENERIC", "name": "The Tome of The Oncoming Storm", "description": "A large book embossed with crossed lightning bolts and storm clouds, it tingles to the touch.", - "weight": 430, + "weight": "430 g", "volume": "750 ml", "price": 5000, "symbol": "?", @@ -130,7 +130,7 @@ "type": "GENERIC", "name": "Scroll of Lightning Storm", "description": "This scroll details how a spell called 'Lightning Blast' which is commonly used among Stormshapers can be altered to become much more powerful, at a much higher mana cost.", - "weight": 129, + "weight": "129 g", "volume": "500 ml", "price": 25000, "symbol": "?", @@ -142,7 +142,7 @@ "type": "GENERIC", "name": "Nondescript Spellbook", "description": "A small book, containing spells created by a novice magician.", - "weight": 355, + "weight": "355 g", "volume": "500 ml", "symbol": "?", "color": "magenta", @@ -168,7 +168,7 @@ "type": "GENERIC", "name": "The Tome of Flesh", "description": "A small tome, seemingly covered in tanned human skin.", - "weight": 355, + "weight": "355 g", "volume": "500 ml", "symbol": "?", "color": "red", @@ -182,7 +182,7 @@ "type": "GENERIC", "name": "The Book of Trees", "description": "A bark covered book.", - "weight": 355, + "weight": "355 g", "volume": "500 ml", "symbol": "?", "color": "green", @@ -193,7 +193,7 @@ "type": "GENERIC", "name": "The Utility of Mana as an Energy Source", "description": "This book details spells that use your mana to recover various physiological effects.", - "weight": 728, + "weight": "728 g", "volume": "3 L", "symbol": "?", "color": "light_blue", @@ -207,7 +207,7 @@ "type": "GENERIC", "name": "The Tome of The Battle Mage", "description": "Your standard wizardy looking spellbook, filled with Magus combat spells. You sure lucked out!", - "weight": 434, + "weight": "434 g", "volume": "750 ml", "symbol": "?", "color": "light_gray", @@ -218,7 +218,7 @@ "type": "GENERIC", "name": "The Tome of the Hollow Earth", "description": "This large dusty spellbook seems perpetually, well, dusty. It contains the power of the earth.", - "weight": 483, + "weight": "483 g", "volume": "825 ml", "symbol": "?", "color": "brown", @@ -232,7 +232,7 @@ "type": "GENERIC", "name": "The Tome of Magical Movement", "description": "This small lightweight book seems to almost not entirely exist, let's say it 97% does. It contains Magus spells focused on movement.", - "weight": 231, + "weight": "231 g", "volume": "500 ml", "symbol": "?", "color": "light_gray", @@ -243,7 +243,7 @@ "type": "GENERIC", "name": "Smudged Scroll", "description": "This looks like someone was designing a new spell, but spilled a mug of coffee on it and crumpled it up in anger. You can tell that it will definitely cast something, but you can't be sure that it will work very well.", - "weight": 129, + "weight": "129 g", "volume": "100 ml", "symbol": "?", "color": "light_gray", @@ -254,7 +254,7 @@ "type": "GENERIC", "name": "Necromantic Minions for Dummies", "description": "This book details various ways of summoning an undead minion to fight for you. They all appear to disappear after a short time, crumbling to dust.", - "weight": 788, + "weight": "788 g", "volume": "2250 ml", "symbol": "?", "color": "light_gray", @@ -265,7 +265,7 @@ "type": "GENERIC", "name": "Fundamentals of Technomancy", "description": "This thick manual instructs the spellcaster on manipulating and empowering various forms of matter and energy.", - "weight": 258, + "weight": "258 g", "volume": "750 ml", "symbol": "?", "color": "light_gray", @@ -276,7 +276,7 @@ "type": "GENERIC", "name": "Complete Idiot's Guide to Technomancy", "description": "This colorful guide, full of diagrams and cartoons, teaches a couple of very basic Technomancy spells for the not-so-bright pupils.", - "weight": 211, + "weight": "211 g", "volume": "500 ml", "symbol": "?", "color": "light_gray", @@ -287,7 +287,7 @@ "type": "GENERIC", "name": "Technomancy and the Electromagnetic Spectrum", "description": "This lab reference material book is thick and overflowing with information on combining magic with EM radiation.", - "weight": 284, + "weight": "284 g", "volume": "1 L", "symbol": "?", "color": "light_gray", @@ -298,7 +298,7 @@ "type": "GENERIC", "name": "Geospatial Systems: The Lie Of Linearity", "description": "This book outlines in great detail how time and space are wibbly-wobbly and non-Euclidean. It also appears to have a dozen different coordinate systems that it uses nearly interchangeably, which makes it hard to follow. There's lots of jargon, but with intense study you can probably learn a thing or two about portals.", - "weight": 1200, + "weight": "1200 g", "volume": "2500 ml", "symbol": "?", "color": "light_blue", @@ -309,7 +309,7 @@ "type": "GENERIC", "name": "Transcendence of the Human Condition", "description": "The Human is the only creature that seeks to improve himself. This study examines different spells that can heighten various senses temporarily, in hopes to discover a more permanent solution.", - "weight": 1300, + "weight": "1300 g", "volume": "2500 ml", "symbol": "?", "color": "yellow", diff --git a/data/mods/Magiclysm/monsters.json b/data/mods/Magiclysm/monsters.json index 9af6f483447ef..d1a4187b75e89 100644 --- a/data/mods/Magiclysm/monsters.json +++ b/data/mods/Magiclysm/monsters.json @@ -8,7 +8,7 @@ "default_faction": "factionless", "species": [ "UNKNOWN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 1, "speed": 150, "symbol": "@", @@ -31,7 +31,7 @@ "looks_like": "longsword", "default_faction": "player", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 30, "speed": 120, "symbol": "/", diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index b6642b31bd8c3..ebcae1cd23a11 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -66,7 +66,7 @@ "description": "A piece of demon spider exoskeleton. It is light and very durable, and probably has some magical properties.", "price": 0, "material": "demon_chitin", - "weight": 89, + "weight": "89 g", "volume": "250 ml", "bashing": 1, "flags": [ "TRADER_AVOID" ], @@ -81,7 +81,7 @@ "name": "demon chitin plate", "price": 15225, "material": "demon_chitin", - "weight": 10000, + "weight": "10 kg", "volume": "4 L", "bashing": 12, "to_hit": -4, @@ -92,7 +92,7 @@ "id": "demon_spider_fang", "name": "demon spider fang", "description": "A fang from a demon spider. It seems to still drip with poison; you might be able to use this in some alchemical recipe?", - "weight": 270, + "weight": "270 g", "to_hit": -2, "color": "green", "symbol": ",", @@ -113,7 +113,7 @@ "material": [ "iflesh", "demon_chitin" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 45, "speed": 150, "symbol": "s", @@ -147,7 +147,7 @@ "species": [ "DEMON_SPIDER" ], "material": [ "iflesh", "demon_chitin" ], "diff": 7, - "weight": 125000, + "weight": "125 kg", "//": "monster can't be any bigger because of limits of volume on tiles. if there is a way designed around this, it should be about 3500 L", "volume": "1000 L", "hp": 435, @@ -213,7 +213,7 @@ "name": "demon spider queen", "description": "This gigantic spider is the size of a moving van: you have no idea how it manages to stay together, much less move with that bulk. Its abdomen is huge and swollen-looking, and an evil intelligence burns in its eyes even as magic crackles around its chitinous barbs.", "copy-from": "mon_demon_spider", - "weight": 250000, + "weight": "250 kg", "hp": 5600, "speed": 28, "aggression": 100, diff --git a/data/mods/Magiclysm/monsters/dragon.json b/data/mods/Magiclysm/monsters/dragon.json index 92efab6836ddd..491d65f515bef 100644 --- a/data/mods/Magiclysm/monsters/dragon.json +++ b/data/mods/Magiclysm/monsters/dragon.json @@ -75,7 +75,7 @@ "bodytype": "angel", "species": [ "DRAGON" ], "volume": "80 L", - "weight": 65000, + "weight": "65 kg", "hp": 180, "speed": 150, "material": [ "flesh" ], @@ -123,7 +123,7 @@ "copy-from": "mon_dragon_black_wyrmling", "//": "should be roughly 4000 L, as that's the size of a large cow.", "volume": "1000 L", - "weight": 1000000, + "weight": "1000 kg", "hp": 1200, "melee_skill": 5, "melee_dice": 3, @@ -144,7 +144,7 @@ "description": "A black-scaled monstrosity with deep-set eye sockets glowing green with evil. Its face and skull appear skeletal, and acid drips from its dagger-like jaws.", "copy-from": "mon_dragon_black_young", "//": "If it were possible, the adult would be about double the size of a young version or so.", - "weight": 2200000, + "weight": "2200 kg", "hp": 3500, "melee_dice": 4, "melee_dice_sides": 12, diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index f851d8cd45cef..f9076f9f62f0f 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -8,7 +8,7 @@ "bodytype": "bear", "species": [ "MAGICAL_BEAST" ], "volume": "450000 ml", - "weight": 450000, + "weight": "450 kg", "hp": 260, "speed": 120, "material": [ "flesh" ], @@ -43,7 +43,7 @@ "species": [ "BLOB" ], "diff": 1, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "color": "dark_gray", "hp": 100, "speed": 75, @@ -84,7 +84,7 @@ "default_faction": "magical_beast", "species": [ "MAGICAL_BEAST", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 100, "aggression": 30, @@ -114,7 +114,7 @@ "name": "owlbear cub", "copy-from": "mon_owlbear", "volume": "112500 ml", - "weight": 112500, + "weight": "112500 g", "hp": 75, "speed": 90, "symbol": "w", @@ -137,7 +137,7 @@ "bodytype": "bear", "species": [ "MAGICAL_BEAST" ], "volume": "850000 ml", - "weight": 900000, + "weight": "900 kg", "hp": 320, "speed": 100, "material": [ "arcane_skin" ], @@ -179,7 +179,7 @@ "bodytype": "blob", "species": [ "MAGICAL_BEAST" ], "volume": "1500 ml", - "weight": 136, + "weight": "136 g", "hp": 20, "speed": 160, "luminance": 16, @@ -221,7 +221,7 @@ "bodytype": "human", "species": [ "MAGICAL_BEAST" ], "volume": "875000 ml", - "weight": 875000, + "weight": "875 kg", "hp": 480, "speed": 110, "material": [ "flesh" ], @@ -252,7 +252,7 @@ "species": [ "MAGICAL_BEAST" ], "diff": 2, "volume": "1000 ml", - "weight": 1250, + "weight": "1250 g", "hp": 20, "speed": 133, "material": [ "iflesh" ], @@ -282,7 +282,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 25, "speed": 100, "material": [ "veggy" ], @@ -310,7 +310,7 @@ "species": [ "MAGICAL_BEAST" ], "diff": 2, "volume": "62500 ml", - "weight": 45000, + "weight": "45 kg", "hp": 20, "speed": 50, "material": [ "flesh" ], diff --git a/data/mods/Medieval_Stuff/handloaded_bullets.json b/data/mods/Medieval_Stuff/handloaded_bullets.json index c8b050cdfe93c..f3c8e6e6e3d5d 100644 --- a/data/mods/Medieval_Stuff/handloaded_bullets.json +++ b/data/mods/Medieval_Stuff/handloaded_bullets.json @@ -4,7 +4,7 @@ "type": "AMMO", "name": "fire lance charge", "description": "Little more than a charge of gunpowder for a basic firearm. Despite the minimal range, it packs a punch.", - "weight": 4, + "weight": "4 g", "volume": "250 ml", "price": 4500, "bashing": 1, @@ -25,7 +25,7 @@ "type": "AMMO", "name": "fire lance shot", "description": "Little more than a charge of gunpowder for a basic firearm, with small pellets as shot. Despite the minimal range, it packs a punch.", - "weight": 5, + "weight": "5 g", "volume": "250 ml", "price": 4500, "bashing": 1, diff --git a/data/mods/Medieval_Stuff/ranged.json b/data/mods/Medieval_Stuff/ranged.json index 6316a3c771b43..d6686998d1d6c 100644 --- a/data/mods/Medieval_Stuff/ranged.json +++ b/data/mods/Medieval_Stuff/ranged.json @@ -4,7 +4,7 @@ "type": "GUN", "name": "fire lance", "description": "An ancient Chinese spear, with a small tube attached for a charge of gunpowder. While it has an extremely short range, it gives a powerful edge in close combat.", - "weight": 1538, + "weight": "1538 g", "volume": "3 L", "price": 95000, "to_hit": 1, diff --git a/data/mods/Medieval_Stuff/shields.json b/data/mods/Medieval_Stuff/shields.json index 0bc1f780d57a9..7dc288ec894be 100644 --- a/data/mods/Medieval_Stuff/shields.json +++ b/data/mods/Medieval_Stuff/shields.json @@ -5,7 +5,7 @@ "name": "wooden shield", "category": "armor", "description": "A crude wooden shield, lacking any metal or leather reinforcement. Lightweight but not very tough.", - "weight": 2267, + "weight": "2267 g", "volume": "3750 ml", "price": 80000, "to_hit": -1, @@ -26,7 +26,7 @@ "name": "large wooden shield", "category": "armor", "description": "An ancient style of wooden shield, lacking any metal or leather reinforcement. Bulky, but offers a decent amount of protection.", - "weight": 3828, + "weight": "3828 g", "volume": "5 L", "price": 90000, "to_hit": -1, @@ -48,7 +48,7 @@ "category": "armor", "//": "Doesn't use leather in material because it's not meant to be sewn up", "description": "A medieval style of shield made of wood overlaid with leather, developed from the longer kite shield. Mainly used in tournaments, but still viable in battle.", - "weight": 3175, + "weight": "3175 g", "volume": "4 L", "price": 90000, "bashing": 4, @@ -69,7 +69,7 @@ "category": "armor", "//": "Doesn't use leather in material because it's not meant to be sewn up", "description": "A classic medieval style of shield, made of wood overlaid with leather, in an elongated teardrop shape. Affords decent protection, but was better suited for cavalry.", - "weight": 3628, + "weight": "3628 g", "volume": "5 L", "price": 120000, "to_hit": -1, @@ -90,7 +90,7 @@ "name": "round shield", "category": "armor", "description": "A simple round shield made of wood, with a rim and boss of iron. Made infamous by the Vikings.", - "weight": 3400, + "weight": "3400 g", "volume": "4 L", "price": 110000, "bashing": 8, @@ -110,7 +110,7 @@ "name": "hoplon", "category": "armor", "description": "A convex round shield from ancient Greece, made of wood reinforced with bronze. Heavy but effective.", - "weight": 4082, + "weight": "4082 g", "volume": "4500 ml", "price": 120000, "to_hit": -1, @@ -132,7 +132,7 @@ "name_plural": "scuta", "category": "armor", "description": "A rectangular shield from ancient Rome, made of wood and iron. Perfect for fighting in formation, but not ideal for facing zombies alone.", - "weight": 4535, + "weight": "4535 g", "volume": "5500 ml", "price": 125000, "to_hit": -1, @@ -153,7 +153,7 @@ "name": "buckler", "category": "armor", "description": "A small metal shield from the late medieval and renaissance periods. Extremely light and tough, but its small size is as much a hindrance as it is an advantage.", - "weight": 1814, + "weight": "1814 g", "volume": "2500 ml", "price": 140000, "bashing": 8, diff --git a/data/mods/Medieval_Stuff/tools.json b/data/mods/Medieval_Stuff/tools.json index 0a9ccc10f8f04..2f966113fa05a 100644 --- a/data/mods/Medieval_Stuff/tools.json +++ b/data/mods/Medieval_Stuff/tools.json @@ -6,7 +6,7 @@ "name": "Dusk", "//": "Blame Kadian. 3:", "description": "A longsword, made out of a very dark, almost black metal. It seems to hold a greater edge than usual steel blades and feels …more comfortable in the hand. While the blade is made out of this dark metal, the crossguard and the pommel seem to be made out of a brighter material, which feels abnormally cool to the touch.", - "weight": 2653, + "weight": "2653 g", "volume": "2750 ml", "price": 260000, "to_hit": 2, diff --git a/data/mods/Modular_Turrets/corpses.json b/data/mods/Modular_Turrets/corpses.json index 0badab36a3d67..858120933004b 100644 --- a/data/mods/Modular_Turrets/corpses.json +++ b/data/mods/Modular_Turrets/corpses.json @@ -11,7 +11,7 @@ "price": 50000, "price_postapoc": 10000, "material": [ "steel", "plastic" ], - "weight": 1507, + "weight": "1507 g", "volume": "3 L", "to_hit": -3, "bashing": 8, @@ -253,7 +253,7 @@ "price": 9000, "price_postapoc": 1000, "material": [ "aluminum", "plastic" ], - "weight": 5400, + "weight": "5400 g", "volume": "750 ml", "bashing": 6, "cutting": 6, @@ -335,7 +335,7 @@ "description": "A broken eyebot. Much less threatening now that it won't be calling for backup. Could be gutted for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 31520, + "weight": "31520 g", "volume": "15 L", "bashing": 6, "cutting": 6, @@ -353,7 +353,7 @@ "description": "A broken eyebot, now dark and motionless. Could be stripped down for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 31520, + "weight": "31520 g", "volume": "15 L", "bashing": 6, "cutting": 6, @@ -377,7 +377,7 @@ "category": "other", "description": "A broken utility robot, now limp and unmoving. Could be gutted for parts or crafted into a salvaged robot.", "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "bashing": 6, "cutting": 6, @@ -402,7 +402,7 @@ "description": "A broken skitterbot. Its internal weapon modules have been removed. Could be gutted for parts or crafted into a salvaged robot.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 62650, + "weight": "62650 g", "volume": "30 L", "bashing": 4, "cutting": 4, @@ -429,7 +429,7 @@ "price": 30000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "bashing": 6, "cutting": 6, @@ -479,7 +479,7 @@ "price": 20000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 170200, + "weight": "170200 g", "volume": "62500 ml", "bashing": 6, "cutting": 10, @@ -496,7 +496,7 @@ "description": "A broken chickenwalker. Could be stripped for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 430000, + "weight": "430 kg", "volume": "187500 ml", "bashing": 10, "cutting": 6, @@ -514,7 +514,7 @@ "description": "A broken chickenwalker. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 430000, + "weight": "430 kg", "volume": "187500 ml", "bashing": 10, "cutting": 6, @@ -531,7 +531,7 @@ "description": "A broken tank drone. Could be stripped down for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 1223850, + "weight": "1223850 g", "volume": "875 L", "bashing": 20, "cutting": 15, @@ -549,7 +549,7 @@ "description": "A broken tank drone. Could be gutted for parts or recrafted into a salvaged robot.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 1223850, + "weight": "1223850 g", "volume": "875 L", "bashing": 20, "cutting": 15, diff --git a/data/mods/Modular_Turrets/items.json b/data/mods/Modular_Turrets/items.json index f732d8fef4cae..e2acab25e34ce 100644 --- a/data/mods/Modular_Turrets/items.json +++ b/data/mods/Modular_Turrets/items.json @@ -5,7 +5,7 @@ "category": "tools", "name": "electrohack", "description": "This device has many ports attached, allowing it to connect to almost any control panel or other electronic machine (but not computers). With a little skill, it can be used to crack passwords and more. It requires 25 charges of battery power per use.", - "weight": 114, + "weight": "114 g", "volume": "500 ml", "price": 40000, "price_postapoc": 10000, @@ -37,7 +37,7 @@ "category": "spare_parts", "name": "robot component", "description": "A component for turrets and robots. It is unuseable in its current state.", - "weight": 3000, + "weight": "3 kg", "volume": "2 L", "price": 1000, "price_postapoc": 1000, @@ -174,7 +174,7 @@ "abstract": "bot_turret_base", "type": "TOOL", "name": "inactive turret", - "weight": 1507, + "weight": "1507 g", "volume": "3 L", "to_hit": -3, "bashing": 8, @@ -623,7 +623,7 @@ "category": "other", "name": "garden gnome", "description": "A normal and completely harmless garden gnome. You can place him in your garden or elsewhere.", - "weight": 650, + "weight": "650 g", "volume": "500 ml", "price": 1000, "to_hit": -3, diff --git a/data/mods/Modular_Turrets/roboguns.json b/data/mods/Modular_Turrets/roboguns.json index fab46a32395e3..cd39c917b45ba 100644 --- a/data/mods/Modular_Turrets/roboguns.json +++ b/data/mods/Modular_Turrets/roboguns.json @@ -8,7 +8,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "magenta", - "weight": 5000, + "weight": "5 kg", "volume": "2500 ml", "price": 0, "durability": 10, diff --git a/data/mods/More_Survival_Tools/ammo.json b/data/mods/More_Survival_Tools/ammo.json index 7aa8f12ab5744..4b24b7e1bd433 100644 --- a/data/mods/More_Survival_Tools/ammo.json +++ b/data/mods/More_Survival_Tools/ammo.json @@ -4,7 +4,7 @@ "type": "AMMO", "name": "lead pellet", "description": "Hefty round projectiles cast from lead, useful as ammunition for slings.", - "weight": 12, + "weight": "12 g", "volume": "250 ml", "price": 100, "bashing": 1, diff --git a/data/mods/More_Survival_Tools/armor.json b/data/mods/More_Survival_Tools/armor.json index b8f637d556aa7..eb9bb1ec906ee 100644 --- a/data/mods/More_Survival_Tools/armor.json +++ b/data/mods/More_Survival_Tools/armor.json @@ -4,7 +4,7 @@ "type": "ARMOR", "name": "hooded hat", "description": "A proper wide-brimmed hat, modified by the addition of a hood sewn to it, to better protect the neck from wind and rain.", - "weight": 126, + "weight": "126 g", "volume": "500 ml", "price": 1200, "material": [ "cotton" ], diff --git a/data/mods/More_Survival_Tools/items.json b/data/mods/More_Survival_Tools/items.json index 49ea813fc59e8..faabd7d538807 100644 --- a/data/mods/More_Survival_Tools/items.json +++ b/data/mods/More_Survival_Tools/items.json @@ -4,7 +4,7 @@ "type": "GUN", "name": "atlatl", "description": "A wooden tool for supporting a javelin, to throw it more effectively than by hand.", - "weight": 116, + "weight": "116 g", "volume": "250 ml", "price": 500, "to_hit": -1, @@ -106,7 +106,7 @@ "name": "small batch of curdling milk", "name_plural": "small batches of curdling milk", "description": "A sealed small waterskin filled with milk that is undergoing the process to become a crude form of cheese, having had vinegar and natural rennet added.", - "weight": 1870, + "weight": "1870 g", "volume": "1750 ml", "price": 2000, "to_hit": -1, @@ -132,7 +132,7 @@ "name": "batch of curdling milk", "name_plural": "batches of curdling milk", "description": "A sealed waterskin filled with milk that is undergoing the process to become a crude form of cheese, having had vinegar and natural rennet added.", - "weight": 3617, + "weight": "3617 g", "volume": "3500 ml", "price": 4000, "to_hit": -1, @@ -158,7 +158,7 @@ "name": "large batch of curdling milk", "name_plural": "large batches of curdling milk", "description": "A sealed large waterskin filled with milk that is undergoing the process to become a crude form of cheese, having had vinegar and natural rennet added.", - "weight": 5241, + "weight": "5241 g", "volume": "5250 ml", "price": 6000, "to_hit": -1, @@ -184,7 +184,7 @@ "name": "aluminum foil wrap", "//": "Dummied out way back when.", "description": "A half crumpled sheet of aluminum foil, used for cooking and baking.", - "weight": 5, + "weight": "5 g", "volume": 0, "price": 0, "to_hit": -2, @@ -200,7 +200,7 @@ "type": "GUN", "name": "makeshift crossbow", "description": "A simple, handmade crossbow of the Skane style, with a wooden peg that is pushed up from underneath to loose the bowstring. Not as powerful as other crossbow designs, but it is easier to draw the bow back. Bolts fired from this weapon have a good chance of remaining intact for re-use.", - "weight": 5456, + "weight": "5456 g", "volume": "1 L", "price": 1380, "bashing": 7, @@ -223,7 +223,7 @@ "type": "TOOL", "name": "heavy snare kit", "description": "This is a kit for a simple trap consisting of a rope noose and a snare trigger. It requires a tree nearby. It is effective at trapping monsters.", - "weight": 1066, + "weight": "1066 g", "volume": "250 ml", "price": 250, "cutting": 10, @@ -244,7 +244,7 @@ "type": "TOOL", "name": "light snare kit", "description": "This is a kit for a simple trap consisting of a string noose and a snare trigger. It requires a young tree nearby. It is effective at trapping and killing some small animals.", - "weight": 886, + "weight": "886 g", "volume": "250 ml", "price": 100, "cutting": 6, @@ -265,7 +265,7 @@ "type": "TOOL", "name": "snare trigger", "description": "This is a stick that has been cut into a trigger mechanism for a snare trap.", - "weight": 850, + "weight": "850 g", "volume": "250 ml", "price": 0, "to_hit": -1, diff --git a/data/mods/My_Sweet_Cataclysm/sweet_monsters.json b/data/mods/My_Sweet_Cataclysm/sweet_monsters.json index 65a44d920fffb..e17dadcaa7ea9 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_monsters.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_monsters.json @@ -9,7 +9,7 @@ "bodytype": "dog", "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], - "weight": 2000, + "weight": "2 kg", "hp": 8, "speed": 150, "material": [ "junk" ], diff --git a/data/mods/NW_Pack/nw_archery.json b/data/mods/NW_Pack/nw_archery.json index debdd516c436a..0c80c6e24cbc4 100644 --- a/data/mods/NW_Pack/nw_archery.json +++ b/data/mods/NW_Pack/nw_archery.json @@ -7,7 +7,7 @@ "description": "This is a replica of the bow possessed by Odin, Ichaival, which is rumored to fire 10 arrows with every pull of the string. It has gold and silver ornaments on it.", "price": 160000, "material": [ "wood", "gold" ], - "weight": 740, + "weight": "740 g", "volume": "1750 ml", "bashing": 14, "ranged_damage": 18, diff --git a/data/mods/NW_Pack/nw_books.json b/data/mods/NW_Pack/nw_books.json index 25b9e0059bbf9..196d3265e47e9 100644 --- a/data/mods/NW_Pack/nw_books.json +++ b/data/mods/NW_Pack/nw_books.json @@ -6,7 +6,7 @@ "name_plural": "The Weapons of Asgard", "max_level": 10, "description": "This book is about creating replicas of the weapons used by the Norse Gods, such as the well-known Mjölnir. It is well illustrated with lots of pictures.", - "weight": 654, + "weight": "654 g", "color": "blue", "intelligence": 9, "symbol": "?", diff --git a/data/mods/NW_Pack/nw_melee.json b/data/mods/NW_Pack/nw_melee.json index 7940881de8807..53fdc1916f9dc 100644 --- a/data/mods/NW_Pack/nw_melee.json +++ b/data/mods/NW_Pack/nw_melee.json @@ -5,7 +5,7 @@ "type": "GENERIC", "name": "Mjölnir", "description": "A replica of Mjölnir, the hammer of Thor. It is rumored to be able to level mountains with a single blow. It is decorated with gold and silver ornaments.", - "weight": 1731, + "weight": "1731 g", "color": "light_gray", "material": [ "iron", "wood", "gold" ], "bashing": 27, @@ -17,7 +17,7 @@ "type": "GENERIC", "name": "Gungnir", "description": "A replica of Gungnir, the spear of Odin. It is rumored to be the perfect spear, perfectly hitting any target regardless of the wielder's strength or skill. It is decorated with gold and silver ornaments.", - "weight": 1854, + "weight": "1854 g", "material": [ "steel", "wood", "gold" ], "techniques": [ "WBLOCK_1", "IMPALE" ], "volume": "3250 ml", @@ -33,7 +33,7 @@ "price": 160000, "material": [ "steel", "gold" ], "techniques": "WBLOCK_2", - "weight": 1860, + "weight": "1860 g", "bashing": 17, "cutting": 33 } diff --git a/data/mods/Salvaged_Robots/corpses.json b/data/mods/Salvaged_Robots/corpses.json index 02bf3576469f6..72d866dc13acf 100644 --- a/data/mods/Salvaged_Robots/corpses.json +++ b/data/mods/Salvaged_Robots/corpses.json @@ -9,7 +9,7 @@ "category": "other", "description": "A broken set of power armor fitted with an AI core for automated use. It cannot be worn or disassembled until re-crafted into an undamaged robot.", "material": [ "superalloy", "plastic" ], - "weight": 9310, + "weight": "9310 g", "volume": "55 L", "bashing": 6, "cutting": 6, @@ -23,7 +23,7 @@ "looks_like": "power_armor_basic", "name": "broken basic auto armor", "description": "A broken set of power armor fitted with an AI core for automated use. It cannot be worn or disassembled until re-crafted into an undamaged robot.", - "weight": 28010, + "weight": "28010 g", "volume": "75 L", "flags": [ "TRADER_AVOID" ] }, @@ -35,7 +35,7 @@ "category": "other", "looks_like": "power_armor_heavy", "description": "A broken set of power armor fitted with an AI core for automated use. It cannot be worn or disassembled until re-crafted into an undamaged robot.", - "weight": 30650, + "weight": "30650 g", "volume": "87500 ml", "flags": [ "TRADER_AVOID" ] }, @@ -49,7 +49,7 @@ "category": "other", "description": "A broken repair robot, now limp and unmoving. Could be gutted for parts or re-crafted into a functioning pal.", "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "bashing": 6, "cutting": 6, @@ -192,7 +192,7 @@ "price": 30000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "bashing": 6, "cutting": 6, @@ -239,7 +239,7 @@ "category": "other", "description": "A broken cyborg, now limp and unmoving. Could be gutted for parts or crafted into a salvaged robot.", "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "bashing": 6, "cutting": 6, @@ -255,7 +255,7 @@ "category": "other", "description": "A broken cyborg, now limp and unmoving. Could be stripped down or re-crafted into a salvaged robot.", "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "bashing": 6, "cutting": 6, @@ -346,7 +346,7 @@ "price": 30000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "bashing": 6, "cutting": 6, @@ -461,7 +461,7 @@ "price": 30000, "price_postapoc": 1000, "material": [ "superalloy", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "bashing": 6, "cutting": 6, @@ -575,7 +575,7 @@ "price": 20000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 170200, + "weight": "170200 g", "volume": "62500 ml", "bashing": 6, "cutting": 10, @@ -592,7 +592,7 @@ "description": "A broken tribot. Now that its legs lie broken and immobile, the world seems a little less threatening. Could be gutted for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 430000, + "weight": "430 kg", "volume": "187500 ml", "bashing": 10, "cutting": 6, diff --git a/data/mods/Salvaged_Robots/items.json b/data/mods/Salvaged_Robots/items.json index 79decba6bfed4..cd8337200ddcf 100644 --- a/data/mods/Salvaged_Robots/items.json +++ b/data/mods/Salvaged_Robots/items.json @@ -4,7 +4,7 @@ "id": "necro_head", "category": "other", "name": "necrotic head", - "weight": 760, + "weight": "760 g", "color": "dark_gray", "looks_like": "etched_skull", "spoils_in": 24, @@ -29,7 +29,7 @@ "comestible_type": "FOOD", "price": 10000, "price_postapoc": 10000, - "weight": 250, + "weight": "250 g", "volume": "250 ml", "symbol": "%", "color": "light_green", @@ -49,7 +49,7 @@ "description": "Honey, that stuff bees make.", "price": 800, "material": "honey", - "weight": 63, + "weight": "63 g", "volume": "250 ml", "comestible_type": "DRINK", "quench": 2, @@ -65,7 +65,7 @@ "name": "Hacking Robots for Fun & Profit", "name_plural": "Hacking Robots for Fun & Profit", "description": "A book on illegally obtaining, reprogramming, and modifying robots. It has lots of helpful step-by-step guides and example blueprints.", - "weight": 2063, + "weight": "2063 g", "volume": "2 L", "price": 1000, "price_postapoc": 1000, @@ -86,7 +86,7 @@ "name": "Popular Robotics", "name_plural": "Popular Robotics", "description": "A magazine about building and altering your own robots.", - "weight": 45, + "weight": "45 g", "volume": "250 ml", "price": 450, "price_postapoc": 100, @@ -143,7 +143,7 @@ "price": 1000000, "price_postapoc": 1000000, "material": [ "superalloy", "plastic" ], - "weight": 19310, + "weight": "19310 g", "volume": "55 L", "bashing": 8, "to_hit": -3, @@ -212,7 +212,7 @@ "price": 0, "price_postapoc": 0, "material": [ "superalloy", "plastic" ], - "weight": 9310, + "weight": "9310 g", "volume": "55 L", "bashing": 6, "cutting": 6, @@ -226,7 +226,7 @@ "looks_like": "power_armor_basic", "name": "basic auto armor", "description": "A set of light power armor fitted with an AI core for automated use. Activate it to deploy the robot or disassemble it to use as armor.", - "weight": 28010, + "weight": "28010 g", "volume": "75 L", "use_action": { "type": "place_monster", "monster_id": "mon_autoarmor_basic", "moves": 100 } }, @@ -238,7 +238,7 @@ "name": "heavy auto armor", "category": "other", "description": "A set of light power armor fitted with an AI core for automated use. Activate it to deploy the robot or disassemble it to use as armor.", - "weight": 30650, + "weight": "30650 g", "volume": "87500 ml", "use_action": { "type": "place_monster", "monster_id": "mon_autoarmor_light", "moves": 100 } }, @@ -247,7 +247,7 @@ "type": "TOOL", "name": "inactive hack", "description": "This is an inactive manhack. Manhacks are fist-sized robots that fly through the air. They are covered with whirring blades and attack by throwing themselves against their target. Use this item to reprogram and activate the manhack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.", - "weight": 5400, + "weight": "5400 g", "volume": "750 ml", "price": 10000, "price_postapoc": 10000, @@ -363,7 +363,7 @@ "price": 10000, "price_postapoc": 10000, "material": [ "steel", "plastic" ], - "weight": 62650, + "weight": "62650 g", "volume": "30 L", "bashing": 4, "cutting": 4, @@ -427,7 +427,7 @@ "looks_like": "mon_cleanerbot", "price": 10000, "price_postapoc": 10000, - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "to_hit": -3, "bashing": 8, @@ -506,7 +506,7 @@ "looks_like": "mon_tripod", "name": "inactive medibot", "material": [ "steel", "plastic" ], - "weight": 70000, + "weight": "70 kg", "volume": "50 L", "price": 10000, "price_postapoc": 10000, @@ -571,7 +571,7 @@ "name": "inactive skitterbot", "looks_like": "broken_skitterbot", "material": [ "steel", "plastic" ], - "weight": 62650, + "weight": "62650 g", "volume": "30 L", "price": 10000, "price_postapoc": 10000, @@ -634,7 +634,7 @@ "type": "TOOL", "name": "inactive cyborg", "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, @@ -666,7 +666,7 @@ "name": "inactive defense robot", "looks_like": "mon_riotbot", "material": [ "steel", "plastic" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, @@ -730,7 +730,7 @@ "name": "inactive military robot", "looks_like": "mon_secubot", "material": [ "steel", "kevlar" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, @@ -827,7 +827,7 @@ "name": "inactive advanced robot", "looks_like": "mon_copbot", "material": [ "superalloy", "plastic" ], - "weight": 120000, + "weight": "120 kg", "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, @@ -874,7 +874,7 @@ "name": "inactive chickenwalker", "looks_like": "mon_chickenbot", "material": [ "steel", "kevlar" ], - "weight": 140000, + "weight": "140 kg", "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, @@ -938,7 +938,7 @@ "name": "inactive tankbot", "looks_like": "mon_tankbot", "material": [ "steel", "kevlar" ], - "weight": 120000, + "weight": "120 kg", "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, diff --git a/data/mods/Salvaged_Robots/robot_additions/40mm.json b/data/mods/Salvaged_Robots/robot_additions/40mm.json index c51bdbcbc5cf1..65f252affd2d0 100644 --- a/data/mods/Salvaged_Robots/robot_additions/40mm.json +++ b/data/mods/Salvaged_Robots/robot_additions/40mm.json @@ -5,7 +5,7 @@ "name": "40mm EMP grenade", "name_plural": "40mm EMP grenades", "description": "A 40mm grenade with an EMP charge. It will release an electromagnetic pulse capable of damaging robots and some equipment.", - "weight": 230, + "weight": "230 g", "volume": "250 ml", "price": 40000, "material": [ "steel", "powder" ], @@ -28,7 +28,7 @@ "category": "weapons", "name": "active EMP grenade", "description": "This EMP grenade is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy. You may not want to be holding it much longer.", - "weight": 400, + "weight": "400 g", "volume": "250 ml", "price": 0, "to_hit": -1, diff --git a/data/mods/Salvaged_Robots/robot_additions/items.json b/data/mods/Salvaged_Robots/robot_additions/items.json index f95c94e4b5d1e..53b1ad1d4e380 100644 --- a/data/mods/Salvaged_Robots/robot_additions/items.json +++ b/data/mods/Salvaged_Robots/robot_additions/items.json @@ -4,7 +4,7 @@ "type": "GENERIC", "name": "robot carrier", "description": "A heavy frame outfitted with tie-downs and attachment points for carrying cargo, with additional railings to keep a large machine in place. It is meant to hold large drones and robots for transport. Use it on a suitable robot to capture, use it on an empty tile to release.", - "weight": 96000, + "weight": "96 kg", "volume": "62500 ml", "price": 48000, "category": "veh_parts", @@ -27,7 +27,7 @@ "description": "A small plastic ball filled with glowing chemicals.", "material": "plastic", "volume": "250 ml", - "weight": 1, + "weight": "1 g", "to_hit": -3, "bashing": 1, "initial_charges": 40, diff --git a/data/mods/Salvaged_Robots/robot_additions/paintball.json b/data/mods/Salvaged_Robots/robot_additions/paintball.json index aa1c3124d8258..fa18858613b90 100644 --- a/data/mods/Salvaged_Robots/robot_additions/paintball.json +++ b/data/mods/Salvaged_Robots/robot_additions/paintball.json @@ -9,7 +9,7 @@ "description": "A tube of small glowballs taken off the market due to hazardous chemicals. They deal virtually no damage, but light up on impact. Useful for illuminating an area without lighting up yourself in the process.", "material": "plastic", "volume": "250 ml", - "weight": 1, + "weight": "1 g", "ammo_type": "paintball", "damage": 2, "dispersion": 100, diff --git a/data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_first_01.json b/data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_first_01.json index 1f0ad8b6af276..442648501ba2c 100644 --- a/data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_first_01.json +++ b/data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_first_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "robot_dispatch_first", - "weight": 250, + "weight": "250 g", "method": "json", "object": { "fill_ter": "t_thconc_floor", diff --git a/data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_second_01.json b/data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_second_01.json index ef0026a5d8279..24ad903350989 100644 --- a/data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_second_01.json +++ b/data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_second_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "robot_dispatch_second", - "weight": 250, + "weight": "250 g", "method": "json", "object": { "fill_ter": "t_thconc_floor", diff --git a/data/mods/Sleep_Deprivation/items/comestibles/med.json b/data/mods/Sleep_Deprivation/items/comestibles/med.json index 7845018e50c70..b46ca75e7ea59 100644 --- a/data/mods/Sleep_Deprivation/items/comestibles/med.json +++ b/data/mods/Sleep_Deprivation/items/comestibles/med.json @@ -5,7 +5,7 @@ "comestible_type": "MED", "name": "magnesium tablet", "description": "Over-the-counter magnesium supplements, commonly prescribed to treat sleep deprivation and to mitigate its effects. One tablet a day combined with a good night's sleep will help you recover faster.", - "weight": 1, + "weight": "1 g", "volume": "250 ml", "price": 400, "price_postapoc": 4000, diff --git a/data/mods/Tanks/items.json b/data/mods/Tanks/items.json index be5a279437ca0..c4b2fafc8f548 100644 --- a/data/mods/Tanks/items.json +++ b/data/mods/Tanks/items.json @@ -27,7 +27,7 @@ "copy-from": "ammolink", "type": "GENERIC", "name": "30x113mm autocannon belt linkage", - "weight": 6, + "weight": "6 g", "volume": "10ml", "stackable": true, "use_action": { "type": "ammobelt", "belt": "belt30mm" } @@ -43,7 +43,7 @@ "description": "A 30x113mm autocannon round using a high-explosive, dual-purpose shell. Used primarily against light armored vehicles.", "material": [ "steel", "powder" ], "volume": "1250 ml", - "weight": 350, + "weight": "350 g", "bashing": 1, "ammo_type": "30mm", "casing": "30mm_casing", @@ -68,7 +68,7 @@ "description": "A 30x113mm autocannon round, high explosive incendiary. Designed for use against unarmored vehicles and to suppress infantry.", "material": [ "steel", "powder" ], "volume": "1250 ml", - "weight": 380, + "weight": "380 g", "bashing": 1, "ammo_type": "30mm", "casing": "30mm_casing", @@ -93,7 +93,7 @@ "description": "A 30x113mm autocannon round with its primer replaced, and loaded with a basic lead projectile. Not as effective as the real thing.", "material": [ "steel", "powder" ], "volume": "1250 ml", - "weight": 380, + "weight": "380 g", "bashing": 1, "ammo_type": "30mm", "casing": "30mm_casing", @@ -115,7 +115,7 @@ "description": "A 120mm High Explosive Anti Tank round. It could ruin anyone's whole day.", "material": [ "steel", "powder" ], "volume": "2500 ml", - "weight": 22500, + "weight": "22500 g", "bashing": 1, "ammo_type": "120mm_usable", "casing": "120mm_casing", @@ -139,7 +139,7 @@ "description": "A 120mm Armor-Piercing Fin-Stabilized Discarding Sabot round. Uses a depleted uranium projectile to give whatever it hits a really bad day.", "material": [ "steel", "powder" ], "volume": "2500 ml", - "weight": 22000, + "weight": "22 kg", "bashing": 1, "ammo_type": "120mm_usable", "casing": "120mm_casing", @@ -161,7 +161,7 @@ "description": "A 120mm shell with a new electric primer installed, filled with a large amount of buckshot. Effectively similar to no-longer-produced canister shot, but of lower quality.", "material": [ "steel", "powder" ], "volume": "2500 ml", - "weight": 15000, + "weight": "15 kg", "bashing": 1, "ammo_type": "120mm_usable", "casing": "120mm_casing", @@ -183,7 +183,7 @@ "description": "A 120mm shell with a new electric primer installed, loaded with a large handmade slug. While hardly ideal, it packs quite a punch.", "material": [ "steel", "powder" ], "volume": "2500 ml", - "weight": 20000, + "weight": "20 kg", "bashing": 1, "ammo_type": "120mm_usable", "casing": "120mm_casing", @@ -205,7 +205,7 @@ "description": "A 155mm High Explosive Anti Tank round. More than enough firepower for whatever you could think to point it at.", "material": [ "steel", "powder" ], "volume": "3750 ml", - "weight": 45000, + "weight": "45 kg", "bashing": 1, "ammo_type": "155mm", "casing": "155mm_casing", @@ -229,7 +229,7 @@ "description": "A 155mm High Explosive Fragmentation round. Designed to give anything near what you hit a really bad day.", "material": [ "steel", "powder" ], "volume": "3750 ml", - "weight": 35000, + "weight": "35 kg", "bashing": 1, "ammo_type": "155mm", "casing": "155mm_casing", @@ -253,7 +253,7 @@ "description": "A 155mm shell with a new electric primer installed, filled with a huge amount of buckshot. Effectively turns a howitzer into a punt gun on steroids.", "material": [ "steel", "powder" ], "volume": "3750 ml", - "weight": 44000, + "weight": "44 kg", "bashing": 1, "ammo_type": "155mm", "casing": "155mm_casing", @@ -275,7 +275,7 @@ "description": "A 155mm shell with a new electric primer installed, filled with a massive handmade slug. Despite the lower effectiveness, whatever it hits is sure to feel it.", "material": [ "steel", "powder" ], "volume": "3750 ml", - "weight": 42500, + "weight": "42500 g", "bashing": 1, "ammo_type": "155mm", "casing": "155mm_casing", @@ -327,7 +327,7 @@ "description": "Primer for an autocannon shell. Seems to use an electric ignition.", "material": [ "steel", "powder" ], "volume": "250 ml", - "weight": 40, + "weight": "40 g", "ammo_type": "components", "count": 10, "effects": [ "COOKOFF" ] @@ -343,7 +343,7 @@ "description": "Primer for a tank or artillery shell. Seems to use an electric ignition.", "material": [ "steel", "powder" ], "volume": "250 ml", - "weight": 250, + "weight": "250 g", "ammo_type": "components", "count": 5, "effects": [ "COOKOFF" ] @@ -361,7 +361,7 @@ "flags": [ "NO_RELOAD", "MOUNTED_GUN" ], "skill": "launcher", "ammo": "30mm", - "weight": 200000, + "weight": "200 kg", "volume": "7500 ml", "bashing": 12, "to_hit": -1, @@ -385,7 +385,7 @@ "flags": [ "NEVER_JAMS", "NO_RELOAD", "MOUNTED_GUN" ], "skill": "launcher", "ammo": "120mm_usable", - "weight": 3000000, + "weight": "3000 kg", "volume": "8750 ml", "bashing": 12, "to_hit": -6, @@ -408,7 +408,7 @@ "material": "hardsteel", "skill": "launcher", "ammo": "120mm_usable", - "weight": 3300000, + "weight": "3300 kg", "volume": "10 L", "bashing": 12, "to_hit": -6, @@ -432,7 +432,7 @@ "material": "hardsteel", "skill": "launcher", "ammo": "120mm_usable", - "weight": 3500000, + "weight": "3500 kg", "volume": "11250 ml", "bashing": 12, "to_hit": -6, @@ -457,7 +457,7 @@ "flags": [ "NEVER_JAMS", "NO_RELOAD", "MOUNTED_GUN" ], "skill": "launcher", "ammo": "155mm", - "weight": 4300000, + "weight": "4300 kg", "volume": "10 L", "bashing": 13, "to_hit": -6, @@ -480,7 +480,7 @@ "material": "hardsteel", "skill": "launcher", "ammo": "atgm", - "weight": 600000, + "weight": "600 kg", "volume": "10 L", "bashing": 12, "to_hit": -6, @@ -499,7 +499,7 @@ "name_plural": "copies of Artillery and Field Gunnery", "max_level": 6, "description": "A textbook on the history of modern artillery, with a number of illustrations and excerpts from various field manuals. A competent handloader or mechanic might find additional uses for the more technical parts of the text.", - "weight": 1120, + "weight": "1120 g", "color": "green", "intelligence": 8, "symbol": "?", diff --git a/data/mods/Tolerate_This/comestibles.json b/data/mods/Tolerate_This/comestibles.json index 3df3998a9176c..6924b8be81390 100644 --- a/data/mods/Tolerate_This/comestibles.json +++ b/data/mods/Tolerate_This/comestibles.json @@ -4,7 +4,7 @@ "id": "gffish_sandwich", "name": "gluten free fish sandwich", "name_plural": "gluten free fish sandwiches", - "weight": 222, + "weight": "222 g", "color": "yellow", "spoils_in": 24, "container": "wrapper", @@ -24,7 +24,7 @@ "id": "gfsandwich_veggy", "name": "gluten free vegetable sandwich", "name_plural": "gluten free vegetable sandwiches", - "weight": 190, + "weight": "190 g", "color": "light_gray", "spoils_in": 48, "container": "wrapper", @@ -45,7 +45,7 @@ "type": "COMESTIBLE", "id": "gfgranola", "name": "gluten free granola", - "weight": 86, + "weight": "86 g", "color": "brown", "spoils_in": 4320, "container": "bag_plastic", @@ -66,7 +66,7 @@ "id": "gfsandwich_t", "name": "gluten free meat sandwich", "name_plural": "gluten free meat sandwiches", - "weight": 186, + "weight": "186 g", "color": "light_gray", "spoils_in": 36, "container": "wrapper", @@ -85,7 +85,7 @@ "id": "gfsandwich_pb", "name": "gluten free peanut butter sandwich", "name_plural": "gluten free peanut butter sandwiches", - "weight": 186, + "weight": "186 g", "color": "brown", "spoils_in": 36, "container": "wrapper", @@ -104,7 +104,7 @@ "id": "gfsandwich_pbj", "name": "gluten free PB&J sandwich", "name_plural": "gluten free PB&J sandwiches", - "weight": 186, + "weight": "186 g", "color": "brown", "spoils_in": 36, "container": "wrapper", @@ -123,7 +123,7 @@ "id": "gfsandwich_pbh", "name": "gluten free PB&H sandwich", "name_plural": "gluten free PB&H sandwiches", - "weight": 186, + "weight": "186 g", "color": "brown", "spoils_in": 36, "container": "wrapper", @@ -142,7 +142,7 @@ "id": "gfsandwich_pbm", "name": "gluten free PB&M sandwich", "name_plural": "gluten free PB&M sandwiches", - "weight": 186, + "weight": "186 g", "color": "brown", "spoils_in": 36, "container": "wrapper", @@ -160,7 +160,7 @@ "type": "COMESTIBLE", "id": "lfhickory_nut_ambrosia", "name": "lactose free hickory nut ambrosia", - "weight": 254, + "weight": "254 g", "color": "brown", "spoils_in": 259, "container": "bottle_plastic", @@ -181,7 +181,7 @@ "type": "COMESTIBLE", "id": "cornmeal", "name": "cornmeal", - "weight": 37, + "weight": "37 g", "color": "white", "spoils_in": 8640, "container": "box_small", @@ -200,7 +200,7 @@ "type": "COMESTIBLE", "id": "gfjohnnycake", "name": "gluten free johnnycake", - "weight": 46, + "weight": "46 g", "color": "yellow", "spoils_in": 480, "comestible_type": "FOOD", @@ -220,7 +220,7 @@ "id": "gffruit_pancakes", "name": "gluten free fruit pancake", "name_plural": "gluten free fruit pancakes", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -240,7 +240,7 @@ "id": "lffruit_pancakes", "name": "lactose free fruit pancake", "name_plural": "lactose free fruit pancakes", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -260,7 +260,7 @@ "id": "gflffruit_pancakes", "name": "gluten free lactose free fruit pancake", "name_plural": "gluten free lactose free fruit pancakes", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -280,7 +280,7 @@ "id": "gfchoc_pancakes", "name": "gluten free chocolate pancake", "name_plural": "gluten free chocolate pancakes", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -299,7 +299,7 @@ "id": "gffrenchtoast", "name": "gluten free French toast", "name_plural": "gluten free French toasts", - "weight": 246, + "weight": "246 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -319,7 +319,7 @@ "id": "gflffrenchtoast", "name": "gluten free lactose free French toast", "name_plural": "gluten free lactose free French toasts", - "weight": 246, + "weight": "246 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -338,7 +338,7 @@ "type": "COMESTIBLE", "id": "gfbiscuit", "name": "gluten free biscuit", - "weight": 136, + "weight": "136 g", "color": "brown", "spoils_in": 180, "container": "box_small", @@ -358,7 +358,7 @@ "type": "COMESTIBLE", "id": "gfpie", "name": "gluten free fruit pie", - "weight": 252, + "weight": "252 g", "color": "brown", "spoils_in": 72, "stim": 2, @@ -380,7 +380,7 @@ "type": "COMESTIBLE", "id": "gfpie_veggy", "name": "gluten free vegetable pie", - "weight": 252, + "weight": "252 g", "color": "brown", "spoils_in": 72, "container": "box_small", @@ -401,7 +401,7 @@ "type": "COMESTIBLE", "id": "gfpie_meat", "name": "gluten free meat pie", - "weight": 260, + "weight": "260 g", "color": "brown", "spoils_in": 80, "container": "box_small", @@ -422,7 +422,7 @@ "type": "COMESTIBLE", "id": "gfpie_maple", "name": "gluten free maple pie", - "weight": 252, + "weight": "252 g", "color": "brown", "spoils_in": 72, "stim": 2, @@ -444,7 +444,7 @@ "type": "COMESTIBLE", "id": "gfpizza_veggy", "name": "gluten free vegetable pizza", - "weight": 175, + "weight": "175 g", "color": "light_green", "spoils_in": 48, "container": "box_small", @@ -463,7 +463,7 @@ "type": "COMESTIBLE", "id": "gfpizza_cheese", "name": "gluten free cheese pizza", - "weight": 175, + "weight": "175 g", "color": "yellow", "spoils_in": 48, "stim": 1, @@ -483,7 +483,7 @@ "type": "COMESTIBLE", "id": "gfpizza_meat", "name": "gluten free meat pizza", - "weight": 175, + "weight": "175 g", "color": "light_red", "spoils_in": 48, "container": "box_small", @@ -502,7 +502,7 @@ "type": "COMESTIBLE", "id": "gfcheeseburger", "name": "gluten free cheeseburger", - "weight": 340, + "weight": "340 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -522,7 +522,7 @@ "type": "COMESTIBLE", "id": "gfhamburger", "name": "gluten free hamburger", - "weight": 300, + "weight": "300 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -542,7 +542,7 @@ "type": "COMESTIBLE", "id": "gfsloppyjoe", "name": "gluten free sloppy joe", - "weight": 300, + "weight": "300 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -562,7 +562,7 @@ "type": "COMESTIBLE", "id": "gfblt", "name": "gluten free BLT", - "weight": 250, + "weight": "250 g", "color": "brown", "spoils_in": 60, "stim": 1, @@ -584,7 +584,7 @@ "id": "gfsweetbread", "name": "gluten free sweetbread", "name_plural": "gluten free sweetbreads", - "weight": 150, + "weight": "150 g", "color": "brown", "spoils_in": 48, "comestible_type": "FOOD", @@ -605,7 +605,7 @@ "id": "gfsandwich_cheese", "name": "gluten free cheese sandwich", "name_plural": "gluten free cheese sandwiches", - "weight": 187, + "weight": "187 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -624,7 +624,7 @@ "id": "gfsandwich_cheese_grilled", "name": "gluten free grilled cheese sandwich", "name_plural": "gluten free grilled cheese sandwiches", - "weight": 188, + "weight": "188 g", "color": "brown", "spoils_in": 34, "stim": 1, @@ -645,7 +645,7 @@ "id": "gfsandwich_deluxe", "name": "gluten free deluxe sandwich", "name_plural": "gluten free deluxe sandwiches", - "weight": 340, + "weight": "340 g", "color": "brown", "spoils_in": 32, "stim": 1, @@ -667,7 +667,7 @@ "id": "gfsandwich_cucumber", "name": "gluten free cucumber sandwich", "name_plural": "gluten free cucumber sandwiches", - "weight": 187, + "weight": "187 g", "color": "light_green", "spoils_in": 36, "container": "wrapper", @@ -689,7 +689,7 @@ "id": "sandwich_cheese", "name": "cheese sandwich", "name_plural": "cheese sandwiches", - "weight": 187, + "weight": "187 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -708,7 +708,7 @@ "id": "gfsandwich_jam", "name": "gluten free jam sandwich", "name_plural": "gluten free jam sandwiches", - "weight": 189, + "weight": "189 g", "color": "brown", "spoils_in": 37, "container": "wrapper", @@ -727,7 +727,7 @@ "id": "gfsandwich_honey", "name": "gluten free honey sandwich", "name_plural": "gluten free honey sandwiches", - "weight": 189, + "weight": "189 g", "color": "brown", "spoils_in": 240, "container": "wrapper", @@ -747,7 +747,7 @@ "id": "gfsandwich_sauce", "name": "gluten free boring sandwich", "name_plural": "gluten free boring sandwiches", - "weight": 187, + "weight": "187 g", "color": "brown", "spoils_in": 46, "container": "wrapper", @@ -765,7 +765,7 @@ "type": "COMESTIBLE", "id": "gfwaffles", "name": "gluten free waffle", - "weight": 246, + "weight": "246 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", @@ -783,7 +783,7 @@ "type": "COMESTIBLE", "id": "lfwaffles", "name": "lactose free waffle", - "weight": 246, + "weight": "246 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", @@ -801,7 +801,7 @@ "type": "COMESTIBLE", "id": "gflfwaffles", "name": "lactose free waffle", - "weight": 246, + "weight": "246 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", @@ -819,7 +819,7 @@ "type": "COMESTIBLE", "id": "gffruit_waffles", "name": "gluten free fruit waffle", - "weight": 354, + "weight": "354 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", @@ -838,7 +838,7 @@ "type": "COMESTIBLE", "id": "gflffruit_waffles", "name": "gluten free lactose free fruit waffle", - "weight": 354, + "weight": "354 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", @@ -857,7 +857,7 @@ "type": "COMESTIBLE", "id": "gfchoc_waffles", "name": "gluten free chocolate waffle", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -876,7 +876,7 @@ "id": "rice_milk", "name": "rice milk", "name_plural": "rice milk", - "weight": 263, + "weight": "263 g", "color": "white", "spoils_in": 24, "container": "bottle_plastic", @@ -899,7 +899,7 @@ "id": "coconut_water", "name": "coconut water", "name_plural": "coconut water", - "weight": 263, + "weight": "263 g", "color": "white", "spoils_in": 24, "container": "bottle_plastic", @@ -922,7 +922,7 @@ "id": "jar_cream_coconut", "name": "jarred coconut milk", "name_plural": "jarred coconut milk", - "weight": 258, + "weight": "258 g", "color": "white", "spoils_in": 24, "container": "jar_glass", @@ -942,7 +942,7 @@ "id": "rice_flour", "name": "rice flour", "name_plural": "rice flour", - "weight": 45, + "weight": "45 g", "color": "white", "container": "box_small", "comestible_type": "FOOD", diff --git a/data/mods/blazemod/blaze_ammo.json b/data/mods/blazemod/blaze_ammo.json index 0d339e778a4d2..a06d5ea16d89b 100644 --- a/data/mods/blazemod/blaze_ammo.json +++ b/data/mods/blazemod/blaze_ammo.json @@ -18,7 +18,7 @@ "type": "AMMO", "name": "blast canister", "description": "An IED composed of a sealed container filled with a payload material that triggers on impact. Carries a substantial explosive payload.", - "weight": 3816, + "weight": "3816 g", "volume": "250 ml", "price": 1000, "count": 1, @@ -32,7 +32,7 @@ "type": "AMMO", "name": "Big Bang canister", "description": "An IED composed of a sealed container filled with a payload material that triggers on impact. Carries a VERY substantial explosive payload.", - "weight": 15160, + "weight": "15160 g", "volume": "1250 ml", "price": 1000, "count": 5, @@ -46,7 +46,7 @@ "type": "AMMO", "name": "fire canister", "description": "An IED composed of a container filled with a payload material and a means to trigger it. Intended to be fired from a specialized launcher. This one is designed to douse a small area with deadly flames.", - "weight": 3816, + "weight": "3816 g", "volume": "250 ml", "price": 600, "count": 1, @@ -60,7 +60,7 @@ "type": "AMMO", "name": "inferno canister", "description": "An IED composed of a container filled with a payload material and a means to trigger it. Intended to be fired from a specialized launcher. This one is designed to douse a large area with deadly flames.", - "weight": 6816, + "weight": "6816 g", "volume": "250 ml", "price": 2200, "count": 1, @@ -74,7 +74,7 @@ "type": "AMMO", "name": "fragmentation canister", "description": "An IED composed of a container filled with a payload material and a means to trigger it. Intended to be fired from a specialized launcher. This one is designed to spray the immediate area with deadly shrapnel.", - "weight": 4816, + "weight": "4816 g", "volume": "250 ml", "price": 800, "count": 1, @@ -87,7 +87,7 @@ "type": "AMMO", "name": "modified mininuke", "description": "A heavy modified handheld nuclear device. Intended to be fired from a specialized launcher, its case has been cut down and it has been rigged to explode on impact. While it is now somewhat lighter than before, it can no longer be triggered manually.", - "weight": 3816, + "weight": "3816 g", "volume": "250 ml", "price": 180000, "bashing": 8, @@ -106,7 +106,7 @@ "type": "AMMO", "name": "harpoon", "description": "A large spear carved from wood. This was fashioned specifically to be fired from a compatible weapon; thus unsuitable for melee combat.", - "weight": 1455, + "weight": "1455 g", "volume": "2500 ml", "price": 1000, "bashing": 5, @@ -141,7 +141,7 @@ "type": "AMMO", "name": "nova bolt", "description": "An IED composed of a sealed container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. Carries a substantial explosive payload.", - "weight": 3816, + "weight": "3816 g", "price": 1000, "extend": { "effects": [ "EXPLOSIVE_BIG" ] } }, @@ -151,7 +151,7 @@ "type": "AMMO", "name": "supernova bolt", "description": "An IED composed of a sealed container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. Carries a very substantial explosive payload.", - "weight": 3816, + "weight": "3816 g", "price": 1000, "extend": { "effects": [ "EXPLOSIVE_HUGE" ] } }, @@ -161,7 +161,7 @@ "type": "AMMO", "name": "searing bolt", "description": "An IED composed of a container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. This one is designed to douse a small area with deadly flames.", - "weight": 3816, + "weight": "3816 g", "price": 600, "extend": { "effects": [ "FLAME" ] } }, @@ -171,7 +171,7 @@ "type": "AMMO", "name": "napalm bolt", "description": "An IED composed of a container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. This one is designed to douse a large area with deadly flames.", - "weight": 6816, + "weight": "6816 g", "price": 2200, "extend": { "effects": [ "NAPALM" ] } }, @@ -181,7 +181,7 @@ "type": "AMMO", "name": "shatter bolt", "description": "An IED composed of a container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. This one is designed to spray the immediate area with deadly shrapnel.", - "weight": 4816, + "weight": "4816 g", "price": 800, "extend": { "effects": [ "FRAG" ] } }, @@ -190,7 +190,7 @@ "type": "AMMO", "name": "steel ballista bolt", "description": "A long shaft carved from wood ending in a tip of sharpened metal. It's quite heavy, capable of dealing large amounts of damage, but isn't particularly accurate. Stands a good chance of remaining intact once fired.", - "weight": 2055, + "weight": "2055 g", "volume": "1250 ml", "price": 2000, "bashing": 1, @@ -209,7 +209,7 @@ "type": "AMMO", "name": "nuclear bolt", "description": "A heavy modified handheld nuclear device affixed to the end of a large ballista bolt. Its case has been cut down and it has been rigged to explode on impact. It can no longer be triggered manually.", - "weight": 3816, + "weight": "3816 g", "volume": "250 ml", "price": 180000, "bashing": 8, @@ -228,7 +228,7 @@ "type": "AMMO", "name": "wood ballista bolt", "description": "A sharpened bolt carved from wood. It's fairly heavy, capable of dealing large amounts of damage, but isn't particularly accurate. Stands a good chance of remaining intact once fired.", - "weight": 1555, + "weight": "1555 g", "volume": "1250 ml", "price": 1000, "bashing": 1, @@ -247,7 +247,7 @@ "type": "AMMO", "name": "lead ball", "description": "A heavy lead ball about 8cm in diameter. Could pack quite a bit of a punch if you had something to launch it.", - "weight": 400, + "weight": "400 g", "volume": "250 ml", "price": 200, "to_hit": -3, @@ -266,7 +266,7 @@ "type": "AMMO", "name": "serrated disc", "description": "A metal disc surrounded by serrated edges. It's as menacing as it sounds.", - "weight": 1255, + "weight": "1255 g", "volume": "250 ml", "price": 200, "bashing": 1, @@ -285,7 +285,7 @@ "type": "AMMO", "name": "metal fragment", "description": "Small slivers of metal. Can't see much use for them.", - "weight": 1, + "weight": "1 g", "volume": "250 ml", "price": 0, "bashing": 1, diff --git a/data/mods/blazemod/blaze_blob.json b/data/mods/blazemod/blaze_blob.json index 4c0a304178973..ed88a914200db 100644 --- a/data/mods/blazemod/blaze_blob.json +++ b/data/mods/blazemod/blaze_blob.json @@ -5,7 +5,7 @@ "category": "veh_parts", "name": "Gelatinous track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": 32368, + "weight": "32368.000000000004 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -22,7 +22,7 @@ "category": "veh_parts", "name": "Oozing track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": 32368, + "weight": "32368.000000000004 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -39,7 +39,7 @@ "category": "veh_parts", "name": "Gray track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": 32368, + "weight": "32368.000000000004 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -57,7 +57,7 @@ "name": "liquified blob feed", "name_plural": "bfeedfuel", "description": "Liquified blob feed, useful for fueling certain blob based vehicle parts", - "weight": 1, + "weight": "1 g", "volume": "200ml", "price": 40, "price_postapoc": 800, @@ -87,7 +87,7 @@ "name": "blob feed", "name_plural": "blob feed", "description": "An amalgam of various types of organic material, contains everything the blob needs to be healthy. You think…", - "weight": 50, + "weight": "50 g", "volume": "250 ml", "to_hit": -3, "bashing": 8, @@ -104,7 +104,7 @@ "category": "tools", "name": "growing blob frame", "description": "A growing vehicle frame made of bone. It's coated in a thick layer of ooze, though there's greater amounts on the bindings. It's not quite tough enough to use.", - "weight": 3662, + "weight": "3662 g", "volume": "10 L", "price": 100, "to_hit": -2, @@ -124,7 +124,7 @@ "type": "GUN", "name": "biting blob", "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. It has evolved the ability to constantly generate calcified protrusions which are then controlled by sinuous tensile strands. These \"teeth\" can then be used to latch and wound anything unfortunate enough to be nearby. The outer membrane has also become significantly thicker in order to support its more strenuous movement; though it seems pliable enough to pull apart…", - "weight": 18331, + "weight": "18331 g", "volume": "5500 ml", "to_hit": -5, "bashing": 10, @@ -150,7 +150,7 @@ "name": "growing keratinous mass", "name_plural": "growing keratinous mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, + "weight": "12140 g", "volume": "4500 ml", "price": 100, "to_hit": -2, @@ -170,7 +170,7 @@ "type": "GUN", "name": "gel shooter", "description": "A living blob turned into an autonomous weapon. It trawls the ground for material, which it then strips of nutrition. The remainder is then expelled out at significant velocity towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it. It seems pliable enough to pull apart…", - "weight": 7252, + "weight": "7252 g", "volume": "3 L", "to_hit": -5, "bashing": 10, @@ -194,7 +194,7 @@ "name": "growing beaded mass", "name_plural": "growing beaded mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 5410, + "weight": "5410 g", "volume": "2500 ml", "price": 100, "to_hit": -2, @@ -214,7 +214,7 @@ "type": "GUN", "name": "frost lancer", "description": "A living blob turned into an autonomous weapon. A biological aberration that exists at sub-zero temperatures. After filtering nutrients from the water, it freezes the remainder into an incredibly sharp spear of ice; which it then launches at nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 21331, + "weight": "21331 g", "volume": "4500 ml", "to_hit": -5, "bashing": 10, @@ -240,7 +240,7 @@ "name": "growing icy mass", "name_plural": "growing icy mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 15140, + "weight": "15140 g", "volume": "3 L", "price": 100, "to_hit": -2, @@ -261,7 +261,7 @@ "category": "tools", "name": "gelacier", "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It seems pliable enough to pull apart…", - "weight": 6112, + "weight": "6112 g", "volume": "5 L", "price": 500, "to_hit": -3, @@ -276,7 +276,7 @@ "category": "veh_parts", "name": "gelacier wheel", "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It has formed itself into a wide boat frame.", - "weight": 6112, + "weight": "6112 g", "volume": "5 L", "to_hit": -3, "bashing": 9, @@ -292,7 +292,7 @@ "category": "veh_parts", "name": "gelacier wheel", "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It has formed itself into a wide, crude wheel.", - "weight": 6112, + "weight": "6112 g", "volume": "5 L", "to_hit": -3, "bashing": 9, @@ -309,7 +309,7 @@ "name": "growing cold mass", "name_plural": "growing cold mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 3562, + "weight": "3562 g", "volume": "2 L", "price": 100, "to_hit": -2, @@ -329,7 +329,7 @@ "type": "GUN", "name": "snapping ooze", "description": "A living blob turned into an autonomous weapon. A baffling mutation in an already baffling creature, this blob is encased in a thick coat of fur, which serves as a form of protection. In addition, it is capable of projecting rows of calcified sharp fragments in a manner mimicking the jaw of a more recognizable creature. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 22331, + "weight": "22331 g", "volume": "6500 ml", "to_hit": -5, "bashing": 10, @@ -355,7 +355,7 @@ "name": "growing hairy mass", "name_plural": "growing hairy mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 18140, + "weight": "18140 g", "volume": "5 L", "price": 100, "to_hit": -2, @@ -377,7 +377,7 @@ "name": "gelatinous mass", "name_plural": "gelatinous mass", "description": "An experiment gone horribly right. While the original intent was to combine the structure of a bone frame with the impact absorption of the blob; the blob seems to have completely consumed the bone. Instead, what remains is an amorphous mass of goo with what seems to be numerous thin filaments floating within. With a bit of effort, you can grasp the fibers and stretch the mass into a multitude of shapes. The mass is able to retain the new shape even under force, though the mass yields at your touch. With enough strength, you think you can pull it apart.", - "weight": 6662, + "weight": "6662 g", "volume": "5 L", "price": 100, "to_hit": -2, @@ -404,7 +404,7 @@ "name": "multiplying gelatinous mass", "name_plural": "multiplying gelatinous mass", "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": 8662, + "weight": "8662 g", "volume": "5 L", "price": 100, "to_hit": -2, @@ -434,7 +434,7 @@ "name": "gelatinous capsule", "name_plural": "gelatinous capsules", "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": 6662, + "weight": "6662 g", "volume": "5 L", "price": 100, "to_hit": -2, @@ -460,7 +460,7 @@ "category": "veh_parts", "name": "gelatinous wheel", "description": "Filling a gelatinous mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": 30062, + "weight": "30062 g", "volume": "12500 ml", "to_hit": -3, "bashing": 9, @@ -477,7 +477,7 @@ "name": "growing gelatinous mass", "name_plural": "growing gelatinous mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 3562, + "weight": "3562 g", "volume": "2 L", "price": 100, "to_hit": -2, @@ -499,7 +499,7 @@ "name": "gelectrode", "//": "No Snake, eating it will not refill your batteries.", "description": "A biological mystery, this blob has evolved the ability to slowly generate electricity through some unknown process. It emits a low phosphorescent glow while doing so. It is also capable of storing electricity from other sources, but doing so renders it inactive. It seems pliable enough to pull apart…", - "weight": 5132, + "weight": "5132 g", "volume": "5 L", "price": 500, "to_hit": -3, @@ -517,7 +517,7 @@ "name": "growing glowing mass", "name_plural": "growing glowing mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 3562, + "weight": "3562 g", "volume": "2 L", "price": 100, "to_hit": -2, @@ -539,7 +539,7 @@ "name": "gray mass", "name_plural": "gray mass", "description": "This internal structures of this creature have developed significantly. While retaining the resilience and malleability of its once simpler form, it has gained the considerable abilities of perception and stimulus response. When directly threatened, it is able to shift and alter its microfibers, hardening its membrane to an almost steel-hard shell. You can still pull it apart with enough force. It's also really gray.", - "weight": 19120, + "weight": "19120 g", "volume": "15 L", "price": 100, "to_hit": -2, @@ -566,7 +566,7 @@ "name": "multiplying gray mass", "name_plural": "multiplying gray mass", "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": 19662, + "weight": "19662 g", "volume": "5 L", "price": 100, "to_hit": -2, @@ -596,7 +596,7 @@ "name": "gray cocoon", "name_plural": "gray cocoons", "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": 19120, + "weight": "19120 g", "volume": "10 L", "price": 100, "to_hit": -2, @@ -622,7 +622,7 @@ "category": "veh_parts", "name": "gray wheel", "description": "Filling a gray mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": 53262, + "weight": "53262 g", "volume": "30 L", "to_hit": -3, "bashing": 9, @@ -639,7 +639,7 @@ "name": "growing gray mass", "name_plural": "growing gray mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 16335, + "weight": "16335 g", "volume": "15 L", "price": 100, "to_hit": -2, @@ -660,7 +660,7 @@ "category": "veh_parts", "name": "earthen roller", "description": "A large, spherical blob the size of a large truck tire. The outer layer has compacted itself into a solid shell; offering great resilience. Having grown to full size, it seems content to simply sit there.", - "weight": 204540, + "weight": "204540 g", "volume": "50 L", "price": 500, "to_hit": -3, @@ -676,7 +676,7 @@ "type": "GUN", "name": "blobsaw", "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. While its simpler cousins have a limit to the number of keratinous protrusions they can project and control; this blob can utilize hundreds of these sharp fangs to shred anything it detects as a threat into unrecognizable ribbons. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 24331, + "weight": "24331 g", "volume": "7500 ml", "to_hit": -5, "bashing": 10, @@ -702,7 +702,7 @@ "name": "growing spike-studded mass", "name_plural": "growing spike-studded mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 20140, + "weight": "20140 g", "volume": "5500 ml", "price": 100, "to_hit": -2, @@ -723,7 +723,7 @@ "name": "fuel puffer", "//": "God Dangit Blobby.", "description": "A living blob turned into an autonomous weapon. A rather picky eater, it feeds on chemicals found within gasoline. The digestion process turns the result incredibly viscous which, when threats come near, is launched; ensnaring anything it hits. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 15531, + "weight": "15531 g", "volume": "4 L", "to_hit": -5, "bashing": 10, @@ -748,7 +748,7 @@ "name": "growing gasoline-laced mass", "name_plural": "growing gasoline-laced mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, + "weight": "12140 g", "volume": "3 L", "price": 100, "to_hit": -2, @@ -768,7 +768,7 @@ "type": "GUN", "name": "acid puffer", "description": "A living blob turned into an autonomous weapon. A filter feeder, the digestion process produces highly acidic byproducts; which is then expelled at any nearby enemies. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 15553, + "weight": "15553 g", "volume": "4500 ml", "to_hit": -5, "bashing": 10, @@ -793,7 +793,7 @@ "name": "growing acidic mass", "name_plural": "growing acidic mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, + "weight": "12140 g", "volume": "3 L", "price": 100, "to_hit": -2, @@ -815,7 +815,7 @@ "name": "oozing mass", "name_plural": "oozing mass", "description": "An amorphous mass that has undergone a significant growth. In addition to the increased amount of goo and sinuous filaments, it seems to have started developing other internal structures. Like its smaller counterpart, it can be shaped into various structures; albeit with significantly greater tensile strength due to the increased number of supporting filaments. You believe you can split it apart with enough force.", - "weight": 16262, + "weight": "16262 g", "volume": "15 L", "price": 100, "to_hit": -2, @@ -842,7 +842,7 @@ "name": "multiplying oozing mass", "name_plural": "multiplying oozing mass", "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": 16662, + "weight": "16662 g", "volume": "5 L", "price": 100, "to_hit": -2, @@ -871,7 +871,7 @@ "name": "oozing pod", "name_plural": "oozing pods", "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": 16262, + "weight": "16262 g", "volume": "7500 ml", "price": 100, "to_hit": -2, @@ -897,7 +897,7 @@ "category": "veh_parts", "name": "oozing wheel", "description": "Filling an oozing mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": 50262, + "weight": "50262 g", "volume": "30 L", "to_hit": -3, "bashing": 9, @@ -914,7 +914,7 @@ "name": "growing ooze", "name_plural": "growing ooze", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12662, + "weight": "12662 g", "volume": "10 L", "price": 100, "to_hit": -2, @@ -934,7 +934,7 @@ "type": "GENERIC", "name": "amorphous heart", "description": "This amorphous mass seems to have finished developing; its advanced internal structures testifying to that. It is capable of locomotion through internal hydraulic pressure, capable of moving substantial loads, and, in an astounding display of intelligence, is capable of manipulating anything it's attached to, whether blob-based or otherwise, through extended pseudopods. You think you might be able to manipulate it, and through it, all its attached parts. Though to do so you'll have to position yourself to be in contact with it; and it appears unnervingly willing to accommodate you…", - "weight": 21331, + "weight": "21331 g", "volume": "20 L", "to_hit": -5, "bashing": 10, @@ -949,7 +949,7 @@ "name": "growing mass of tendrils", "name_plural": "growing mass of tendrils", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 25325, + "weight": "25325 g", "volume": "15 L", "price": 100, "to_hit": -2, @@ -969,7 +969,7 @@ "type": "GUN", "name": "gel spiker", "description": "A living blob turned into an autonomous weapon. Capable of calcifying large numbers of fang-like fragments within itself. It hurls groups of these fragments along with a small portion of itself. When it reaches its destination, the detached remains shoot these fragments in all directions, expiring in the process. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 24121, + "weight": "24121 g", "volume": "6500 ml", "to_hit": -5, "bashing": 10, @@ -995,7 +995,7 @@ "name": "growing spiked mass", "name_plural": "growing spiked mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 18140, + "weight": "18140 g", "volume": "5 L", "price": 100, "to_hit": -2, @@ -1015,7 +1015,7 @@ "type": "GUN", "name": "gel spouter", "description": "A living blob turned into an autonomous weapon. It can suck in water from a vehicle tank, and forcibly expel it in a wide cone. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 21331, + "weight": "21331 g", "volume": "20 L", "to_hit": -5, "bashing": 10, @@ -1039,7 +1039,7 @@ "type": "GUN", "name": "gel lancer", "description": "A living blob turned into an autonomous weapon. Evolving incredible abilities of perception, it is capable of locating and discerning possible threats within a large radius. When a potential threat is located, it fires a small, calcified projectile with incredible speed and accuracy. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 15103, + "weight": "15103 g", "volume": "4 L", "to_hit": -5, "bashing": 10, @@ -1064,7 +1064,7 @@ "name": "growing spiny mass", "name_plural": "growing spiny mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 11140, + "weight": "11140 g", "volume": "3500 ml", "price": 100, "to_hit": -2, @@ -1084,7 +1084,7 @@ "type": "GUN", "name": "gel razor", "description": "A living blob turned into an autonomous weapon. An enhanced metabolism allows it to calcify large, toothy discs which are then launched towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 17121, + "weight": "17121 g", "volume": "5500 ml", "to_hit": -5, "bashing": 10, @@ -1109,7 +1109,7 @@ "name": "growing spiky mass", "name_plural": "growing spiky mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, + "weight": "12140 g", "volume": "4 L", "price": 100, "to_hit": -2, @@ -1129,7 +1129,7 @@ "type": "GUN", "name": "shock bulb", "description": "A living blob turned into an autonomous weapon. Shockingly, it somehow is able to project electricity, which it then discharges at any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 14321, + "weight": "14321 g", "volume": "3750 ml", "to_hit": -5, "bashing": 10, @@ -1152,7 +1152,7 @@ "name": "growing bright mass", "name_plural": "growing bright mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 11140, + "weight": "11140 g", "volume": "3 L", "price": 100, "to_hit": -2, @@ -1172,7 +1172,7 @@ "type": "GUN", "name": "gel puffer", "description": "A living blob turned into an autonomous weapon. A filter feeder, it strips any water it processes of nutrients and expels the remainder towards any nearby threats. The process of filter-feeding also makes the remaining liquid viscous, though it also dissipates fairly quickly. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 11331, + "weight": "11331 g", "volume": "4500 ml", "to_hit": -5, "bashing": 10, @@ -1197,7 +1197,7 @@ "name": "growing viscous mass", "name_plural": "growing viscous mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 8140, + "weight": "8140.000000000001 g", "volume": "3 L", "price": 100, "to_hit": -2, @@ -1218,7 +1218,7 @@ "name": "fire puffer", "//": "Need a light?", "description": "A living blob turned into an autonomous weapon. A rather picky eater, it feeds on chemicals found within gasoline. The digested material is still highly flammable, and when launched, also activates an ignition gland located on the outer membrane. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 16331, + "weight": "16331 g", "volume": "4 L", "to_hit": -5, "bashing": 10, @@ -1244,7 +1244,7 @@ "name": "growing warm mass", "name_plural": "growing warm mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, + "weight": "12140 g", "volume": "3 L", "price": 100, "to_hit": -2, @@ -1264,7 +1264,7 @@ "type": "GUN", "name": "spark blight", "description": "A living blob turned into an autonomous weapon. It is capable of storing energy from sunlight inside itself in the form of electricity. Then, in a truly baffling show of force, projects a highly concentrated stream of electricity towards any possible threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 17331, + "weight": "17331 g", "volume": "5250 ml", "to_hit": -5, "bashing": 10, @@ -1287,7 +1287,7 @@ "name": "growing electrified mass", "name_plural": "growing electrified mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, + "weight": "12140 g", "volume": "4 L", "price": 100, "to_hit": -2, diff --git a/data/mods/blazemod/blaze_magazines.json b/data/mods/blazemod/blaze_magazines.json index f2a97f0773a7c..4f23ba24786d3 100644 --- a/data/mods/blazemod/blaze_magazines.json +++ b/data/mods/blazemod/blaze_magazines.json @@ -4,7 +4,7 @@ "type": "MAGAZINE", "name": "BB hopper", "description": "An improvised magazine for a vehicle mounted weapon. A simple metal box with some plastic guide rails, it acts as a gravity fed hopper to drop a small round shot into the weapon's chamber below. It is not very reliable, but quick to reload.", - "weight": 1840, + "weight": "1840 g", "volume": "3 L", "price": 16600, "material": "steel", @@ -20,7 +20,7 @@ "type": "MAGAZINE", "name": "bolt hopper", "description": "An improvised magazine for a vehicle mounted crossbow. A simple metal box with some plastic guide rails, it acts as a gravity fed hopper to drop a crossbow bolt into the weapon below. It is awkward to reload and not especially reliable.", - "weight": 1840, + "weight": "1840 g", "volume": "3 L", "price": 16600, "material": "steel", @@ -36,7 +36,7 @@ "type": "MAGAZINE", "name": "canister rack", "description": "An improvised magazine for a vehicle mounted weapon. A simple metal box with some plastic guide rails, it acts as a gravity fed hopper to drop a heavy canister into the weapon below. It is awkward to reload and not especially reliable.", - "weight": 1840, + "weight": "1840 g", "volume": "3 L", "price": 16600, "material": "steel", @@ -52,7 +52,7 @@ "type": "MAGAZINE", "name": "pebble hopper", "description": "An improvised magazine for a vehicle mounted weapon. A simple metal box with some plastic guide rails, it acts as a gravity fed hopper to drop a small round shot into the weapon's chamber below. It is not very reliable, but quick to reload.", - "weight": 1840, + "weight": "1840 g", "volume": "3 L", "price": 16600, "material": "steel", diff --git a/data/mods/blazemod/blaze_other.json b/data/mods/blazemod/blaze_other.json index 463be57abfaac..d26996aeb11b6 100644 --- a/data/mods/blazemod/blaze_other.json +++ b/data/mods/blazemod/blaze_other.json @@ -5,7 +5,7 @@ "type": "ENGINE", "name": "large steam engine", "description": "A large steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condensor recaptures the water, making this a closed cycle system.", - "weight": 280000, + "weight": "280 kg", "volume": "95 L", "epower": 0, "power": 242450, @@ -19,7 +19,7 @@ "type": "ENGINE", "name": "huge steam engine", "description": "A huge steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condensor recaptures the water, making this a closed cycle system.", - "weight": 835000, + "weight": "835 kg", "volume": "175 L", "epower": 0, "power": 447600, @@ -33,7 +33,7 @@ "type": "ENGINE", "name": "small steam turbine", "description": "A small steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": 80000, + "weight": "80 kg", "volume": "18750 ml", "//": "Steam turbine efficiency sucks - ideally 47% efficient with reheat cycles, versus 55% for a modern gas engine. Going with 33% efficieny for easy math", "power": 93250, @@ -47,7 +47,7 @@ "type": "ENGINE", "name": "medium steam turbine", "description": "A medium sized steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": 120000, + "weight": "120 kg", "volume": "27500 ml", "power": 149200, "energy_consumption": 347700, @@ -60,7 +60,7 @@ "type": "ENGINE", "name": "large steam turbine", "description": "A large steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": 190000, + "weight": "190 kg", "volume": "45 L", "power": 242450, "energy_consumption": 727350, @@ -73,7 +73,7 @@ "type": "ENGINE", "name": "huge steam turbine", "description": "A huge steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": 345000, + "weight": "345 kg", "volume": "81250 ml", "power": 447600, "energy_consumption": 1342800, @@ -86,7 +86,7 @@ "category": "veh_parts", "name": "solar array", "description": "A dozen solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able track the sun. However, this comes at the cost of being prohibitively heavy.", - "weight": 265400, + "weight": "265400 g", "volume": "62500 ml", "price": 120000, "to_hit": -4, @@ -101,7 +101,7 @@ "category": "veh_parts", "name": "upgraded solar array", "description": "A dozen upgraded solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.", - "weight": 319328, + "weight": "319328 g", "volume": "62500 ml", "price": 150000, "to_hit": -4, @@ -116,7 +116,7 @@ "category": "veh_parts", "name": "upgraded reinforced solar array", "description": "A dozen upgraded reinforced solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.", - "weight": 382736, + "weight": "382736 g", "volume": "80500 ml", "price": 150000, "to_hit": -4, @@ -131,7 +131,7 @@ "category": "veh_parts", "name": "Rubber Caterpillar Track", "description": "A short, interlocking set of hard rubber tracks reinforced by stiff wire held in place by a set of smaller wheels. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": 32368, + "weight": "32368.000000000004 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -148,7 +148,7 @@ "category": "veh_parts", "name": "Steel Caterpillar Track", "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on large construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is very heavy.", - "weight": 95968, + "weight": "95968 g", "volume": "75 L", "price": 45500, "to_hit": -3, @@ -165,7 +165,7 @@ "category": "veh_parts", "name": "Reinforced Caterpillar Track", "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on APCs and armored vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is extremely heavy.", - "weight": 287824, + "weight": "287824 g", "volume": "87500 ml", "price": 75500, "to_hit": -3, @@ -183,7 +183,7 @@ "name": "turret chassis", "name_plural": "turret chassis", "description": "A frame capable of rotating a full 360 degrees, capable of mounting multiple weapon systems either welded directly onto it or secured via the straps. It comes with a easily modified container for ammunition storage, a rudimentary ammo feed system for easy access, and a section for a movement system. It is controlled by a targeting AI that can adapt to the usage of whatever weapon that has been loading, with proper programming.", - "weight": 38604, + "weight": "38604 g", "volume": "20 L", "price": 8000, "to_hit": -3, diff --git a/data/mods/blazemod/blaze_test.json b/data/mods/blazemod/blaze_test.json index 39da015c8fe39..b6cca51c99e42 100644 --- a/data/mods/blazemod/blaze_test.json +++ b/data/mods/blazemod/blaze_test.json @@ -370,7 +370,7 @@ "type": "TOOL", "name": "diamond cluster", "description": "A cluster of artificial crystals that have broken off of a diamond matrix. While the substance usually decays when separated from the catalyst; this cluster seems to be self-sustaining by some unknown mechanism. ", - "weight": 350, + "weight": "350 g", "volume": "250 ml", "price": 300000, "to_hit": -5, @@ -470,7 +470,7 @@ "name": "diamond frame", "//": "Sempai can't resist me now!", "description": "A brilliantly sparkling diamond vehicle frame. Incredibly strong for its weight.", - "weight": 9498, + "weight": "9498 g", "volume": "10 L", "price": 10000000, "to_hit": -3, @@ -485,7 +485,7 @@ "type": "GUN", "name": "diamond lance", "description": "A weapon that is as deadly as it is dazzling. The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness. The substance rapidly decays when separated from the catalyst; thus a pre-shaped lump of carbon is brought into contact with the matrix, immediately crystallized and launched just as quickly. The launcher requires a specialized chassis in order to be brought to bear on its unfortunate targets.", - "weight": 16050, + "weight": "16050 g", "volume": "5500 ml", "price": 60000, "to_hit": -1, @@ -540,7 +540,7 @@ "name": "diamond nova", "//": "Behold, the bringer of light.", "description": "A weapon that is as deadly as it is dazzling. The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness. The substance rapidly decays when separated from the catalyst, and at sizes as large as the projectile used, also rapidly decays when in contact with other matter. Thus the projectile is held and launched by the use of pressurized air from a vortex stone. Upon striking its target, the projectile undergoes explosive decomposition; shattering into a brilliant burst of diamond fragments.", - "weight": 25815, + "weight": "25815 g", "volume": "5500 ml", "price": 60000, "to_hit": -1, @@ -567,7 +567,7 @@ "category": "veh_parts", "name": "diamond plating", "description": "A piece of armor plating made of clear diamond. Incredibly strong for its weight.", - "weight": 6130, + "weight": "6130 g", "volume": "3 L", "price": 12000000, "to_hit": -3, @@ -582,7 +582,7 @@ "type": "AMMO", "name": "diamond fragments", "description": "These small fragments of diamond are formed as a byproduct from the crystallization process of a diamond matrix. While the substance usually decays when separated from the catalyst; these fragments are small enough to remain stable.", - "weight": 3, + "weight": "3 g", "volume": "250 ml", "price": 10000, "bashing": 1, @@ -622,7 +622,7 @@ "category": "veh_parts", "name": "stabilized portal", "description": "As you gaze into the seemingly infinite depths of this portable hole in reality, a phrase from a time forever gone echoes in your mind. \"There are two things that are infinite: the universe and human kleptomania.\"", - "weight": 22813, + "weight": "22813 g", "volume": "50 L", "price": 1500000, "to_hit": -4, @@ -659,7 +659,7 @@ "name": "diamond matrix", "name_plural": "diamond matrices", "description": "A sparkling diamond with a dazzling spiral pattern. Small pieces of glittering crystal form on the edges as you hold it.", - "weight": 250, + "weight": "250 g", "volume": "250 ml", "price": 5000000, "to_hit": -5, @@ -681,7 +681,7 @@ "category": "veh_parts", "name": "vortex engine", "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allows it to be attached to a vehicle to render it mobile.", - "weight": 62071, + "weight": "62071 g", "volume": "56250 ml", "price": 1500000, "bashing": 4, @@ -762,7 +762,7 @@ "category": "veh_parts", "name": "vortex generator", "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allow it to be hooked up to a battery to store the power generated.", - "weight": 48066, + "weight": "48066 g", "volume": "50 L", "price": 1500000, "bashing": 4, @@ -776,7 +776,7 @@ "type": "GUN", "name": "vortex accelerator", "description": "This weapon uses powerful bursts of air to launch sharp fragments at its target at high speed. You'll need some form of platform to mount it on.", - "weight": 10700, + "weight": "10700 g", "volume": "2500 ml", "price": 60000, "to_hit": -1, @@ -829,7 +829,7 @@ "type": "GUN", "name": "vortex bolter", "description": "This weapon uses powerful bursts of air to launch bolts at its target at high speed. You'll need some form of platform to mount it on.", - "weight": 8310, + "weight": "8310 g", "volume": "2500 ml", "price": 90000, "to_hit": -1, @@ -884,7 +884,7 @@ "type": "GUN", "name": "vortex cannon", "description": "Essentially a large pneumatic gun made to hurl sharpened metal rails. Instead of a mechanical system, you've managed to harness the vortex to power this gun. While powerful for its size, you'll need some form of platform to mount it on.", - "weight": 21831, + "weight": "21831 g", "volume": "5 L", "price": 60000, "to_hit": -1, @@ -923,7 +923,7 @@ "type": "GUN", "name": "vortex rifle", "description": "This weapon uses powerful bursts of air to launch small projectiles at its target at high speed. You'll need some form of platform to mount it on.", - "weight": 11759, + "weight": "11759 g", "volume": "2500 ml", "price": 90000, "to_hit": -1, diff --git a/data/mods/blazemod/blaze_weapons.json b/data/mods/blazemod/blaze_weapons.json index 7df2c8784f68e..8e52b6f8d1c6b 100644 --- a/data/mods/blazemod/blaze_weapons.json +++ b/data/mods/blazemod/blaze_weapons.json @@ -5,7 +5,7 @@ "reload_noise_volume": 10, "name": "storm bolter", "description": "This pneumatic bolt thrower has been greatly enhanced, allowing multiple bolts to be launched accurately and in quick succession. It requires a support of some sort in order to be operated.", - "weight": 7110, + "weight": "7110 g", "volume": "3750 ml", "price": 350000, "to_hit": -3, @@ -32,7 +32,7 @@ "reload_noise_volume": 10, "name": "slingshot cannon", "description": "Essentially several long drawstrings held by two long, reinforced sides and a mechanism attached to a crank to draw and fire it. It's deceptively powerful and surprisingly accurate, but far too large to be used without some sort of stable platform.", - "weight": 12359, + "weight": "12359 g", "volume": "5500 ml", "price": 60000, "to_hit": -1, @@ -59,7 +59,7 @@ "reload_noise_volume": 10, "name": "lacerator", "description": "This weapon launches serrated metal disks at nearby enemies. It draws its power from a vehicle's engines, and thus must be mounted on such in order to be operated.", - "weight": 4624, + "weight": "4624 g", "volume": "2 L", "price": 10000, "to_hit": -1, @@ -84,7 +84,7 @@ "reload_noise_volume": 10, "name": "rotary cannon", "description": "This fearsome weapon sports 3 barrels in a cyclic configuration. A specialized mechanism loads the otherwise troublesome rounds; allowing it to be fired in quick succession. However, this renders it incredibly unwieldy, and it must be mounted on a support structure in order to be fired.", - "weight": 11713, + "weight": "11713 g", "volume": "3750 ml", "price": 80000, "to_hit": -1, @@ -110,7 +110,7 @@ "reload_noise_volume": 10, "name": "laser cannon", "description": "This enhanced laser cannon sacrifices efficiency for destructive power. The increased power requirements require a significant power source and the size of the firing mechanism also requires support.", - "weight": 6650, + "weight": "6650 g", "volume": "3 L", "price": 270000, "to_hit": -1, @@ -135,7 +135,7 @@ "reload_noise_volume": 10, "name": "pulse laser", "description": "Augmented damage capability and rapid bursts make this a powerful weapon. The increased power requirements require a significant power source and the firing mechanism also requires a specialized chassis.", - "weight": 4825, + "weight": "4825 g", "volume": "3 L", "price": 750000, "to_hit": -1, @@ -161,7 +161,7 @@ "reload_noise_volume": 10, "name": "turbolaser cannon", "description": "With an augmented emitter and capacitor, this mounted laser is capable of superheating most materials to the point of exploding. The firing mechanism also requires the services of a specialized chassis, and one must be wary of the prodigious power needs of such a weapon.", - "weight": 9500, + "weight": "9500 g", "volume": "4500 ml", "price": 750000, "to_hit": -1, @@ -186,7 +186,7 @@ "reload_noise_volume": 10, "name": "perforator", "description": "A coilgun with improved electromagnetic circuits to be able to propel a metallic projectile at high speed and with great accuracy. Capable of piercing armor with little issue, though the projectile itself lacks damage due to its small size. It must be mounted on a specialized chassis in order to be fired.", - "weight": 6152, + "weight": "6152 g", "volume": "2500 ml", "price": 50000, "to_hit": -1, @@ -214,7 +214,7 @@ "type": "GUN", "name": "needler", "description": "This improved nailgun features a special firing mechanism that is set to fire a spread of up to 5 nails at once; sure to drop the hammer on its unfortunate targets. However, these features render it incredibly unwieldy, and it must be mounted on a supporting frame in order to be fired.", - "weight": 7827, + "weight": "7827 g", "volume": "3750 ml", "price": 110000, "to_hit": -1, @@ -242,7 +242,7 @@ "type": "GUN", "name": "hypervelocity driver", "description": "A single-shot, electrically propelled, steel rail launcher. The powerful, and frankly dangerous, improvements made to the power systems of this weapon is capable imbuing a massive charge into a single-rail; so much that it often shatters into deadly fragments on impact. It's capabilities are limited by its prodigious power requirements however, and its large size necessitates an appropriately-equipped vehicle.", - "weight": 10135, + "weight": "10135 g", "volume": "4 L", "price": 550000, "to_hit": -3, @@ -269,7 +269,7 @@ "reload_noise_volume": 10, "name": "ripper", "description": "This menacing weapon rapidly launches bladed disks that rips through enemies with devastating effect. It draws its power from a vehicle's engines, and thus must be mounted on such in order to be operated.", - "weight": 12952, + "weight": "12952 g", "volume": "3750 ml", "price": 95000, "to_hit": -1, @@ -297,7 +297,7 @@ "reload_noise_volume": 10, "name": "rotary speargun", "description": "This pneumatic speargun features a revolving barrel behind its launcher, allowing projectiles to be rapidly loaded and fired. However, the weight requires an external support measure.", - "weight": 17308, + "weight": "17308 g", "volume": "4500 ml", "price": 280000, "to_hit": -1, @@ -324,7 +324,7 @@ "reload_noise_volume": 10, "name": "scorpion ballista", "description": "A massive tension-operated crossbow. The hand-crank allows one to draw it without the need for heavy labor. It's far too massive to be used on foot, and thus needs to be mounted on a vehicle in order to be operated.", - "weight": 18308, + "weight": "18308 g", "volume": "5 L", "price": 150000, "to_hit": -1, @@ -350,7 +350,7 @@ "reload_noise_volume": 10, "name": "splintergun", "description": "A heavily modified coilgun that fires tiny fragments of metal at high speeds extremely quickly. The resulting barrage is highly inaccurate, but can turn unarmored targets into pulp. It must be mounted on a specialized chassis in order to be fired.", - "weight": 5852, + "weight": "5852 g", "volume": "3500 ml", "price": 50000, "to_hit": -1, @@ -379,7 +379,7 @@ "reload_noise_volume": 10, "name": "harpoon gun", "description": "A tension-operated speargun. A hand-crank lets one draw the strings quickly, but it's too unwieldy to handle without a support of some sort.", - "weight": 18500, + "weight": "18500 g", "volume": "4 L", "price": 110000, "to_hit": -1, @@ -407,7 +407,7 @@ "reload_noise_volume": 10, "name": "Tesla cannon", "description": "This alteration of the Chain Lightning bionic fires artificial lightning bolts that arc to nearby enemies. It must be attached to a large power source, but it allows for much more powerful bolts.", - "weight": 5141, + "weight": "5141 g", "volume": "3750 ml", "price": 280000, "to_hit": -1, @@ -431,7 +431,7 @@ "reload_noise_volume": 10, "name": "avalanche rifle", "description": "This pneumatic assault rifle has been greatly enhanced, firing projectiles faster and with higher velocity. However, these features render it incredibly unwieldy, and it must be mounted on a supporting platform in order to be fired.", - "weight": 7311, + "weight": "7311 g", "volume": "3750 ml", "price": 155000, "to_hit": -3, diff --git a/data/mods/desert_region/desert_insect_spider.json b/data/mods/desert_region/desert_insect_spider.json index db485f0a73d70..6265f6122f173 100644 --- a/data/mods/desert_region/desert_insect_spider.json +++ b/data/mods/desert_region/desert_insect_spider.json @@ -8,7 +8,7 @@ "bodytype": "insect", "species": [ "INSECT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 85, "speed": 100, "material": [ "iflesh" ], diff --git a/data/mods/desert_region/desert_mammal.json b/data/mods/desert_region/desert_mammal.json index 79c66841a2eb1..0c47510d63e0b 100644 --- a/data/mods/desert_region/desert_mammal.json +++ b/data/mods/desert_region/desert_mammal.json @@ -9,7 +9,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "5896700 ml", - "weight": 5896700, + "weight": "5896700 g", "hp": 360, "speed": 200, "material": [ "flesh" ], diff --git a/data/mods/desert_region/desert_monsters.json b/data/mods/desert_region/desert_monsters.json index ff2700bc3daa7..bcb4fd55fbca5 100644 --- a/data/mods/desert_region/desert_monsters.json +++ b/data/mods/desert_region/desert_monsters.json @@ -8,7 +8,7 @@ "bodytype": "kangaroo", "species": [ "ZOMBIE" ], "volume": "90718 ml", - "weight": 90718, + "weight": "90718 g", "hp": 125, "speed": 130, "material": [ "flesh" ], diff --git a/data/mods/desert_region/desert_reptile_amphibian.json b/data/mods/desert_region/desert_reptile_amphibian.json index 3f27f70fa5aa4..f674711278236 100644 --- a/data/mods/desert_region/desert_reptile_amphibian.json +++ b/data/mods/desert_region/desert_reptile_amphibian.json @@ -8,7 +8,7 @@ "bodytype": "lizard", "species": [ "REPTILE" ], "volume": "4000 ml", - "weight": 1814, + "weight": "1814 g", "hp": 16, "speed": 85, "material": [ "iflesh" ], diff --git a/data/mods/necromancy/necronimicron.json b/data/mods/necromancy/necronimicron.json index 02599e119cea8..29b3591d3e153 100644 --- a/data/mods/necromancy/necronimicron.json +++ b/data/mods/necromancy/necronimicron.json @@ -8,7 +8,7 @@ "description": "A small device, not bigger than a man's fist. It provides primitive organisms with electric stimulation, reviving them and forcing them to obey your commands. This version only works on blobs.", "price": 50000, "material": [ "aluminum", "plastic" ], - "weight": 100, + "weight": "100 g", "volume": 0, "category": "spare_parts" }, @@ -21,7 +21,7 @@ "description": "Several chunks of blob scraps, stuffed with a control chip and sewn back together. A light shock from the UPS started the chip, bringing the blob back to life. Use this item to wake up the blob.", "price": 70000, "material": "flesh", - "weight": 1000, + "weight": "1 kg", "volume": "250 ml", "use_action": { "type": "place_monster", @@ -45,7 +45,7 @@ "description": "Your very own undead servant. The blob controlling its body is in a state of coma, awaiting your orders. Use this item to wake up the minion.", "price": 250000, "material": "flesh", - "weight": 10000, + "weight": "10 kg", "volume": "200 L", "category": "tools", "use_action": { @@ -79,7 +79,7 @@ "color": "green", "description": "A potent drug, necessary when performing a revival operation on larger animals (including humans). It induces a violent allergic reactions in living organisms, so using it on yourself is a REALLY bad idea.", "price": 100000, - "weight": 1, + "weight": "1 g", "volume": "250 ml", "tool": "syringe", "category": "drugs" @@ -90,7 +90,7 @@ "name": "Principles of Postmortem Mind Control", "max_level": 5, "description": "A thick book containing research notes of a mad scientist. It describes various methods of reanimating and controlling the dead. There's a lot of gory details and technical language mixed in, so it's not easy to read.", - "weight": 2330, + "weight": "2330 g", "color": "dark_gray", "intelligence": 14, "symbol": "?", diff --git a/data/mods/realguns/gun.json b/data/mods/realguns/gun.json index a6131455eb011..e32c62a18430f 100644 --- a/data/mods/realguns/gun.json +++ b/data/mods/realguns/gun.json @@ -5,7 +5,7 @@ "reload_noise_volume": 10, "name": "M6 Aircrew Survival Weapon", "description": "A lightweight combination rifle, combining a .22 rimfire barrel with .410 shotgun barrel, and designed to fold for compact storage. Produced for military aircraft pilots who might be stranded after a crash, later produced commercially by various companies.", - "weight": 2140, + "weight": "2140 g", "volume": "1750 ml", "price": 59500, "to_hit": -1, @@ -32,7 +32,7 @@ "type": "GUN", "name": ".410 pipe shotgun", "description": "A home-made shotgun, in .410 bore. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", - "weight": 2267, + "weight": "2267 g", "volume": "2 L", "price": 10000, "to_hit": -1,