Skip to content

Commit

Permalink
feat(balance): round ~1 pound to 400g, 500g (#4568)
Browse files Browse the repository at this point in the history
* feat(balance): replace 450~460g to 500g

eradicate 'they weigh about a pound (453g)' and replace it with 500g

* feat(balance): replace 460~470g to 500g

* feat(balance): replace 470~480g to 500g

* feat(balance): replace 480~490g to 500g

* feat(balance): replace 490~500g to 400g

* feat(balance): replace 400~450g to 400g

* Apply suggestions from code review

---------

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
  • Loading branch information
scarf005 and chaosvolt committed Jun 14, 2024
1 parent 78b57e7 commit 94ee06e
Show file tree
Hide file tree
Showing 69 changed files with 138 additions and 139 deletions.
6 changes: 3 additions & 3 deletions data/json/items/armor/ammo_pouch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "ARMOR",
"name": { "str": "ammo satchel" },
"description": "A small pouch that can be used to store most types of small ammunition, rockets will not fit. Activate to store ammunition.",
"weight": "490 g",
"weight": "500 g",
"rigid": false,
"volume": "500 ml",
"price": "10 USD",
Expand Down Expand Up @@ -143,7 +143,7 @@
"type": "ARMOR",
"name": { "str_sp": "chest rig" },
"description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest. This one can hold four magazines or speedloaders in its pouches.",
"weight": "425 g",
"weight": "400 g",
"volume": "500 ml",
"price": "39 USD",
"price_postapoc": "30 USD",
Expand Down Expand Up @@ -427,7 +427,7 @@
"type": "ARMOR",
"name": { "str": "birchbark quiver" },
"description": "A quiver woven from strips of birch bark, worn at the waist, that can hold 20 arrows. Activate to store arrows.",
"weight": "490 g",
"weight": "500 g",
"volume": "500 ml",
"price": "65 USD",
"price_postapoc": "750 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/arms_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"type": "ARMOR",
"name": { "str": "pair of leather arm guards", "str_pl": "pairs of leather arm guards" },
"description": "A pair of tough leather arm guards. Light and comfortable.",
"weight": "430 g",
"weight": "400 g",
"volume": "2 L",
"price": "40 USD",
"price_postapoc": "10 USD",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@
"type": "ARMOR",
"name": { "str": "pair of geta", "str_pl": "pairs of geta" },
"description": "Simple wooden geta.",
"weight": "460 g",
"weight": "500 g",
"volume": "1 L",
"price": "65 USD",
"price_postapoc": "50 cent",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/armor/gloves.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"repairs_like": "gauntlets_larmor",
"type": "ARMOR",
"name": { "str": "pair of boxing gloves", "str_pl": "pairs of boxing gloves" },
"description": "A pair of big, red, 8 oz. boxing gloves. They make dexterous tasks near impossible, but provide ample protection.",
"weight": "453 g",
"description": "A pair of big, red boxing gloves. They make dexterous tasks near impossible, but provide ample protection.",
"weight": "500 g",
"volume": "1 L",
"price": "40 USD",
"price_postapoc": "10 cent",
Expand Down Expand Up @@ -269,7 +269,7 @@
"type": "ARMOR",
"name": { "str": "pair of survivor firegloves", "str_pl": "pairs of survivor firegloves" },
"description": "A pair of customized, Kevlar armored Nomex gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
"weight": "410 g",
"weight": "400 g",
"volume": "1 L",
"price": "180 USD",
"price_postapoc": "25 USD",
Expand All @@ -291,7 +291,7 @@
"type": "ARMOR",
"name": { "str": "pair of fur gloves", "str_pl": "pairs of fur gloves" },
"description": "A pair of warm fur gloves. They are somewhat cumbersome.",
"weight": "410 g",
"weight": "400 g",
"volume": "1 L",
"price": "40 USD",
"price_postapoc": "250 cent",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/hats.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "ARMOR",
"name": { "str": "ten-gallon hat" },
"description": "These may not be the Great Plains, but you can still be the Boss with this high-crowned, wide-brimmed hat.",
"weight": "410 g",
"weight": "400 g",
"volume": "2500 ml",
"price": "179 USD",
"price_postapoc": "250 cent",
Expand Down Expand Up @@ -584,7 +584,7 @@
"type": "ARMOR",
"name": { "str": "tricorne" },
"description": "A classic design, the \"tricorne\", or three-cornered hat, simply pins a large and floppy brim out of the way, though this example adds well-embroidered designs and is oiled against water. Whether you're the \"guvnah\" of a settlement, or the captain of a post-apocalyptic crew, this is the hat for you.",
"weight": "490 g",
"weight": "500 g",
"volume": "2 L",
"price": "25 USD",
"price_postapoc": "750 cent",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"type": "ARMOR",
"name": { "str": "baseball helmet" },
"description": "A hard plastic helmet that covers the head and ears. Designed to protect against a baseball to the head.",
"weight": "453 g",
"weight": "500 g",
"volume": "1750 ml",
"price": "31 USD",
"price_postapoc": "250 cent",
Expand Down Expand Up @@ -349,7 +349,7 @@
"type": "ARMOR",
"name": { "str": "leather armor helmet" },
"description": "A thick leather helmet that provides excellent protection for the head.",
"weight": "435 g",
"weight": "400 g",
"volume": "2 L",
"price": "140 USD",
"price_postapoc": "20 USD",
Expand Down Expand Up @@ -513,7 +513,7 @@
"type": "ARMOR",
"name": { "str": "nomad cowl" },
"description": "A makeshift cowl with protection for the eyes from rain and sun, designed for long travels.",
"weight": "470 g",
"weight": "500 g",
"volume": "2500 ml",
"price": "250 USD",
"price_postapoc": "250 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/legs_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"type": "ARMOR",
"name": { "str_sp": "fencing pants" },
"description": "A pair of reinforced pants used by fencers to prevent injuries.",
"weight": "450 g",
"weight": "500 g",
"volume": "2 L",
"price": "25 USD",
"price_postapoc": "5 USD",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/legs_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
"type": "ARMOR",
"name": { "str_sp": "ski pants" },
"description": "A pair of pants meant for alpine skiing.",
"weight": "450 g",
"weight": "500 g",
"volume": "2 L",
"price": "65 USD",
"price_postapoc": "250 cent",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/armor/storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
"symbol": "[",
"looks_like": "backpack",
"color": "red",
"weight": "411 g",
"weight": "400 g",
"volume": "2 L",
"//": "REI Co-op 22-liter daypack costs $54.95, so ballpark to $55",
"price": "55 USD",
Expand Down Expand Up @@ -972,7 +972,7 @@
"type": "ARMOR",
"name": { "str": "survivor runner pack" },
"description": "A custom-built lightweight runner pack. Durable and carefully crafted to hold as much stuff as possible.",
"weight": "440 g",
"weight": "400 g",
"volume": "1750 ml",
"price": "240 USD",
"price_postapoc": "25 USD",
Expand All @@ -995,7 +995,7 @@
"type": "ARMOR",
"name": { "str": "swag bag" },
"description": "A large canvas sack, re-purposed for makeshift storage. Goes well with a striped shirt and a domino mask.",
"weight": "415 g",
"weight": "400 g",
"volume": "1 L",
"price": "0 cent",
"price_postapoc": "50 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/suits_protection.json
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
"type": "ARMOR",
"name": { "str": "gambeson" },
"description": "A thick jacket of quilted fabric extending down to your knees, designed to be worn underneath mail or other armor. Or worn on its own, if you can't afford proper armor.",
"weight": "453 g",
"weight": "500 g",
"volume": "3 L",
"price": "200 USD",
"price_postapoc": "750 cent",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/armor/torso_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"type": "ARMOR",
"name": { "str": "flotation vest" },
"description": "A brightly-colored vest designed to keep you upright and floating in water.",
"weight": "451 g",
"weight": "500 g",
"volume": "9 L",
"price": "110 USD",
"price_postapoc": "250 cent",
Expand All @@ -157,7 +157,7 @@
"type": "ARMOR",
"name": { "str": "makeshift flotation vest" },
"description": "A flotation vest made of inflated animal skins.",
"weight": "451 g",
"weight": "500 g",
"volume": "9 L",
"price": "110 USD",
"price_postapoc": "250 cent",
Expand Down Expand Up @@ -221,7 +221,7 @@
"type": "ARMOR",
"name": { "str": "hoodie" },
"description": "A sweatshirt with a hood and a \"kangaroo pocket\" in the front for storage.",
"weight": "420 g",
"weight": "400 g",
"volume": "3 L",
"price": "38 USD",
"price_postapoc": "1 USD",
Expand All @@ -245,7 +245,7 @@
"name": { "str": "sports jersey" },
"//": "Genuine team merch, and priced like it!",
"description": "A shirt made of thick material imprinted with the name and logo of a sports team.",
"weight": "480 g",
"weight": "500 g",
"volume": "2250 ml",
"price": "89 USD",
"price_postapoc": "50 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/barter.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"copy-from": "base_book",
"name": { "str": "How to Succeed in Business", "str_pl": "copies of How to Succeed in Business" },
"description": "Useful if you want to get a good deal when purchasing goods.",
"weight": "454 g",
"weight": "500 g",
"volume": "750 ml",
"price": "19 USD",
"price_postapoc": "250 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/bashing.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"copy-from": "base_book",
"name": { "str": "tactical baton defense manual" },
"description": "An informative guide to self-defense using clubs and batons. Aimed at the law enforcement and military market, it is packed with time tested, no-nonsense information and written to be understandable for beginners.",
"weight": "454 g",
"weight": "500 g",
"volume": "250 ml",
"price": "20 USD",
"price_postapoc": "750 cent",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/book/computer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"copy-from": "base_book",
"name": { "str": "How to Browse the Web", "str_pl": "copies of How to Browse the Web" },
"description": "Very beginner-level information about computers.",
"weight": "454 g",
"weight": "500 g",
"volume": "750 ml",
"price": "17 USD",
"price_postapoc": "50 cent",
Expand Down Expand Up @@ -76,7 +76,7 @@
"name": { "str": "Computer Science 101", "str_pl": "copies of Computer Science 101" },
"//": "College-level textbooks are Cheap at $60.",
"description": "An entry-level textbook about computers.",
"weight": "462 g",
"weight": "500 g",
"volume": "750 ml",
"price": "55 USD",
"price_postapoc": "50 cent",
Expand Down
16 changes: 8 additions & 8 deletions data/json/items/book/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"copy-from": "base_book",
"name": { "str": "Cooking on a Budget", "str_pl": "copies of Cooking on a Budget" },
"description": "A nice cook book that goes beyond recipes and into the chemistry of food.",
"weight": "454 g",
"weight": "500 g",
"volume": "1 L",
"price": "19 USD",
"price_postapoc": "5 USD",
Expand All @@ -60,7 +60,7 @@
"name": { "str": "To Serve Man", "str_pl": "copies of To Serve Man" },
"//": "Wasn't commercially traded. ('Parody' only covers so much.) Should get a serious price modifier for non-Cannibals.",
"description": "It's… it's a cookbook!",
"weight": "454 g",
"weight": "500 g",
"volume": "1 L",
"price": "400 USD",
"price_postapoc": "50 cent",
Expand All @@ -79,7 +79,7 @@
"copy-from": "base_book",
"name": { "str": "Cucina Italiana", "str_pl": "copies of Cucina Italiana" },
"description": "This cookbook is written in Italian, but handily illustrated with step by step photo instructions.",
"weight": "454 g",
"weight": "500 g",
"volume": "1 L",
"price": "20 USD",
"price_postapoc": "750 cent",
Expand Down Expand Up @@ -431,7 +431,7 @@
"copy-from": "base_book",
"name": { "str": "The Vinegar Maker's Handbook", "str_pl": "copies of Vinegar Maker's Handbook" },
"description": "This book describes in detail all the ways that one can make vinegar. You would have thought that there wasn't much to making vinegar, but the girth of this book tells you otherwise.",
"weight": "454 g",
"weight": "500 g",
"volume": "1 L",
"price": "19 USD",
"price_postapoc": "750 cent",
Expand All @@ -456,7 +456,7 @@
"copy-from": "base_book",
"name": { "str": "Offal Holiday Cooking", "str_pl": "copies of Offal Holiday Cooking" },
"description": "Offal Holiday Cooking, by Evelyn Turncoat, is a book of holiday recipes that utilize organ meats from various animals. For the true nose-to-tail cook.",
"weight": "454 g",
"weight": "500 g",
"volume": "1 L",
"price": "19 USD",
"price_postapoc": "750 cent",
Expand All @@ -473,7 +473,7 @@
"copy-from": "base_book",
"name": { "str": "Things to do with Milk", "str_pl": "copies of Things to do with Milk" },
"description": "Whatever you want to do with milk, you will probably find it in this book.",
"weight": "478 g",
"weight": "500 g",
"volume": "1 L",
"price": "19 USD",
"price_postapoc": "750 cent",
Expand Down Expand Up @@ -546,7 +546,7 @@
"copy-from": "base_book",
"name": { "str": "Winemaking for Beginners", "str_pl": "copies of Winemaking for Beginners" },
"description": "Winemaking, is an art form. This book teaches you how to crayon within the lines.",
"weight": "454 g",
"weight": "500 g",
"volume": "1 L",
"price": "40 USD",
"price_postapoc": "10 USD",
Expand Down Expand Up @@ -616,7 +616,7 @@
"copy-from": "base_book",
"name": { "str": "Out of the Holler and into the Home: A guide to home distilation. ", "str_pl": "copies of Out of the Holler" },
"description": "A book describing the history of at home distillation by liquor. Each chapter contains a complete recipe for its namesake.",
"weight": "454 g",
"weight": "500 g",
"volume": "619 ml",
"price": "1950 cent",
"price_postapoc": "15 USD",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/book/cutting.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"copy-from": "base_book",
"name": { "str_sp": "knife fighter's notes" },
"description": "It seems to be a guide to edged weapon combat, poorly photocopied and released on spiral- bound paper. Still, there are lots of useful tips for beginners.",
"weight": "454 g",
"weight": "500 g",
"volume": "250 ml",
"price": "20 USD",
"price_postapoc": "750 cent",
Expand All @@ -38,7 +38,7 @@
"copy-from": "base_book",
"name": { "str": "Spetsnaz Knife Techniques", "str_pl": "copies of Spetsnaz Knife Techniques" },
"description": "A classic Soviet text on the art of attacking with a blade.",
"weight": "454 g",
"weight": "500 g",
"volume": "250 ml",
"price": "52 USD",
"price_postapoc": "1250 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/driving.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"copy-from": "base_book",
"name": { "str": "The Rules of the Road", "str_pl": "copies of The Rules of the Road" },
"description": "A thick textbook for beginning drivers. It contains chapters on laws, safe vehicle operation, and defensive driving concepts.",
"weight": "404 g",
"weight": "400 g",
"volume": "500 ml",
"price": "22 USD",
"price_postapoc": "250 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"copy-from": "base_book",
"name": { "str": "What's a Transistor?", "str_pl": "copies of What's a Transistor?" },
"description": "A basic manual of electronics and circuit design.",
"weight": "454 g",
"weight": "500 g",
"volume": "750 ml",
"price": "22 USD",
"price_postapoc": "250 cent",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/book/fabrication.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
"copy-from": "base_book",
"name": { "str": "101 Home Repairs", "str_pl": "copies of 101 Home Repairs" },
"description": "A paperback book detailing 101 home repair projects for the novice carpenter.",
"weight": "454 g",
"weight": "500 g",
"volume": "500 ml",
"price": "18 USD",
"price_postapoc": "750 cent",
Expand Down Expand Up @@ -391,7 +391,7 @@
"copy-from": "base_book",
"name": { "str": "Building for Beginners", "str_pl": "copies of Building for Beginners" },
"description": "A large, paperback book detailing several beginner's projects in construction.",
"weight": "454 g",
"weight": "500 g",
"volume": "500 ml",
"price": "22 USD",
"price_postapoc": "5 USD",
Expand Down Expand Up @@ -426,7 +426,7 @@
"copy-from": "base_book",
"name": { "str": "Machinery's Handbook", "str_pl": "copies of Machinery's Handbook" },
"description": "This classic reference work contains extensive, dense chapters and tables on materials, metrology, toolmaking, gears, threading and more. This recent edition includes extensive data on what were the latest techniques in additive manufacturing. If you need to know how best complete a certain machining operation, the answer lies somewhere in these pages.",
"weight": "454 g",
"weight": "500 g",
"volume": "500 ml",
"price": "80 USD",
"price_postapoc": "15 USD",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/firstaid.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"copy-from": "base_book",
"name": { "str": "The Big Book of First Aid", "str_pl": "copies of The Big Book of First Aid" },
"description": "It's big and heavy, but full of great information about first aid.",
"weight": "454 g",
"weight": "500 g",
"volume": "1250 ml",
"price": "25 USD",
"price_postapoc": "1250 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/gun.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"copy-from": "base_book",
"name": { "str": "The Gun Owner's Handbook", "str_pl": "copies of The Gun Owner's Handbook" },
"description": "A thick soft-cover book that claims to be a complete guide to safely operating, maintaining, and repairing firearms.",
"weight": "462 g",
"weight": "500 g",
"volume": "500 ml",
"price": "38 USD",
"price_postapoc": "1250 cent",
Expand Down
Loading

0 comments on commit 94ee06e

Please sign in to comment.