Skip to content

Commit

Permalink
Adds post apoc prices to resources
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian-Otten committed Apr 16, 2020
1 parent 8786b2b commit 5c4c85b
Show file tree
Hide file tree
Showing 10 changed files with 87 additions and 16 deletions.
2 changes: 2 additions & 0 deletions data/json/items/resources/alien.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"weight": "70 g",
"volume": "250 ml",
"price": 0,
"price_postapoc": 0,
"material": "alien_resin",
"symbol": ",",
"color": "light_gray",
Expand All @@ -22,6 +23,7 @@
"weight": "70000 g",
"volume": "22000 ml",
"price": 10000,
"price_postapoc": 500,
"material": "alien_resin",
"symbol": "0",
"color": "light_blue",
Expand Down
2 changes: 2 additions & 0 deletions data/json/items/resources/chemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"weight": "1725 mg",
"volume": "250 ml",
"price": 2500,
"price_postapoc": 100,
"material": "powder_nonflam",
"symbol": "=",
"color": "dark_gray",
Expand All @@ -25,6 +26,7 @@
"weight": "1540 mg",
"volume": "250 ml",
"price": 2500,
"price_postapoc": 50,
"material": "powder_nonflam",
"symbol": "=",
"color": "dark_gray",
Expand Down
5 changes: 5 additions & 0 deletions data/json/items/resources/fasteners.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"weight": "24 g",
"volume": "5 ml",
"price": 100,
"price_postapoc": 0,
"material": "steel",
"symbol": "=",
"color": "dark_gray",
Expand All @@ -22,6 +23,7 @@
"weight": "1 g",
"volume": "20 ml",
"price": 100,
"price_postapoc": 0,
"material": "plastic",
"symbol": "=",
"color": "dark_gray",
Expand All @@ -36,6 +38,7 @@
"description": "A steel button, usually found on clothing.",
"weight": "8 g",
"price": 300,
"price_postapoc": 0,
"material": "steel"
},
{
Expand All @@ -62,6 +65,7 @@
"weight": "2 g",
"volume": "2 ml",
"price": 100,
"price_postapoc": 0,
"material": "cotton",
"symbol": "=",
"color": "dark_gray",
Expand All @@ -84,6 +88,7 @@
"weight": "4 g",
"volume": "4 ml",
"price": 100,
"price_postapoc": 0,
"material": [ "plastic", "cotton" ],
"symbol": "=",
"color": "dark_gray",
Expand Down
4 changes: 4 additions & 0 deletions data/json/items/resources/glass.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"description": "A large sheet of glass. Easily shattered. Useful for repairing windows.",
"category": "spare_parts",
"price": 5000,
"price_postapoc": 100,
"material": "glass",
"weight": "31250 g",
"volume": "12500 ml",
Expand All @@ -52,6 +53,7 @@
"description": "A large sheet of glass strengthened with steel wiring.",
"category": "spare_parts",
"price": 10000,
"price_postapoc": 250,
"material": [ "glass", "steel" ],
"weight": "40123 g",
"volume": "12500 ml",
Expand All @@ -67,6 +69,7 @@
"description": "A small pane of glass strengthened with steel wiring.",
"category": "spare_parts",
"price": 5000,
"price_postapoc": 100,
"material": [ "glass", "steel" ],
"weight": "10040 g",
"volume": "3 L",
Expand All @@ -82,6 +85,7 @@
"description": "A large, durable sheet of tempered glass, approximately six millimeters thick. A common type of safety glass with the curious property of breaking into small, non-lethal pieces upon shattering.",
"category": "spare_parts",
"price": 10000,
"price_postapoc": 100,
"material": "glass",
"weight": "22700 g",
"volume": "22700 ml",
Expand Down
12 changes: 12 additions & 0 deletions data/json/items/resources/home_improvement.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"id": "r_paint",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "red paint", "str_pl": "red paint" },
"symbol": "o",
"color": "red",
Expand All @@ -19,6 +20,7 @@
"id": "b_paint",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "blue paint", "str_pl": "blue paint" },
"symbol": "o",
"color": "blue",
Expand All @@ -34,6 +36,7 @@
"id": "w_paint",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "white paint", "str_pl": "white paint" },
"symbol": "o",
"color": "white",
Expand All @@ -49,6 +52,7 @@
"id": "g_paint",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "green paint", "str_pl": "green paint" },
"symbol": "o",
"color": "green",
Expand All @@ -64,6 +68,7 @@
"id": "p_paint",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "purple paint", "str_pl": "purple paint" },
"symbol": "o",
"color": "magenta",
Expand All @@ -79,6 +84,7 @@
"id": "y_paint",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "yellow paint", "str_pl": "yellow paint" },
"symbol": "o",
"color": "yellow",
Expand All @@ -94,6 +100,7 @@
"id": "r_carpet",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "red carpet" },
"symbol": "}",
"color": "red",
Expand All @@ -109,6 +116,7 @@
"id": "g_carpet",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "green carpet" },
"symbol": "}",
"color": "green",
Expand All @@ -124,6 +132,7 @@
"id": "y_carpet",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "yellow carpet" },
"symbol": "}",
"color": "yellow",
Expand All @@ -139,6 +148,7 @@
"id": "p_carpet",
"category": "other",
"price": 120,
"price_postapoc": 0,
"name": { "str": "purple carpet" },
"symbol": "}",
"color": "magenta",
Expand All @@ -158,6 +168,7 @@
"category": "spare_parts",
"description": "A metal cylinder with a small lens inside intended to be installed on a door.",
"price": 12000,
"price_postapoc": 50,
"material": [ "aluminum", "glass" ],
"weight": "5 g",
"volume": "250 ml",
Expand All @@ -173,6 +184,7 @@
"category": "spare_parts",
"description": "A roll of fine mesh screen for bug barriers on porches.",
"price": 1200,
"price_postapoc": 50,
"material": [ "plastic" ],
"weight": "25 g",
"volume": "1000 ml",
Expand Down
25 changes: 18 additions & 7 deletions data/json/items/resources/metal.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"volume": "1 L",
"bashing": 12,
"price": 7500,
"price_postapoc": 300
"price_postapoc": 10
},
{
"id": "scrap",
Expand All @@ -26,6 +26,7 @@
"weight": "50 g",
"volume": "250 ml",
"price": 500,
"price_postapoc": 10,
"count": 2,
"stack_size": 10,
"//": "Density 7.60g/cm³ ~ 1.9kg/250ml @ 50g/unit ~ stack 40 but fragments stacks poorly so only 25% of this",
Expand All @@ -50,7 +51,7 @@
"cutting": 6,
"flags": [ "STAB" ],
"qualities": [ [ "BUTCHER", -42 ] ],
"price_postapoc": 500
"price_postapoc": 10
},
{
"type": "GENERIC",
Expand All @@ -67,7 +68,7 @@
"volume": "500 ml",
"bashing": 5,
"price": 7500,
"price_postapoc": 300
"price_postapoc": 10
},
{
"id": "material_aluminium_ingot",
Expand All @@ -79,7 +80,7 @@
"//": "Density 2.70g/cm³ = 675g/250ml",
"volume": "250 ml",
"price": 500,
"price_postapoc": 125,
"price_postapoc": 10,
"material": [ "aluminum" ],
"symbol": ",",
"color": "light_gray",
Expand All @@ -95,6 +96,7 @@
"//": "Density 9.78g/cm³ ~ 2.4kg/250ml @ stack 1000 = 2g/unit",
"volume": "50ml",
"price": 6500,
"price_postapoc": 10,
"count": 100,
"stack_size": 200,
"material": [ "lead" ],
Expand All @@ -112,7 +114,7 @@
"//": "Density 19.32g/cm³ ~ 4.8kg/250ml @ stack 1000 = 5g/unit",
"volume": "50ml",
"price": 100000,
"price_postapoc": 100,
"price_postapoc": 10,
"count": 100,
"stack_size": 200,
"material": [ "gold" ],
Expand Down Expand Up @@ -147,7 +149,7 @@
"weight": "7 g",
"volume": "50ml",
"price": 3000,
"price_postapoc": 75,
"price_postapoc": 10,
"count": 100,
"stack_size": 200,
"material": [ "zinc" ],
Expand All @@ -165,6 +167,7 @@
"//": "Density 11.34g/cm³ ~ 2.8kg/250ml @ stack 1000 = 3g/unit",
"volume": "50ml",
"price": 5000,
"price_postapoc": 10,
"count": 100,
"stack_size": 200,
"material": [ "lead" ],
Expand All @@ -182,6 +185,7 @@
"//": "Weight should be 1.12g because magnesium is 64% less dense than aluminum (1.74g/cm³ vs 2.70g/cm³), at 250ml aluminium powder has a weight of ~0.176kg at 250ml, assuming same particle size => magnesium powder has a weight of ~0.112kg at 250ml",
"volume": "250 ml",
"price": 5000,
"price_postapoc": 50,
"count": 100,
"stack_size": 100,
"container": "bag_plastic",
Expand All @@ -200,7 +204,7 @@
"//": "Density 10.40g/cm³ ~ 2.6kg/250ml @ stack 1000 = 3g/unit",
"volume": "50ml",
"price": 100000,
"price_postapoc": 100,
"price_postapoc": 10,
"count": 100,
"stack_size": 200,
"material": [ "silver" ],
Expand All @@ -218,6 +222,7 @@
"weight": "250 g",
"volume": "250 ml",
"price": 2000,
"price_postapoc": 10,
"bashing": 5,
"to_hit": -3,
"stack_size": 8,
Expand All @@ -236,6 +241,7 @@
"weight": "250 g",
"volume": "250 ml",
"price": 1000,
"price_postapoc": 10,
"bashing": 8,
"to_hit": -2,
"stack_size": 4,
Expand All @@ -255,6 +261,7 @@
"weight": "1000 g",
"volume": "250 ml",
"price": 2000,
"price_postapoc": 50,
"bashing": 12,
"to_hit": -4,
"stack_size": 2,
Expand All @@ -274,6 +281,7 @@
"weight": "300 g",
"volume": "250 ml",
"price": 3000,
"price_postapoc": 10,
"bashing": 5,
"to_hit": -3,
"stack_size": 6,
Expand All @@ -292,6 +300,7 @@
"category": "spare_parts",
"description": "A small chunk of copper, usable for crafting or repairs.",
"price": 1000,
"price_postapoc": 10,
"material": "copper",
"weight": "50 g",
"volume": "62 ml",
Expand All @@ -303,6 +312,7 @@
"id": "tin",
"category": "spare_parts",
"price": 750,
"price_postapoc": 10,
"name": { "str": "tin powder", "str_pl": "tin powder" },
"symbol": "=",
"color": "light_gray",
Expand All @@ -320,6 +330,7 @@
"id": "solder_wire",
"category": "spare_parts",
"price": 5000,
"price_postapoc": 50,
"name": { "str": "solder", "str_pl": "solder" },
"symbol": "=",
"color": "light_gray",
Expand Down
Loading

0 comments on commit 5c4c85b

Please sign in to comment.