Skip to content

Commit

Permalink
Merge pull request #77571 from GuardianDll/no_recurring_eocs
Browse files Browse the repository at this point in the history 
some eoc improvements
  • Loading branch information
@Maleclypse
Maleclypse authored Nov 9, 2024
2 parents 0651285 + 00f49dc commit 2b97b0a
Show file tree
Hide file tree
Showing 2 changed files with 212 additions and 267 deletions.
54 changes: 36 additions & 18 deletions data/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
{
"type": "effect_on_condition",
"id": "lab_security_check",
"recurrence": 1,
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [ { "u_at_om_location": "lab_1x1x2_RES_8_apartments_lower" }, { "not": { "u_has_item": "id_science_medical_red" } } ]
},
Expand All @@ -11,7 +12,8 @@
{
"type": "effect_on_condition",
"id": "lab_security_check_surface_3",
"recurrence": [ 5, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [ { "u_at_om_location": "lab_res_8_SWU_ground" }, { "not": { "u_has_item": "id_science_maintenance_green" } } ]
},
Expand All @@ -20,7 +22,8 @@
{
"type": "effect_on_condition",
"id": "lab_security_check_surface_2",
"recurrence": [ 5, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [ { "u_at_om_location": "lab_res_8_SWD_ground" }, { "not": { "u_has_item": "id_science_maintenance_green" } } ]
},
Expand All @@ -29,7 +32,8 @@
{
"type": "effect_on_condition",
"id": "lab_security_check_surface_1",
"recurrence": 1,
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [ { "u_at_om_location": "lab_CORE_2x1_WC_ground" }, { "not": { "u_has_item": "id_science_maintenance_green" } } ]
},
Expand All @@ -41,7 +45,8 @@
{
"type": "effect_on_condition",
"id": "lab_check_magenta_security_drop",
"recurrence": [ 3, 5 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [
{ "u_at_om_location": "lab_security_z-1" },
Expand All @@ -57,7 +62,8 @@
{
"type": "effect_on_condition",
"id": "lab_1x1x2_RES_8_check_SEC",
"recurrence": [ 5, 10 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [ { "u_at_om_location": "lab_1x1_RES_8_commons_SEC" }, { "not": { "u_has_item": "id_science_security_yellow" } } ]
},
Expand All @@ -66,7 +72,8 @@
{
"type": "effect_on_condition",
"id": "lab_1x1x2_RES_8_check_MAINT",
"recurrence": [ 5, 10 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [ { "u_at_om_location": "lab_1x1_RES_8_commons_MAINT" }, { "not": { "u_has_item": "id_science_maintenance_yellow" } } ]
},
Expand All @@ -75,7 +82,8 @@
{
"type": "effect_on_condition",
"id": "lab_concourse_bot_release",
"recurrence": [ 5, 10 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [
{ "u_at_om_location": "lab_CORE_2x1_1DN" },
Expand Down Expand Up @@ -104,7 +112,8 @@
{
"type": "effect_on_condition",
"id": "lab_concourse_bot_release_2",
"recurrence": [ 5, 10 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [
{ "u_at_om_location": "lab_CORE_2x1_2DN" },
Expand Down Expand Up @@ -133,21 +142,24 @@
{
"type": "effect_on_condition",
"id": "lab_magenta_security_check",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": { "and": [ { "u_at_om_location": "lab_security_z-5" }, { "not": { "u_has_item": "id_science_security_magenta" } } ] },
"effect": [ { "mapgen_update": "release_bots_4", "om_terrain": "lab_security_z-5" } ]
},
{
"type": "effect_on_condition",
"id": "lab_cyan_mutagen_check",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_2_NE" }, { "not": { "u_has_item": "id_science_mutagen_cyan" } } ] },
"effect": [ { "mapgen_update": "release_bots_5", "om_terrain": "lab_2x2_MUT_tier_2_NE" } ]
},
{
"type": "effect_on_condition",
"id": "lab_cyan_mutagen_check_2",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": {
"and": [ { "u_at_om_location": "lab_2x2_MUT_tier_2_NW_final_flr" }, { "not": { "u_has_item": "id_science_mutagen_cyan" } } ]
},
Expand All @@ -156,42 +168,48 @@
{
"type": "effect_on_condition",
"id": "lab_cyan_mutagen_check_3",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_2_SW" }, { "not": { "u_has_item": "id_science_mutagen_cyan" } } ] },
"effect": [ { "mapgen_update": "release_bots_7", "om_terrain": "lab_2x2_MUT_tier_2_SW" } ]
},
{
"type": "effect_on_condition",
"id": "lab_cyan_mutagen_check_4",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_2_SE" }, { "not": { "u_has_item": "id_science_mutagen_cyan" } } ] },
"effect": [ { "mapgen_update": "release_bots_8", "om_terrain": "lab_2x2_MUT_tier_2_SE" } ]
},
{
"type": "effect_on_condition",
"id": "lab_pink_mutagen_check",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_1_NE" }, { "not": { "u_has_item": "id_science_mutagen_pink" } } ] },
"effect": [ { "mapgen_update": "release_bots_5", "om_terrain": "lab_2x2_MUT_tier_1_NE" } ]
},
{
"type": "effect_on_condition",
"id": "lab_pink_mutagen_check_2",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_1_NW" }, { "not": { "u_has_item": "id_science_mutagen_pink" } } ] },
"effect": [ { "mapgen_update": "release_bots_6", "om_terrain": "lab_2x2_MUT_tier_1_NW" } ]
},
{
"type": "effect_on_condition",
"id": "lab_pink_mutagen_check_3",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_1_SW" }, { "not": { "u_has_item": "id_science_mutagen_pink" } } ] },
"effect": [ { "mapgen_update": "release_bots_7", "om_terrain": "lab_2x2_MUT_tier_1_SW" } ]
},
{
"type": "effect_on_condition",
"id": "lab_pink_mutagen_check_4",
"recurrence": [ 15, 30 ],
"eoc_type": "EVENT",
"required_event": "avatar_enters_omt",
"condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_1_SE" }, { "not": { "u_has_item": "id_science_mutagen_pink" } } ] },
"effect": [ { "mapgen_update": "release_bots_8", "om_terrain": "lab_2x2_MUT_tier_1_SE" } ]
}
Expand Down
Loading

0 comments on commit 2b97b0a

Please sign in to comment.