Skip to content

Commit

Permalink
Microlab Modernization I: Parametrized Microlab Foes (CleverRaven#74608)
Browse files Browse the repository at this point in the history
* Star-Crowned Hound of tindalos

Like the normal ones but scarier.

* Basic combat Yrax

* Parametrized microlab foes

* Update data/json/monsters/yrax.json

* Fix plurals, grammar.

* Update yrax.json

---------

Co-authored-by: Maleclypse <[email protected]>
  • Loading branch information
John-Candlebury and Maleclypse authored Jun 29, 2024
1 parent 5d71f29 commit 40ad1ea
Show file tree
Hide file tree
Showing 9 changed files with 485 additions and 20 deletions.
16 changes: 16 additions & 0 deletions data/json/items/corpses/dead_yrax.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@
"flags": [ "TRADER_AVOID", "NO_REPAIR" ],
"melee_damage": { "bash": 20, "cut": 15 }
},
{
"type": "GENERIC",
"id": "broken_yrax_triakis",
"symbol": ",",
"color": "light_gray",
"name": { "str_sp": "triakis remains" },
"category": "other",
"description": "Its broken shell reveals an interior made from a single piece of quartz, intricately carved into a series of nested tetrahedra.",
"price": "10 USD",
"material": [ "steel", "yrax_quartz" ],
"volume": "119 L",
"weight": "221 kg",
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ],
"melee_damage": { "bash": 20, "cut": 15 }
},
{
"id": "broken_golden_monolith",
"type": "GENERIC",
Expand Down
3 changes: 2 additions & 1 deletion data/json/mapgen/microlab/microlab_generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"x": 0,
"y": 0
},
{ "chunks": [ { "param": "unique_foe", "fallback": "nmn_more_density" } ], "x": 0, "y": 0 },
{ "else_chunks": [ "concrete_corner" ], "x": 0, "y": 0, "neighbors": { "north_west": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 23, "y": 0, "neighbors": { "north_east": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 23, "y": 23, "neighbors": { "south_east": "microlab" } },
Expand All @@ -31,7 +32,7 @@
"chance": 80,
"x": [ 0, 23 ],
"y": [ 0, 23 ],
"repeat": [ 10, 20 ]
"repeat": [ 2, 7 ]
}
]
}
Expand Down
33 changes: 17 additions & 16 deletions data/json/mapgen/microlab/microlab_generic_edge.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"x": 0,
"y": 0
},
{ "chunks": [ { "param": "unique_foe", "fallback": "mnm_more_density" } ], "x": 0, "y": 0 },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
Expand All @@ -59,7 +60,7 @@
"chance": 80,
"x": [ 0, 23 ],
"y": [ 0, 23 ],
"repeat": [ 10, 20 ]
"repeat": [ 1, 5 ]
}
]
}
Expand Down Expand Up @@ -234,7 +235,7 @@
" c 6|^ dh= = hdhB|c ",
" c c|||||| |||||||c ",
" c c| 2 2 F|c ",
" | | | | "
" | | | || "
],
"palettes": [ "microlab" ]
}
Expand All @@ -246,7 +247,7 @@
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" | | | | ",
" |UUUU| | | ",
" U|||||||| |tt 2 ",
" U|D@D@D@| |||||||||||",
" U| @ @ @| htth ^V |",
Expand All @@ -269,7 +270,7 @@
" U| @ @ @| | |U ",
" U|D@D@D@| |@ h|U ",
" U|||||||| |@D t|U ",
" | | ||||||| "
" |UUUU| ||||||| "
],
"palettes": [ "microlab" ]
}
Expand Down Expand Up @@ -316,9 +317,9 @@
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" | | | ",
" U h U| |U U|U ",
" U ccc U| |U U|U |",
" | | ",
" U h U| |U U|U ",
" U ccc U| |U U|U |",
" ||||||||22|U |",
" 2 2 |6h UU |",
"||||((((((( |||||||((2|",
Expand All @@ -338,8 +339,8 @@
" Uc UU( | R|U ",
" c 2 |yyyyy|U ",
" c ( | |U ",
" c |c cc c| | |U ",
" | | ||||||| "
" c |cc c| | |U ",
" | | ||||||| "
],
"palettes": [ "microlab" ]
}
Expand Down Expand Up @@ -408,8 +409,8 @@
" U| YY|22(((|U ",
" U| YY| cc6|U ",
" U|2|||2||22| h |U ",
" | c|U U| |FFFFF|U ",
" | | ||||||| "
" |U U| |FFFFF|U ",
" |U U| ||||||| "
],
"palettes": [ "microlab" ]
}
Expand Down Expand Up @@ -442,9 +443,9 @@
"|2|| |||2| | 6|((2|",
" U| YY|22(((|6 ",
" U| YY| 666|c ",
" U|2|||2||22| h |c ",
" | c|U U| |^BBB^|U ",
" | | ||||||| "
" U|||||2||22| h |c ",
" i|U U| |^BBB^|U ",
" c|U U| ||||||| "
],
"palettes": [ "microlab" ]
}
Expand Down Expand Up @@ -478,8 +479,8 @@
" U| Y^|22(((|6 ",
" U| ^^ Y^| 666|c ",
" U|2|||2||2|| h |c ",
" U |UU U| |^BBB^|U ",
" | | ||||||| "
" i|U U| |^BBB^|U ",
" c|U U| ||||||| "
],
"palettes": [ "microlab" ]
}
Expand Down
6 changes: 5 additions & 1 deletion data/json/mapgen/microlab/microlab_hallway.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"x": 0,
"y": 0
},
{ "chunks": [ { "param": "unique_foe", "fallback": "mnm_more_density" } ], "x": 0, "y": 0 },
{
"chunks": [
{
Expand All @@ -35,7 +36,7 @@
"chance": 80,
"x": [ 0, 23 ],
"y": [ 0, 23 ],
"repeat": [ 2, 5 ]
"repeat": [ 0, 1 ]
}
]
}
Expand All @@ -48,6 +49,7 @@
"fill_ter": "t_strconc_floor",
"place_nested": [
{ "chunks": [ "microlab_generic_hallway_curved_tile" ], "x": 0, "y": 0 },
{ "chunks": [ { "param": "unique_foe", "fallback": "mnm_more_density" } ], "x": 0, "y": 0 },
{ "else_chunks": [ "concrete_corner" ], "x": 0, "y": 0, "neighbors": { "north_west": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 23, "y": 0, "neighbors": { "north_east": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 23, "y": 23, "neighbors": { "south_east": "microlab" } },
Expand Down Expand Up @@ -75,6 +77,7 @@
"fill_ter": "t_strconc_floor",
"place_nested": [
{ "chunks": [ "microlab_generic_hallway_tee_tile" ], "x": 0, "y": 0 },
{ "chunks": [ { "param": "unique_foe", "fallback": "mnm_more_density" } ], "x": 0, "y": 0 },
{ "else_chunks": [ "concrete_corner" ], "x": 0, "y": 0, "neighbors": { "north_west": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 23, "y": 0, "neighbors": { "north_east": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 23, "y": 23, "neighbors": { "south_east": "microlab" } },
Expand Down Expand Up @@ -102,6 +105,7 @@
"fill_ter": "t_strconc_floor",
"place_nested": [
{ "chunks": [ "microlab_generic_hallway_four_way_tile" ], "x": 0, "y": 0 },
{ "chunks": [ { "param": "unique_foe", "fallback": "mnm_more_density" } ], "x": 0, "y": 0 },
{ "else_chunks": [ "concrete_corner" ], "x": 0, "y": 0, "neighbors": { "north_west": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 23, "y": 0, "neighbors": { "north_east": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 23, "y": 23, "neighbors": { "south_east": "microlab" } },
Expand Down
3 changes: 2 additions & 1 deletion data/json/mapgen/microlab/microlab_hallway_start.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"fill_ter": "t_strconc_floor",
"place_nested": [
{ "chunks": [ "microlab_generic_end_tile" ], "x": 0, "y": 0 },
{ "chunks": [ { "param": "unique_foe", "fallback": "mnm_more_density" }, "null" ], "x": 0, "y": 0 },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
Expand All @@ -25,7 +26,7 @@
"chance": 80,
"x": [ 0, 23 ],
"y": [ 0, 23 ],
"repeat": [ 2, 5 ]
"repeat": [ 0, 3 ]
}
]
}
Expand Down
Loading

0 comments on commit 40ad1ea

Please sign in to comment.