Skip to content

Commit

Permalink
Isolation protocol: Timer and map updates (#75088)
Browse files Browse the repository at this point in the history
* Remove firebreaks from generic levels

s

* Slightly increase the danger timer
  • Loading branch information
John-Candlebury authored Jul 23, 2024
1 parent 05c462a commit 302ed6e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 30 deletions.
8 changes: 4 additions & 4 deletions data/mods/Isolation-Protocol/EOC/danger_clock_eoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"id": "ISO_DANGER_LEVEL_SPAWNER",
"recurrence": "5 minutes",
"global": true,
"condition": { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "20" ] },
"condition": { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "25" ] },
"effect": [
{
"u_spawn_monster": "mon_hound_tindalos",
"u_spawn_monster": "mon_tindalos",
"real_count": 2,
"min_radius": 20,
"max_radius": 40,
Expand All @@ -27,7 +27,7 @@
"run_eocs": [
{
"id": "ISO_CURRENT_LEVEL_DANGER_medium",
"condition": { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "15" ] },
"condition": { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "20" ] },
"effect": [
{
"u_spawn_monster": "mon_darkman",
Expand All @@ -42,7 +42,7 @@
"run_eocs": [
{
"id": "ISO_CURRENT_LEVEL_DANGER_low",
"condition": { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "10" ] },
"condition": { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "15" ] },
"effect": [
{
"u_spawn_monster": "mon_shadow",
Expand Down
21 changes: 0 additions & 21 deletions data/mods/Isolation-Protocol/Map/levels/microlab_small_level.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,27 +100,6 @@
[ { "overmap": "hallway_curve", "max": { "poisson": 0.5, "bounds": [ 0, 1 ] } } ],
[ { "overmap": "hallway_straight", "max": { "poisson": 0.7, "bounds": [ 1, 3 ] } } ],
[ { "overmap": "hallway_cross", "max": { "poisson": 0.5, "bounds": [ 0, 1 ] } } ],
[
{
"name": "subway_chunk_at_-2",
"chunk": [
{ "overmap": "firebreak", "pos": [ 0, 0, 0 ], "rot": "east" },
{ "overmap": "hallway_straight", "pos": [ 1, 0, 0 ], "rot": "east" },
{ "overmap": "hallway_straight", "pos": [ -1, 0, 0 ], "rot": "east" },
{ "overmap": "special_rock", "pos": [ 0, 1, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, 2, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, 3, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, 4, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, 5, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, -1, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, -2, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, -3, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, -4, 0 ] },
{ "overmap": "special_rock", "pos": [ 0, -5, 0 ] }
],
"max": { "poisson": 0.5, "bounds": [ 0, 1 ] }
}
],
[ { "overmap": "hallway_straight", "max": { "poisson": 3 } } ],
[ { "overmap": "iso_next_level_elevator", "max": 1 } ],
[ { "overmap": "hallway_end", "weight": 1 } ],
Expand Down
10 changes: 5 additions & 5 deletions data/mods/Isolation-Protocol/ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
{
"id": "iso_danger",
"type": "widget",
"label": "Location normality",
"label": "Ambient normality:",
"style": "text",
"clauses": [
{
Expand All @@ -53,7 +53,7 @@
"condition": {
"and": [
{ "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "0" ] },
{ "math": [ "u_ISO_CURRENT_LEVEL_DANGER", "<", "10" ] },
{ "math": [ "u_ISO_CURRENT_LEVEL_DANGER", "<", "15" ] },
{
"not": { "or": [ { "u_at_om_location": "iso_hallway_safe" }, { "u_at_om_location": "iso_elevator_safe" } ] }
}
Expand All @@ -65,22 +65,22 @@
"text": "Distorted",
"color": "dark_gray",
"condition": {
"and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "10" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", "<", "15" ] } ]
"and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "15" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", "<", "15" ] } ]
}
},
{
"id": "bad",
"text": "Unstable",
"color": "magenta",
"condition": {
"and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "15" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", "<", "20" ] } ]
"and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "20" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", "<", "20" ] } ]
}
},
{
"id": "vbad",
"text": "Unraveling",
"color": "pink",
"condition": { "and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "20" ] } ] }
"condition": { "and": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", ">=", "25" ] } ] }
}
]
}
Expand Down

0 comments on commit 302ed6e

Please sign in to comment.