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.

Sign up for GitHub

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

Increased shop stock #34869

Closed
wants to merge 54 commits into from
Closed

Increased shop stock #34869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
5fbec74
Add files via upload
crazykiddeath Apr 14, 2019
d1bf665
Merge pull request #1 from crazykiddeath/gun-arm-patch-1
crazykiddeath Apr 14, 2019
0772f03
Delete bionics.json
crazykiddeath Oct 19, 2019
0215bb6
Delete bio.json
crazykiddeath Oct 19, 2019
72d84b0
Delete character.cpp
crazykiddeath Oct 19, 2019
e8767cc
Add files via upload
crazykiddeath Oct 20, 2019
e8349f6
Add files via upload
crazykiddeath Oct 21, 2019
7670e2b
Delete veterinarian.json
crazykiddeath Oct 21, 2019
45e77e6
Delete antique_store.json
crazykiddeath Oct 21, 2019
7e3ea95
Delete bakery.json
crazykiddeath Oct 21, 2019
c9c3610
Delete bar.json
crazykiddeath Oct 21, 2019
11fb932
Delete butcher.json
crazykiddeath Oct 21, 2019
6b51543
Delete cs_sex_shop.json
crazykiddeath Oct 21, 2019
e466a83
Delete thrift.json
crazykiddeath Oct 21, 2019
f0efd48
Delete teashop.json
crazykiddeath Oct 21, 2019
78bdf98
Delete sports_store.json
crazykiddeath Oct 21, 2019
acad6ab
Delete smoke_lounge.json
crazykiddeath Oct 21, 2019
f7e9412
Delete s_liquor.json
crazykiddeath Oct 21, 2019
37917fc
Delete s_icecream.json
crazykiddeath Oct 21, 2019
4aa6f9f
Delete s_grocery.json
crazykiddeath Oct 21, 2019
6750e5b
Delete s_hardware.json
crazykiddeath Oct 21, 2019
2566669
Delete s_gun.json
crazykiddeath Oct 21, 2019
c5cc4f5
Delete s_gas.json
crazykiddeath Oct 21, 2019
a1fbfb7
Delete s_furniture.json
crazykiddeath Oct 21, 2019
2c3eb31
Delete s_electronics.json
crazykiddeath Oct 21, 2019
3910815
Delete s_coffee.json
crazykiddeath Oct 21, 2019
060ccf7
Delete s_clothing.json
crazykiddeath Oct 21, 2019
223566b
Delete s_candy.json
crazykiddeath Oct 21, 2019
e2e0777
Delete s_bookstore.json
crazykiddeath Oct 21, 2019
ffe1b8a
Delete restaurant_fast.json
crazykiddeath Oct 21, 2019
73229ce
Delete restaurant.json
crazykiddeath Oct 21, 2019
ce9a1b1
Delete pizza_parlor.json
crazykiddeath Oct 21, 2019
640e83b
Delete pharmacy.json
crazykiddeath Oct 21, 2019
55b5c84
Delete petstore.json
crazykiddeath Oct 21, 2019
3b0bf1f
Delete pawn_shop.json
crazykiddeath Oct 21, 2019
dba823f
Delete musicstore.json
crazykiddeath Oct 21, 2019
bbee437
Delete museum.json
crazykiddeath Oct 21, 2019
7cf4803
Delete mil_surplus.json
crazykiddeath Oct 21, 2019
874436c
Delete library.json
crazykiddeath Oct 21, 2019
e6bbd43
Delete laundromat.json
crazykiddeath Oct 21, 2019
c34bbee
Delete landscaping_supply.json
crazykiddeath Oct 21, 2019
48a23a1
Delete jewel_store.json
crazykiddeath Oct 21, 2019
ca53ad3
Delete homeimprovement_superstore_new.json
crazykiddeath Oct 21, 2019
22dcb23
Delete homeimprovement_superstore.json
crazykiddeath Oct 21, 2019
619cb30
Delete homeimprovement.json
crazykiddeath Oct 21, 2019
3094eaa
Delete headshop.json
crazykiddeath Oct 21, 2019
2a174f1
Delete gunsmith.json
crazykiddeath Oct 21, 2019
b34286a
Delete gardening_store.json
crazykiddeath Oct 21, 2019
baddfa2
Delete garden_botanical.json
crazykiddeath Oct 21, 2019
1c5caf4
Delete garage_gas.json
crazykiddeath Oct 21, 2019
ce459da
Delete garage.json
crazykiddeath Oct 21, 2019
5fce797
Delete dollar_store.json
crazykiddeath Oct 21, 2019
86c233a
Delete dispensary.json
crazykiddeath Oct 21, 2019
03d76ac
Delete diner.json
crazykiddeath Oct 21, 2019
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: 2 additions & 2 deletions data/json/mapgen/antique_store.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
" ": "t_floor",
"+": "t_door_glass_c",
",": "t_pavement_y",
"-": "t_wall",
"-": "t_wall_w",
".": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ], [ "t_underbrush", 10 ] ],
"F": "t_sidewalk",
"O": "t_window",
"_": "t_pavement",
"M": "t_door_metal_pickable",
"4": "t_gutter_downspout",
"<": "t_ladder_up",
"|": "t_wall"
"|": "t_wall_w"
},
"furniture": { "#": "f_counter", "T": "f_displaycase", "l": "f_bookcase", "L": "f_stool" },
"place_items": [
Expand Down
22 changes: 11 additions & 11 deletions data/json/mapgen/bakery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
],
"terrain": {
"+": "t_door_c",
"-": "t_wall",
"-": "t_wall_w",
".": "t_floor",
"1": "t_tree_young",
"D": "t_door_glass_c",
Expand Down Expand Up @@ -71,13 +71,13 @@
{ "item": "groce_ingredient", "x": 3, "y": 16, "chance": 50 },
{ "item": "groce_ingredient", "x": 2, "y": 15, "chance": 50 },
{ "item": "groce_ingredient", "x": 2, "y": 11, "chance": 50 },
{ "item": "groce_ingredient", "x": 12, "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 3 ] },
{ "item": "groce_ingredient", "x": [ 9, 11 ], "y": 21, "chance": 50, "repeat": [ 1, 3 ] },
{ "item": "groce_ingredient", "x": 12, "y": [ 14, 16 ], "chance": 80, "repeat": [ 6, 16 ] },
{ "item": "groce_ingredient", "x": [ 9, 11 ], "y": 21, "chance": 80, "repeat": [ 6, 16 ] },
{ "item": "groce_dairyegg", "x": [ 5, 6 ], "y": 16, "chance": 75 },
{ "item": "groce_bread", "x": 2, "y": 16, "chance": 50 },
{ "item": "groce_bread", "x": 2, "y": 14, "chance": 50 },
{ "item": "groce_bread", "x": 16, "y": 5, "chance": 50 },
{ "item": "groce_bread", "x": 5, "y": 5, "chance": 50 },
{ "item": "groce_bread", "x": 2, "y": 16, "chance": 70, "repeat": [ 2, 6 ] },
{ "item": "groce_bread", "x": 2, "y": 14, "chance": 70, "repeat": [ 2, 6 ] },
{ "item": "groce_bread", "x": 16, "y": 5, "chance": 70, "repeat": [ 2, 6 ] },
{ "item": "groce_bread", "x": 5, "y": 5, "chance": 70, "repeat": [ 2, 6 ] },
{ "item": "bags", "x": 12, "y": [ 18, 19 ], "chance": 25 },
{ "item": "coffee_newsstand", "x": 5, "y": 8, "chance": 25 },
{ "item": "trash", "x": 19, "y": 16, "chance": 75 },
Expand All @@ -88,10 +88,10 @@
{ "item": "trash", "x": 4, "y": 1, "chance": 75 },
{ "item": "bags", "x": 12, "y": [ 18, 19 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "jackets", "x": 12, "y": [ 18, 19 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "baked_goods", "x": 2, "y": [ 5, 8 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "baked_goods", "x": 5, "y": [ 5, 8 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "baked_goods", "x": [ 16, 17 ], "y": 14, "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "baked_goods", "x": [ 19, 20 ], "y": 14, "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "baked_goods", "x": 2, "y": [ 5, 8 ], "chance": 75, "repeat": [ 3, 9 ] },
{ "item": "baked_goods", "x": 5, "y": [ 5, 8 ], "chance": 75, "repeat": [ 3, 9 ] },
{ "item": "baked_goods", "x": [ 16, 17 ], "y": 14, "chance": 75, "repeat": [ 3, 9 ] },
{ "item": "baked_goods", "x": [ 19, 20 ], "y": 14, "chance": 75, "repeat": [ 3, 9 ] },
{ "item": "groce_softdrink", "x": 17, "y": 4, "chance": 35 }
]
}
Expand Down
36 changes: 18 additions & 18 deletions data/json/mapgen/bar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,12 @@
"'": "t_window",
"+": "t_door_c",
",": "t_pavement_y",
"-": "t_wall",
"-": "t_wall_g",
".": "t_floor",
"@": "t_console_broken",
"D": "t_door_locked",
"c": "t_linoleum_gray",
"d": "t_pavement",
"f": "t_fencegate_c",
"l": "t_linoleum_gray",
"s": "t_linoleum_gray",
"t": "t_linoleum_gray",
Expand All @@ -58,7 +57,7 @@
"4": "t_gutter_downspout",
"<": "t_ladder_up",
"q": "t_floor",
"|": "t_wall"
"|": "t_wall_g"
},
"furniture": {
"#": "f_table",
Expand All @@ -69,6 +68,7 @@
"r": "f_trashcan",
"c": "f_counter",
"d": "f_dumpster",
"f": "f_counter_gate_c",
"s": "f_sink",
"x": "f_pool_table",
"q": "f_stool",
Expand All @@ -81,20 +81,20 @@
{ "item": "bar_food", "x": 20, "y": [ 9, 15 ], "chance": 35, "repeat": [ 2, 3 ] },
{ "item": "bar_food", "x": 20, "y": [ 9, 15 ], "chance": 35, "repeat": [ 2, 3 ] },
{ "item": "bar_alcohol", "x": 20, "y": [ 9, 15 ], "chance": 67, "repeat": [ 3, 4 ] },
{ "item": "bar_fridge", "x": 22, "y": 9, "chance": 50, "repeat": [ 1, 2 ] },
{ "item": "bar_alcohol", "x": 22, "y": [ 10, 13 ], "chance": 50, "repeat": [ 2, 3 ] },
{ "item": "bar_fridge", "x": 22, "y": 9, "chance": 75, "repeat": [ 6, 9 ] },
{ "item": "bar_alcohol", "x": 22, "y": [ 10, 13 ], "chance": 50, "repeat": [ 3, 4 ] },
{ "item": "bar_table", "x": [ 4, 5 ], "y": [ 8, 9 ], "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "bar_alcohol", "x": [ 4, 5 ], "y": [ 8, 9 ], "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "bar_alcohol", "x": [ 4, 5 ], "y": [ 8, 9 ], "chance": 20, "repeat": [ 3, 4 ] },
{ "item": "bar_table", "x": [ 9, 10 ], "y": [ 8, 9 ], "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "bar_table", "x": [ 14, 15 ], "y": [ 8, 9 ], "chance": 20 },
{ "item": "bar_alcohol", "x": [ 14, 15 ], "y": [ 8, 9 ], "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "bar_alcohol", "x": [ 14, 15 ], "y": [ 8, 9 ], "chance": 20, "repeat": [ 3, 4 ] },
{ "item": "bar_table", "x": [ 4, 5 ], "y": [ 13, 14 ], "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "bar_table", "x": [ 9, 10 ], "y": [ 13, 14 ], "chance": 20 },
{ "item": "bar_alcohol", "x": [ 9, 10 ], "y": [ 13, 14 ], "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "bar_alcohol", "x": [ 9, 10 ], "y": [ 13, 14 ], "chance": 20, "repeat": [ 3, 4 ] },
{ "item": "bar_table", "x": [ 14, 15 ], "y": [ 13, 14 ], "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "bar_alcohol", "x": [ 14, 15 ], "y": [ 13, 14 ], "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "snacks", "x": [ 19, 22 ], "y": 22, "chance": 50, "repeat": [ 1, 2 ] },
{ "item": "fridgesnacks", "x": 22, "y": 21, "chance": 40, "repeat": [ 1, 2 ] },
{ "item": "bar_alcohol", "x": [ 14, 15 ], "y": [ 13, 14 ], "chance": 20, "repeat": [ 3, 4 ] },
{ "item": "snacks", "x": [ 19, 22 ], "y": 22, "chance": 50, "repeat": [ 6, 10 ] },
{ "item": "fridgesnacks", "x": 22, "y": 21, "chance": 40, "repeat": [ 2, 4 ] },
{ "item": "trash", "x": [ 1, 22 ], "y": [ 0, 3 ], "chance": 20, "repeat": [ 2, 4 ] },
{ "item": "trash", "x": [ 10, 11 ], "y": 21, "chance": 50, "repeat": [ 3, 5 ] },
{ "item": "bar_trash", "x": [ 10, 11 ], "y": 21, "chance": 50, "repeat": [ 2, 4 ] },
Expand Down Expand Up @@ -200,7 +200,7 @@
"'": "t_window_domestic",
"+": "t_door_c",
",": "t_pavement_y",
"-": "t_wall",
"-": "t_wall_b",
".": "t_floor",
"u": "t_floor",
"@": "t_console_broken",
Expand All @@ -216,7 +216,7 @@
"t": "t_linoleum_gray",
"{": "t_linoleum_gray",
"q": "t_floor",
"|": "t_wall",
"|": "t_wall_b",
"4": "t_gutter_downspout",
"<": "t_ladder_up",
"!": "t_brick_wall"
Expand Down Expand Up @@ -245,12 +245,12 @@
"o": { "item": "novels", "chance": 20 },
"d": { "item": "bar_trash", "chance": 35 },
"#": { "item": "bar_table", "chance": 35, "repeat": [ 2, 3 ] },
"c": { "item": "bar_alcohol", "chance": 50, "repeat": [ 2, 3 ] },
"u": { "item": "bar_alcohol", "chance": 50, "repeat": [ 2, 3 ] },
"c": { "item": "bar_alcohol", "chance": 50, "repeat": [ 3, 4 ] },
"u": { "item": "bar_alcohol", "chance": 50, "repeat": [ 3, 4 ] },
"i": { "item": "bar_bathroom", "chance": 35, "repeat": [ 1, 2 ] },
"$": { "item": "bar_fridge", "chance": 50, "repeat": [ 1, 2 ] },
"&": { "item": "fridgesnacks", "chance": 40, "repeat": [ 1, 2 ] },
"{": { "item": "bar_alcohol", "chance": 65, "repeat": [ 2, 3 ] }
"$": { "item": "bar_fridge", "chance": 75, "repeat": [ 6, 9 ] },
"&": { "item": "fridgesnacks", "chance": 40, "repeat": [ 6, 10 ] },
"{": { "item": "bar_alcohol", "chance": 65, "repeat": [ 3, 4 ] }
}
}
},
Expand Down
Loading