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

Add a drug lab #63403

Merged
merged 10 commits into from
Mar 18, 2023
Merged

Add a drug lab #63403

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5c41cce
Add the stuff
MNG-cataclysm Feb 2, 2023
693698d
Apply suggestions from code review
MNG-cataclysm Feb 2, 2023
08b7b00
Remove some stuff
MNG-cataclysm Feb 2, 2023
ad18db7
Remove mapgen weight
MNG-cataclysm Feb 2, 2023
f2739f8
Add fill_ter
MNG-cataclysm Feb 2, 2023
60fe60d
add some flags
MNG-cataclysm Feb 2, 2023
3de9677
Add a rotation
MNG-cataclysm Feb 6, 2023
d8f6d0f
remove a flag
MNG-cataclysm Feb 6, 2023
99e7848
Update data/json/overmap/overmap_special/specials.json
MNG-cataclysm Mar 11, 2023
e808456
Merge branch 'master' into drug_lab
MNG-cataclysm Mar 14, 2023
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
50 changes: 50 additions & 0 deletions data/json/mapgen/drug_lab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[
{
"method": "json",
"om_terrain": "drug_lab",
"type": "mapgen",
"weight": 100,
MNG-cataclysm marked this conversation as resolved.
Show resolved Hide resolved
"object": {
"predecessor_mapgen": "forest",
"rows": [
" ",
" ",
" ",
" ",
" ___ ",
" _c___ ",
" ___c_ ",
" _a___ ",
" _____ ",
" ________ ",
" |++|++|____ ",
" |ddddd|_____ ",
" |ddOdd|_____ ",
" |ddOdd| _ ",
" |tdddt| ",
" |tbdbt| ",
" |ttttt| ",
" ||||||| ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "moonshine_palette" ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 9, 14 ], "repeat": [ 2, 3 ] } ],
"items": {
" ": [ { "item": "trash", "chance": 1 }, { "item": "clutter_yard", "chance": 1 } ],
"t": [
{ "item": "hazmat_suits", "chance": 70 },
{ "item": "hazmat_masks", "chance": 70 },
{ "item": "mobile_meth_lab", "chance": 70 },
{ "item": "supplies_reagents_lab", "chance": 20 },
{ "item": "methlab", "chance": 90 }
]
}
}
}
]
10 changes: 10 additions & 0 deletions data/json/overmap/overmap_special/specials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4437,6 +4437,16 @@
"occurrences": [ 0, 3 ],
"flags": [ "CLASSIC", "WILDERNESS", "MAN_MADE" ]
},
{
"type": "overmap_special",
"id": "drug_lab",
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "drug_lab" } ],
"locations": [ "forest" ],
"city_distance": [ 20, 60 ],
"city_sizes": [ 8, -1 ],
"occurrences": [ 0, 2 ],
"flags": [ "CLASSIC", "WILDERNESS", "MAN_MADE" ]
MNG-cataclysm marked this conversation as resolved.
Show resolved Hide resolved
},
{
"id": "Railroad Station",
"type": "overmap_special",
Expand Down
8 changes: 8 additions & 0 deletions data/json/overmap/overmap_terrain/overmap_terrain.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,14 @@
"color": "i_cyan",
"see_cost": 5
},
{
"type": "overmap_terrain",
"id": "drug_lab",
"name": "drug lab",
"sym": "^",
"color": "brown",
"see_cost": 5
},
{
"type": "overmap_terrain",
"id": [
Expand Down