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

Hunting lodge Location #44378

Merged
merged 61 commits into from
Mar 4, 2021
Merged
Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
6abee0d
Merge pull request #14 from CleverRaven/master
Maleclypse Mar 27, 2020
ea82db7
Merge pull request #15 from CleverRaven/master
Maleclypse Apr 3, 2020
2c85d39
Merge pull request #16 from CleverRaven/master
Maleclypse Apr 14, 2020
8d986f1
Merge pull request #17 from CleverRaven/master
Maleclypse Apr 23, 2020
ce276d2
Merge pull request #19 from CleverRaven/master
Maleclypse Apr 28, 2020
27a08a9
Merge pull request #20 from CleverRaven/master
Maleclypse May 5, 2020
3558e43
Merge pull request #21 from CleverRaven/master
Maleclypse Jun 20, 2020
d492872
Merge pull request #22 from CleverRaven/master
Maleclypse Jul 15, 2020
538a189
Merge pull request #23 from CleverRaven/master
Maleclypse Jul 20, 2020
8a6a4ed
Merge pull request #24 from CleverRaven/master
Maleclypse Aug 1, 2020
c2430e3
Merge pull request #25 from CleverRaven/master
Maleclypse Aug 4, 2020
30237d0
Merge pull request #26 from CleverRaven/master
Maleclypse Aug 8, 2020
61a24eb
Merge pull request #27 from CleverRaven/master
Maleclypse Aug 12, 2020
bce4938
Merge pull request #29 from CleverRaven/master
Maleclypse Sep 28, 2020
1dd84e1
Merge pull request #30 from CleverRaven/master
Maleclypse Oct 8, 2020
37dc32f
Merge pull request #31 from CleverRaven/master
Maleclypse Oct 10, 2020
362fa04
Merge pull request #32 from CleverRaven/master
Maleclypse Nov 9, 2020
1909a86
Merge pull request #33 from CleverRaven/master
Maleclypse Nov 27, 2020
36535d9
Merge pull request #34 from CleverRaven/master
Maleclypse Jan 17, 2021
6d20cfc
Design starting point
Maleclypse Sep 21, 2020
be2d9a7
lodgework
Maleclypse Sep 21, 2020
fa4577b
lodging
Maleclypse Sep 21, 2020
e4b9577
more
Maleclypse Sep 23, 2020
dda7821
Update hunting_lodge.json
Maleclypse Oct 3, 2020
a72803a
Update hunting_lodge.json
Maleclypse Oct 3, 2020
7f849c7
typo
Maleclypse Oct 3, 2020
6df69ec
Update hunting_lodge.json
Maleclypse Oct 4, 2020
b4ba679
lodge stuff
Maleclypse Nov 7, 2020
93c18d7
maybe works
Maleclypse Nov 7, 2020
49bab6f
typo
Maleclypse Nov 7, 2020
e0cd1bd
lint
Maleclypse Nov 7, 2020
6e6adc7
typo
Maleclypse Nov 7, 2020
9254fdb
Update lodge.json
Maleclypse Nov 7, 2020
68af1ca
itemgroup
Maleclypse Nov 7, 2020
3eda63d
fixes
Maleclypse Nov 8, 2020
708e80c
linting
Maleclypse Nov 8, 2020
20dba83
corrections
Maleclypse Nov 8, 2020
b8c5dad
Update lodge_palette.json
Maleclypse Nov 8, 2020
bac5d7d
terrain map?
Maleclypse Nov 8, 2020
58d7774
Update hunting_lodge.json
Maleclypse Nov 9, 2020
8e5f493
Update specials.json
Maleclypse Nov 9, 2020
e9fa824
itemgroups and special fix
Maleclypse Nov 10, 2020
616eed8
Update overmap_terrain.json
Maleclypse Nov 10, 2020
d38b0e6
Update overmap_terrain.json
Maleclypse Nov 10, 2020
371f5b8
Update overmap_terrain.json
Maleclypse Nov 10, 2020
c24ce28
Update overmap_terrain.json
Maleclypse Nov 10, 2020
9e7a410
north
Maleclypse Nov 10, 2020
5399c8a
Update specials.json
Maleclypse Nov 10, 2020
24eac98
starting location
Maleclypse Nov 10, 2020
7894e38
maybe
Maleclypse Nov 10, 2020
77005a1
Update hunting_lodge.json
Maleclypse Nov 10, 2020
6b19e67
Update specials.json
Maleclypse Nov 10, 2020
c3fa8b2
Update hunting_lodge.json
Maleclypse Nov 11, 2020
8d53d43
work work work
Maleclypse Nov 11, 2020
e98a766
ldoge
Maleclypse Nov 11, 2020
f58f171
ldoge
Maleclypse Nov 11, 2020
4ecd10a
Update lodge_nested.json
Maleclypse Nov 11, 2020
00a51a1
a little more to go
Maleclypse Dec 12, 2020
77615cc
Apply suggestions from code review
Maleclypse Jan 17, 2021
28a8d0e
Update lodge.json
Maleclypse Feb 23, 2021
1fbd05a
finishing touches
Maleclypse Mar 4, 2021
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
80 changes: 80 additions & 0 deletions data/json/itemgroups/SUS/lodge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
[
{
"id": "SUS_hunting_archery",
"type": "item_group",
"//": "items found in an archery space",
"subtype": "collection",
"entries": [
{ "item": "compbow", "prob": 50 },
{ "item": "compbow_high", "prob": 20 },
{ "item": "compbow_low", "prob": 40 },
{ "item": "recurbow", "prob": 30 },
{ "item": "reflexrecurvebow", "prob": 10 }
]
},
{
"id": "SUS_hunting_rifle",
"type": "item_group",
"//": "items found in a rifle hunting space",
"subtype": "collection",
"entries": [
{ "item": "ar15", "prob": 150, "charges-min": 0, "charges-max": 30 },
{ "item": "marlin_9a", "prob": 20, "charges-min": 0, "charges-max": 19 },
{ "item": "remington700_270", "prob": 10, "charges-min": 0, "charges-max": 4 },
{ "item": "remington_700", "prob": 40, "charges-min": 0, "charges-max": 4 },
{ "item": "ruger_1022", "prob": 70, "charges-min": 0, "charges-max": 10 },
{ "item": "ruger_mini", "prob": 10, "charges-min": 0, "charges-max": 5 },
{ "item": "win70", "prob": 20, "charges-min": 0, "charges-max": 3 },
{ "item": "colt_lightning", "prob": 2, "charges-min": 0, "charges-max": 10 },
{ "item": "henry_big_boy", "prob": 2, "charges-min": 0, "charges-max": 10 },
{ "item": "weatherby_5", "prob": 2, "charges-min": 0, "charges-max": 3 }
]
},
{
"id": "hunting_lodge_weapons",
"type": "item_group",
"//": "items found in a shotgun hunting space",
"subtype": "distribution",
"entries": [
{ "group": "guns_shotgun_common", "prob": 30 },
{ "group": "SUS_hunting_rifle", "prob": 20 },
{ "group": "SUS_hunting_archery", "prob": 15 }
]
},
{
"id": "cannibal_weapons",
"type": "item_group",
"//": "items found in a shotgun hunting space",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"subtype": "distribution",
"entries": [
{ "group": "guns_shotgun_common", "prob": 30 },
{ "group": "SUS_hunting_rifle", "prob": 20 },
{ "group": "guns_smg_rare", "prob": 15 }
]
},
{
"id": "lodge_archery_ammo",
"type": "item_group",
"//": "archery ammo",
"subtype": "collection",
"entries": [
{ "item": "arrow_metal", "prob": 20 },
{ "item": "arrow_metal_bodkin", "prob": 20 },
{ "item": "arrow_metal_target", "prob": 30 },
{ "item": "arrow_cf", "prob": 10 }
]
},
{
"id": "cannibal_food",
"type": "item_group",
"subtype": "collection",
"entries": [
{ "item": "machete", "prob": 20 },
{ "group": "preserved_food", "custom-flags": [ "CANNIBALISM" ], "prob": 30 },
{ "group": "preserved_food", "prob": 20 },
{ "group": "dry_goods", "prob": 30 },
{ "group": "dry_goods", "custom-flags": [ "CANNIBALISM" ], "prob": 60 },
{ "group": "pantry", "prob": 10 }
]
}
]
180 changes: 180 additions & 0 deletions data/json/mapgen/hunting_lodge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "lodge_ground1", "lodge_ground2" ] ],
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
".%##W###W###W###W###+##W#################%......",
".*#c B#c B#B c#B c# #h s# >#*......",
".*Wd B#d B#B d#B d# #h T# W*......",
".*##=###=###=###=## ##=## #*......",
".*# #*......",
".*W W*......",
".*# YY YY AAAAAAAA a OOO >#*......",
".%########+######################## ###%......",
".*********G~~~~~~~~~~~~~~~~~~~~~~%# #***......",
"~~~~~~~~~~G~~~~~~~~~~~*############ #*........",
"oooooooooooooooo~~~~~~*w #%........",
"oooooooooooooooo~~~~~~*#Y w*........",
"ooooooooooooooooGGGGGGG+ ttttt bw*........",
"ooooooooooooooooGGGGGGG+ ttttt bw*........",
"oooooooooooooooo~~~~~G*#Y w*........",
"oooooooooooooooo~~~~~G*w w*........",
"~~~~~~~~~~~~~~~~~~~~~G*##### ########*........",
"~~~~~~~~~~~~~~~~~~~~~G***#<# #********........",
"~~~~~~~~~~~~~~~~%~~~~GGGG+ # #%****...........",
"......*###-###-###-######### #####*...........",
".....0*#UU URU URU URU #12C 5 F#*...........",
".....0*#R z C uW*...........",
".....0*#UU URU URU URU #3CC& 4CVuF#*...........",
"......%###-###-###-##########+######%..........."
],
"palettes": [ "lodge_palette" ],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": 29, "y": 4 } ],
"place_nested": [
{
"chunks": [ [ "lodge_pantry_15x15", 80 ], [ "lodge_cannibal_15x15", 20 ], [ "lodge_hunting_15x15", 50 ] ],
"x": 8,
"y": 9
}
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "lodge_2ndfloor1", "lodge_2ndfloor2" ] ],
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
" ##W###W###W###W###w##W################# ",
" # <# ",
" W W ",
" # # ",
" # # ",
" W W ",
" # <# ",
" ########w#######wwww#############www### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "lodge_2ndfloor_palette" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "lodge_basement_residential1", "lodge_basement_residential2" ] ],
"weight": 100,
"object": {
"fill_ter": "t_rock",
"rows": [
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
" % % ",
" % % ",
" % % ",
" % % ",
" % % ",
" % % ",
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% ",
" % % ",
" %%%%%%%%%%%%%% % ",
" % BB% ",
" % % ",
" % % ",
" % % ",
" % % ",
" % % ",
" %%%%% %%%%%%%% ",
" %<| % ",
" % + % ",
" %%%%%%% ",
" ",
" ",
" ",
" "
],
"palettes": [ "basement_residential" ],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": 7, "y": 4 } ],
"place_nested": [
{ "chunks": [ [ "lodge_game_6x6", 80 ], [ "lodge_dungeon_6x6", 20 ], [ "lodge_drug_6x6", 50 ] ], "x": 2, "y": 1 },
{ "chunks": [ [ "5x5_sauna_W", 30 ], [ "5x5_pool", 10 ], [ "5x5_gym_W", 60 ] ], "x": 24, "y": 1 },
{
"chunks": [ [ "room_6x6_woodworker", 5 ], [ "room_6x6_bike", 15 ], [ "room_6x6_office_E", 5 ] ],
"x": 24,
"y": 10
}
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "lodge_basement_laboratory_entrance" ],
"//": "doesn't work rebuild later",
"object": {
"fill_ter": "t_rock",
"rotation": [ 0, 3 ],
"rows": [
"##--------------------##",
"##| |>>| |##",
"##| |MM| |##",
"##| |..| |##",
"##| |..| |##",
"##| |..| |##",
"##| |..| |##",
"##| |..| |##",
"##|---+---|..|---+---|##",
"##|.......M..M.......|##",
"##|.......M..M.......|##",
"|----+----|..|----+----|",
"|.........|..|d.......d|",
"|.ccccccc.|..|xh..h..hx|",
"|.........|7.|d..dxd..d|",
"|---------|..|---------|",
"########--|LL6--########",
"########=,,,,,,=########",
"########=,,,,,,=########",
"########=,,,,,,=########",
"########===WW===########",
"##########=,,=##########",
"##########=<<=##########",
"##########====##########"
],
"palettes": [ "lab_palette" ],
"terrain": {
"=": "t_wall",
",": "t_rock_floor",
"6": "t_card_science",
"7": "t_rock_floor",
"<": "t_stairs_up",
">": "t_stairs_down"
},
"furniture": { "C": "f_centrifuge" },
"mapping": { "c": { "items": { "item": "chem_lab", "chance": 30 } }, "d": { "items": { "item": "office", "chance": 30 } } },
"monster": { "7": { "monster": "mon_turret_rifle" } },
"place_nested": [
{ "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 3, "y": 1 },
{ "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 14, "y": 1 }
]
}
}
]
Loading