Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merchant price-fix for .223 magazines and two bionics #3093

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions data/json/items/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,6 @@
"name": { "str": "Linguistic Coprocessor CBM" },
"description": "A microcomputer installed into the left hemisphere of your brain to increase the speed that it processes language. When installed, it provides a passive boost to reading speed.",
"price": 100000,
"price_postapoc": 50000,
"difficulty": 5
},
{
Expand All @@ -1294,8 +1293,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Dopamine Stimulators CBM" },
"description": "A set of tiny bionic nerve stimulators that install into the reward center of your brain. When run with bionic power, it periodically releases a hit of dopamine and other reward chemicals, inducing a state of euphoria and suppressing fear.",
"price": 1000000,
"price_postapoc": 100000,
"price": 100000,
"difficulty": 8
},
{
Expand Down
9 changes: 9 additions & 0 deletions data/json/items/magazine/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
"weight": "88 g",
"volume": "50 ml",
"price": 4000,
"price_postapoc": 50,
"material": "steel",
"symbol": "#",
"color": "light_gray",
Expand All @@ -145,6 +146,7 @@
"weight": "91 g",
"volume": "350 ml",
"price": 4000,
"price_postapoc": 150,
"material": "steel",
"symbol": "#",
"color": "light_gray",
Expand Down Expand Up @@ -180,6 +182,7 @@
"weight": "181 g",
"volume": "600 ml",
"price": 8500,
"price_postapoc": 400,
"material": [ "plastic", "steel" ],
"symbol": "#",
"color": "light_gray",
Expand Down Expand Up @@ -218,6 +221,7 @@
"weight": "181 g",
"volume": "800 ml",
"price": 12000,
"price_postapoc": 800,
"material": "aluminum",
"symbol": "#",
"color": "light_gray",
Expand All @@ -235,6 +239,7 @@
"weight": "581 g",
"volume": "1050 ml",
"price": 9250,
"price_postapoc": 800,
"to_hit": -2,
"bashing": 4,
"material": [ "steel", "plastic" ],
Expand All @@ -255,6 +260,7 @@
"weight": "567 g",
"volume": "1500 ml",
"price": 9500,
"price_postapoc": 1400,
"to_hit": -2,
"bashing": 4,
"material": [ "plastic", "steel" ],
Expand All @@ -275,6 +281,7 @@
"weight": "272 g",
"volume": "1 L",
"price": 15000,
"price_postapoc": 1800,
"material": "aluminum",
"symbol": "#",
"color": "light_gray",
Expand All @@ -292,6 +299,7 @@
"weight": "998 g",
"volume": "1200 ml",
"price": 14000,
"price_postapoc": 1800,
"material": [ "plastic", "steel" ],
"symbol": "#",
"color": "light_gray",
Expand All @@ -310,6 +318,7 @@
"weight": "2220 g",
"volume": "1700 ml",
"price": 18000,
"price_postapoc": 2500,
"material": [ "plastic", "steel" ],
"symbol": "#",
"color": "light_gray",
Expand Down