-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Spiral mine jsonify #48003
Merged
ZhilkinSerg
merged 61 commits into
CleverRaven:0.F-dev
from
Night-Pryanik:mine-tunnels-jsonify
Mar 14, 2021
Merged
Spiral mine jsonify #48003
Changes from all commits
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
d793a43
Created separate file for mine overmap specials and moved definition …
Night-Pryanik b945eee
Fixed hardcoded tunnels not spawning
Night-Pryanik d70a241
Added pillar terrain
Night-Pryanik 823fb55
Added pillars to lower section of mine shaft
Night-Pryanik be9f399
Added overmap terrain definitions for spiral mine variant
Night-Pryanik 21aa342
Created Spiral mine overmap special
Night-Pryanik 056a481
Added nested mapgen for mine locations
Night-Pryanik 79f65a7
Added spiral madman NPC and its responses
Night-Pryanik 8d9ae6b
Added Spiral mine mapgen
Night-Pryanik ef4aca8
Moved spiral and spiral_hub OMTs to obsolete terrain list
Night-Pryanik d2079ef
Removed spiral and spiral_hub OMTs from mods
Night-Pryanik 67234a2
Removed all mentions of old hardcoded spiral and spiral hub mapgen
Night-Pryanik c0697f5
Valentine Cards (#47438)
Maleclypse fd263ed
Add a proficiency for handloading, and a new profession (#47244)
e7011f7
Drug Dealer Profession (#47255)
slimeboy460 e03e778
Adds hallula, a type of bread popular in Bolivia and Chile
ToxiClay 005caf8
Arm mounted pouch (#46946)
Jamuro-g ec6e6c1
Tazer drone iii (#47353)
79f615c
Added Gelatin and Several Gelatin Based Recipes (#47080)
GrubGrubgit f38b0aa
Content: bread in a can (#45680)
Xaleth 14c7a89
New random mission (#44999)
El-Jekozo 23fb60e
Mycus fruit Juice (#44952)
Chambs-15 7602a6e
Milleable corn (#46254)
Zukulini 71b9a8b
Talk Tag Additions (#47010)
klorpa 208b9f6
Fix typo in Valentines Card (#47583)
UmbralReaper be9bdaa
(CrazyCataclysm) Crazy Hallucinations (#47386)
SariusSkelrets f43a8d8
Mealgurb (#47685)
Fosheze 3b5ab3b
Add duct tape blindfold for old reciepe plus tweaks for reciepe (#47527)
Lamandus 8477818
Prepare npc, spell, character, and item for new ai (#47207)
KorGgenT 3988f39
Make acetylene torch cut metal walls. (#46255)
NeviNovat cd4dbb8
Added disassembly recipes for several items (#46316)
Karol1223 1e94713
Celsius temperature for freezing point (#47028)
Hirmuolio 4a44956
Stand up peek (#47257)
Moltenhead e641428
[AFTERSHOCK] Basic Ballistic Weapons (#47559)
Mom-Bun e2f00cf
makes glass walls and glass doors constructable (#47692)
OromisElf 215da75
Crackers as bread and jam&cheese sandwich (#47649)
Maleclypse f96b96d
[Aftershock] misc typograpical fixes (#47783)
casswedson 7225311
Tweaks for teas (#47848)
Lamandus c3d1540
Have travis run for 0.F-dev
actual-nh 7044406
Tweakes to copper and metal pipes. (#47825)
Lamandus 195fe40
Fried eggs deluxe, sandwiches, and condiment list (#47786)
Maleclypse f49d2c5
Homemade toastems, buttercream frosting and recipes (#47696)
Maleclypse fca63de
Chocolate Cow don't drop "cow pies"
c5d362a
Remove unused FATIGUE energy source from spells
5b101f1
[Magiclysm] add owlbear origin snippet (#47752)
KorGgenT a25422c
[Magiclysm] add lesser banishment spell, buff greater banishment (#47…
KorGgenT 0728b18
Unhardcode bio_heatsink and bio_climate
Ramza13 4f1fca0
Hunting lodge Location (#44378)
Maleclypse 432d078
fungal evolution (#47247)
LyleSY 714767d
Add book strap carrier (#47665)
FuelType-Memes 68abdd9
Partial mine jsonify; new zombie miner (#47790)
Night-Pryanik 2d3e9d9
Add 0.F-dev to matrix.yml
actual-nh 7a5f2dc
0.F-dev workflows (#47875)
actual-nh 9574872
Alter brown bread recipe to match canned version
actual-nh 34a2af5
Mine entrance expand (#47928)
Night-Pryanik d7c6292
[DinoMod] Mushroom Madness (#47907)
LyleSY 2a0ebcb
misc typograpical fixes
casswedson 744ea57
body pillow recipe makes makeshift body pillow now (#47917)
OromisElf 2d53283
Apply suggestion from code review
Night-Pryanik 42df336
Merge branch '0.F-dev' into mine-tunnels-jsonify
Night-Pryanik de634c7
Merge branch '0.F-dev' into mine-tunnels-jsonify
ZhilkinSerg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| [ | ||
| { | ||
| "type": "monstergroup", | ||
| "name": "GROUP_MINER", | ||
| "default": "mon_zombie_miner", | ||
| "monsters": [ ] | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "om_terrain": [ [ "mine_spiral_west", "mine_spiral_central", "mine_spiral_east" ] ], | ||
| "object": { | ||
| "fill_ter": "t_rock_floor", | ||
| "rows": [ | ||
| "########################################################################", | ||
| "@@@@@@@@@@@@@@@@@@@@@@@@@###############################################", | ||
| "@ @###############################################", | ||
| "@ ##################### @###############################################", | ||
| "@ #@@@@@@@@@@@@@@@@@@@# @###############################################", | ||
| "@ #@ @# @###############################################", | ||
| "@ #@ ############### @# @###############################################", | ||
| "@ #@ #@@@@@@@@@@@### @# @###############################################", | ||
| "@ #@ #@ ># @# @###############################################", | ||
| "@ #@ #@ @@@@@@@@@### @# @###############################################", | ||
| "@ #@ #@ ############ @# @###############################################", | ||
| "@ #@ #@ @# @###############################################", | ||
| "@ #@ #@@@@@@@@@@@@@@@@# @#####################@@@@@@@@@@@@@@@@@@@@@@@@@@", | ||
| "@ #@ ################## @#####################! @@@@@@@@@@@!@@@@@@@@@@ !", | ||
| "@ #@ @##################### ", | ||
| "@ #@@@@@@@@@@@@@@@@########################### ", | ||
| "@ ############################################**************************", | ||
| "@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@## #### ", | ||
| "@ # ## ", | ||
| "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@##### ! @@@@@@@@@@!@@@@@@@@@@ !", | ||
| "###############################################@@@@@@@@@@@@@@@@@@@@@@@@@", | ||
| "########################################################################", | ||
| "########################################################################", | ||
| "########################################################################" | ||
| ], | ||
| "terrain": { | ||
| "@": [ [ "t_rock", 4 ], [ "t_rock_floor", 1 ] ], | ||
| "#": "t_rock", | ||
| "*": "t_railroad_track_small", | ||
| "!": "t_pillar", | ||
| ">": "t_slope_down" | ||
| }, | ||
| "items": { " ": { "item": "mine_equipment", "chance": 1 } }, | ||
| "monsters": { " ": { "monster": "GROUP_MINER", "chance": 1, "density": 0.001 } } | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "om_terrain": [ | ||
| [ "mine_spiral_-1_nw", "mine_spiral_-1_n", "mine_spiral_-1_ne" ], | ||
| [ "mine_spiral_-1_sw", "mine_spiral_-1_s", "mine_spiral_-1_se" ] | ||
| ], | ||
| "object": { | ||
| "fill_ter": "t_rock_floor", | ||
| "rows": [ | ||
| "####################################@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", | ||
| "####################################@ @", | ||
| "########@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 1 1 ###### @", | ||
| "########@ # @", | ||
| "########@ @@@@@@@@@@@@@@@@@@@@@@@@@@@ # #### @", | ||
| "########@ @##################@######@ # #~ # @", | ||
| "########@ @# @######@ # # @", | ||
| "########@ @# @@@@@@@@@@@@@@@ @######@ ###### @", | ||
| "########@ @# @#############@ @######@ @", | ||
| "########@ @# @####< #@ @######@ @", | ||
| "########@ @# @########### #@ @######@ @", | ||
| "########@ @# @@@@@@@@@@@@ #@ @######@ 1 1 1 @", | ||
| "########@ @# #@ @######@ @", | ||
| "########@ @################@ @######@ @", | ||
| "########@ @@@@@@@@@@@@@@@@@@ @######@ @", | ||
| "########@ @######@ @", | ||
| "########@@@@@@@@@@@@@@@@@@@@@@######@ @", | ||
| "####################################@ @", | ||
| "####################################@@@@@@@@@@@@@@@@@@@@@@@ @", | ||
| "##########################################################@ @", | ||
| "##########################################################@ @", | ||
| "#####@@@@@@@@@@@@@@@@@@####@@@@@@@@@@@@@@@@@@@############@ @", | ||
| "##### #### @############@ @", | ||
| "##### #### #### #### ############@ @", | ||
| "#####%%%%%%######%%%%%%####!!!!!!######$$$$$$ ############@ @", | ||
| "#####% ###### %####! ##### $ ############@ @", | ||
| "#####% %%%%######%%%% %####! !!!!##### $$$$ $ ############@ @", | ||
| "#####% % %######% % %####! ! !##### $ >$ $ ############@ @", | ||
| "#####% %######% %####! !##### $ $ ############@ @", | ||
| "#####%%%%%%######%%%%%%####!!!!!!##### $$$$$$ ############@ @", | ||
| "#### ###### ## ##### ############@ @", | ||
| "### ###### @####@ @############@ @", | ||
| "#@ @@@@@@@######@@@@@@@@@@@@@@@@@####@@@@@@@@############@ @", | ||
| "#@ @#####################################################@ @", | ||
| "#@ @####################################################### @", | ||
| "#@ @@@@@@@######@@@@@@@@@@@@@@@@######@@@@@@@@@@@@@@@@@@@### @", | ||
| "### ###### ###### ## @", | ||
| "#### ###### ## ###### ### #### ##", | ||
| "##### ###### #### ###### ##### ###### ###", | ||
| "#####^^^^^^######^^^^^^####&&&&&&######&&&&&&######******######******###", | ||
| "#####^ ###### ^####& ###### &######* ###### *###", | ||
| "#####^ ^^^^######^^^^ ^####& &&&&######&&&& &######* ****######**** *###", | ||
| "#####^ ^ ^######^ ^ ^####& & &######& & &######* * *######* * *###", | ||
| "#####^ ^######^ ^####& &######& &######* *######* *###", | ||
| "#####^^^^^^######^^^^^^####&&&&&&######&&&&&&######******######******###", | ||
| "##### #### #### #### ###### ###### ###", | ||
| "##### @##@ @####@ ###", | ||
| "#####@@@@@@@@@@@@@@@@@@@##@@@@@@@@@@@@@@@@@@@@####@@@@@@@@@@@@@@@@@@@###" | ||
| ], | ||
| "terrain": { | ||
| "@": [ [ "t_rock", 4 ], [ "t_rock_floor", 1 ] ], | ||
Night-Pryanik marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "#": "t_rock", | ||
| ">": "t_slope_down", | ||
| "<": "t_slope_up", | ||
| "$": "t_lava" | ||
| }, | ||
| "furniture": { "&": "f_wreckage", "^": "f_rubble", "%": "f_rubble_rock", "!": "f_rubble_landfill" }, | ||
| "nested": { | ||
| "1": { "chunks": [ [ "spiral_cw", 25 ], [ "spiral_ccw", 25 ], [ "spiral_boulder_cw", 25 ], [ "spiral_boulder_ccw", 25 ] ] } | ||
| }, | ||
| "item": { "*": { "item": "rock", "chance": 100 } }, | ||
| "npcs": { "~": { "class": "spiral_madman" } } | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "om_terrain": [ | ||
| [ "mine_spiral_finale_nw", "mine_spiral_finale_n", "mine_spiral_finale_ne" ], | ||
| [ "mine_spiral_finale_sw", "mine_spiral_finale_s", "mine_spiral_finale_se" ] | ||
| ], | ||
| "object": { | ||
| "fill_ter": "t_rock_floor", | ||
| "rows": [ | ||
| "###### 1 1 1 1 1 1 1 1 ", | ||
| "# ", | ||
| "# #### ", | ||
| "# #! # ", | ||
| "# # ", | ||
| "###### ", | ||
| " ", | ||
| " ###### ", | ||
| " # ", | ||
| " #### # ", | ||
| " # !# # ", | ||
| " # # ", | ||
| " ###### ", | ||
| " ", | ||
| "###### 1 1 1 1 1 1 ###### ", | ||
| "# # ", | ||
| "# #### #### # ", | ||
| "# #! # # # # ", | ||
| "# # # # ", | ||
| "###### ###### ", | ||
| " ", | ||
| "###### ###### ###### ", | ||
| "# # # ", | ||
| "# #### #### # #### # ", | ||
| "# # # # !# # # # # ", | ||
| "# # # # # # ", | ||
| "###### ###### ###### ", | ||
| " < ", | ||
| "###### 1 ###### 1 1 1 ###### ", | ||
| "# # # ", | ||
| "# #### # #### #### # ", | ||
| "# #! # # #! # # # # ", | ||
| "# # # # # # ", | ||
| "###### ###### ###### ", | ||
| " ", | ||
| "###### ###### ", | ||
| "# # ", | ||
| "# #### #### # ", | ||
| "# # # # !# # ", | ||
| "# # # # ", | ||
| "###### ###### ", | ||
| " ", | ||
| "###### 1 1 1 1 1 1 1 1 ", | ||
| "# ", | ||
| "# #### ", | ||
| "# #! # ", | ||
| "# # ", | ||
| "###### " | ||
| ], | ||
| "terrain": { "@": [ [ "t_rock", 4 ], [ "t_rock_floor", 1 ] ], "#": "t_rock", "<": "t_slope_up" }, | ||
| "monsters": { " ": { "monster": "GROUP_SPIRAL", "chance": 1, "density": 0.001 } }, | ||
| "nested": { "1": { "chunks": [ [ "spiral_cw", 50 ], [ "spiral_ccw", 50 ] ] } }, | ||
| "items": { "!": { "item": "spiral", "chance": 60 } } | ||
| } | ||
| } | ||
| ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| [ | ||
| { | ||
| "type": "palette", | ||
| "id": "mine_palette", | ||
| "terrain": { "#": "t_rock", " ": "t_rock_floor", "$": "t_rock_floor" }, | ||
| "furniture": { "$": "f_boulder_large" } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "spiral_cw", | ||
| "object": { | ||
| "palettes": [ "mine_palette" ], | ||
| "mapgensize": [ 6, 6 ], | ||
| "rows": [ | ||
| "######", | ||
| " #", | ||
| "#### #", | ||
| "# # #", | ||
| "# #", | ||
| "######" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "spiral_ccw", | ||
| "object": { | ||
| "palettes": [ "mine_palette" ], | ||
| "mapgensize": [ 6, 6 ], | ||
| "rows": [ | ||
| "######", | ||
| "# ", | ||
| "# ####", | ||
| "# # #", | ||
| "# #", | ||
| "######" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "spiral_boulder_cw", | ||
| "object": { | ||
| "palettes": [ "mine_palette" ], | ||
| "mapgensize": [ 6, 6 ], | ||
| "rows": [ | ||
| "$$$$$$", | ||
| " $", | ||
| "$$$$ $", | ||
| "$ $ $", | ||
| "$ $", | ||
| "$$$$$$" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "nested_mapgen_id": "spiral_boulder_ccw", | ||
| "object": { | ||
| "palettes": [ "mine_palette" ], | ||
| "mapgensize": [ 6, 6 ], | ||
| "rows": [ | ||
| "$$$$$$", | ||
| "$ ", | ||
| "$ $$$$", | ||
| "$ $ $", | ||
| "$ $", | ||
| "$$$$$$" | ||
| ] | ||
| } | ||
| } | ||
| ] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something in US-ASCII would probably be preferable, since people's systems are going to differ on how to interpret this (what do you see it as? I see a capital N with a superscripted, underlined o) and editing it may be a difficulty (I know it would be for me).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm actively using unicode characters, see #46726 for example, where there are LOTS of them. I know it's making direct editing a bit harder, but there are many advantages of using such characters, so it's fully justified, at least for me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Understand; you did kind of run out of US-ASCII characters for that one...