Skip to content

Commit

Permalink
Organize the remaining unorganized EOCs (#68940)
Browse files Browse the repository at this point in the history 
* Organize the stuff

* Update FREQUENTLY_MADE_SUGGESTIONS.md

* Revert "Update FREQUENTLY_MADE_SUGGESTIONS.md"

This reverts commit 0ca0c05.

* Update FREQUENTLY_MADE_SUGGESTIONS.md

* Organize the lab eocs

* Opps, rename

* try to fix some weirdness with Github
  • Loading branch information
@MNG-cataclysm
MNG-cataclysm authored Oct 31, 2023
1 parent cf6fe32 commit 6942b2f
Show file tree
Hide file tree
Showing 6 changed files with 201 additions and 197 deletions.
169 changes: 0 additions & 169 deletions ...ests_modular/lab_effect_on_condition.json → ...ondition/mapgen_eocs/lab_mapgen_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@
},
"effect": { "mapgen_update": "release_the_bots", "om_terrain": "lab_health_z-3_A" }
},
{
"//": "Opens bot release if you lack a red science ID card.",
"type": "mapgen",
"update_mapgen_id": "release_the_bots",
"method": "json",
"object": { "place_terrain": [ { "ter": "t_thconc_r", "x": 5, "y": 0 } ] }
},
{
"type": "effect_on_condition",
"id": "lab_security_check_surface_3",
Expand All @@ -33,20 +26,6 @@
},
"effect": { "mapgen_update": "release_the_bots_2", "om_terrain": "lab_res_8_SED_ground" }
},
{
"//": "Opens bot release if you lack a green maintenance ID card.",
"type": "mapgen",
"update_mapgen_id": "release_the_bots_2",
"method": "json",
"object": {
"place_terrain": [
{ "ter": "t_thconc_r", "x": 7, "y": 0 },
{ "ter": "t_thconc_r", "x": 11, "y": 0 },
{ "ter": "t_thconc_r", "x": 15, "y": 0 },
{ "ter": "t_thconc_r", "x": 19, "y": 0 }
]
}
},
{
"type": "effect_on_condition",
"id": "lab_security_check_surface_1",
Expand All @@ -59,34 +38,6 @@
{ "mapgen_update": "open_walls_garage", "om_terrain": "lab_CORE_2x1_WC_ground" }
]
},
{
"//": "Opens bot release if you lack a green maintenance ID card.",
"type": "mapgen",
"update_mapgen_id": "release_bots_garage",
"method": "json",
"object": {
"place_terrain": [
{ "ter": "t_thconc_r", "x": 10, "y": 8 },
{ "ter": "t_thconc_r", "x": 10, "y": 9 },
{ "ter": "t_thconc_r", "x": 10, "y": 14 },
{ "ter": "t_thconc_r", "x": 10, "y": 15 }
]
}
},
{
"//": "Opens walls for bot pathing if you lack a green maintenance ID card.",
"type": "mapgen",
"update_mapgen_id": "open_walls_garage",
"method": "json",
"object": {
"place_terrain": [
{ "ter": "t_thconc_r", "x": 0, "y": 1 },
{ "ter": "t_thconc_r", "x": 0, "y": 2 },
{ "ter": "t_thconc_r", "x": 0, "y": 21 },
{ "ter": "t_thconc_r", "x": 0, "y": 22 }
]
}
},
{
"type": "effect_on_condition",
"id": "lab_check_magenta_security_drop",
Expand All @@ -105,16 +56,6 @@
{ "u_add_var": "valid_security_employee", "type": "check", "context": "trap trigger", "value": "yes" }
]
},
{
"//": "Spawns a special monster fight and ID badge spwan if you have the yellow security badge.",
"type": "mapgen",
"update_mapgen_id": "magenta_security_card_spawn",
"method": "json",
"object": {
"place_loot": [ { "item": "id_science_security_magenta", "x": 21, "y": 14, "chance": 20 } ],
"place_monster": [ { "monster": [ "mon_zombie_brute", "mon_zombie_bio_op" ], "x": 21, "y": 14, "chance": 100 } ]
}
},
{
"type": "effect_on_condition",
"id": "lab_1x1x2_RES_8_check_SEC",
Expand All @@ -124,19 +65,6 @@
},
"effect": [ { "mapgen_update": "release_bots_3", "om_terrain": "lab_1x1_RES_8_commons_SEC" } ]
},
{
"//": "Opens bot release if you lack a yellow security ID card.",
"type": "mapgen",
"update_mapgen_id": "release_bots_3",
"method": "json",
"object": {
"place_terrain": [
{ "ter": "t_thconc_r", "x": 1, "y": 17 },
{ "ter": "t_thconc_r", "x": 14, "y": 21 },
{ "ter": "t_thconc_r", "x": 15, "y": 21 }
]
}
},
{
"type": "effect_on_condition",
"id": "lab_1x1x2_RES_8_check_MAINT",
Expand All @@ -146,19 +74,6 @@
},
"effect": [ { "mapgen_update": "release_bots_3", "om_terrain": "lab_1x1_RES_8_commons_MAINT" } ]
},
{
"//": "Opens bot release if you lack a yellow (ocher) security ID card.",
"type": "mapgen",
"update_mapgen_id": "release_bots_3",
"method": "json",
"object": {
"place_terrain": [
{ "ter": "t_thconc_r", "x": 1, "y": 17 },
{ "ter": "t_thconc_r", "x": 14, "y": 21 },
{ "ter": "t_thconc_r", "x": 15, "y": 21 }
]
}
},
{
"type": "effect_on_condition",
"id": "lab_concourse_bot_release",
Expand Down Expand Up @@ -188,28 +103,6 @@
},
"effect": [ { "mapgen_update": "release_bots_concourse", "om_terrain": "lab_CORE_2x1_1DN" } ]
},
{
"//": "Opens bot release if you have no ID badges.",
"type": "mapgen",
"update_mapgen_id": "release_bots_concourse",
"method": "json",
"object": {
"place_terrain": [
{ "ter": "t_thconc_r", "x": 15, "y": 3 },
{ "ter": "t_thconc_r", "x": 15, "y": 4 },
{ "ter": "t_thconc_r", "x": 16, "y": 4 },
{ "ter": "t_thconc_r", "x": 16, "y": 5 },
{ "ter": "t_thconc_r", "x": 17, "y": 5 },
{ "ter": "t_thconc_r", "x": 17, "y": 6 },
{ "ter": "t_thconc_r", "x": 15, "y": 20 },
{ "ter": "t_thconc_r", "x": 15, "y": 19 },
{ "ter": "t_thconc_r", "x": 16, "y": 19 },
{ "ter": "t_thconc_r", "x": 16, "y": 18 },
{ "ter": "t_thconc_r", "x": 17, "y": 18 },
{ "ter": "t_thconc_r", "x": 17, "y": 17 }
]
}
},
{
"type": "effect_on_condition",
"id": "lab_concourse_bot_release_2",
Expand Down Expand Up @@ -239,61 +132,20 @@
},
"effect": [ { "mapgen_update": "release_bots_concourse_2", "om_terrain": "lab_CORE_2x1_2DN" } ]
},
{
"//": "Opens bot release if you have no ID badges.",
"type": "mapgen",
"update_mapgen_id": "release_bots_concourse_2",
"method": "json",
"object": {
"place_terrain": [
{ "ter": "t_thconc_r", "x": 8, "y": 3 },
{ "ter": "t_thconc_r", "x": 8, "y": 4 },
{ "ter": "t_thconc_r", "x": 7, "y": 4 },
{ "ter": "t_thconc_r", "x": 6, "y": 5 },
{ "ter": "t_thconc_r", "x": 7, "y": 5 },
{ "ter": "t_thconc_r", "x": 6, "y": 6 },
{ "ter": "t_thconc_r", "x": 8, "y": 20 },
{ "ter": "t_thconc_r", "x": 8, "y": 19 },
{ "ter": "t_thconc_r", "x": 7, "y": 19 },
{ "ter": "t_thconc_r", "x": 6, "y": 18 },
{ "ter": "t_thconc_r", "x": 7, "y": 18 },
{ "ter": "t_thconc_r", "x": 6, "y": 17 }
]
}
},
{
"type": "effect_on_condition",
"id": "lab_magenta_security_check",
"recurrence": [ 15, 30 ],
"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" } ]
},
{
"//": "Opens bot release if you lack a magenta security ID card.",
"type": "mapgen",
"update_mapgen_id": "release_bots_4",
"method": "json",
"object": {
"set": [
{ "line": "terrain", "id": "t_thconc_r", "x": 17, "y": 3, "x2": 23, "y2": 3 },
{ "line": "terrain", "id": "t_thconc_r", "x": 17, "y": 20, "x2": 23, "y2": 20 }
]
}
},
{
"type": "effect_on_condition",
"id": "lab_cyan_mutagen_check",
"recurrence": [ 15, 30 ],
"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" } ]
},
{
"//": "Opens bot release if you lack a mutagen security ID card.",
"type": "mapgen",
"update_mapgen_id": "release_bots_5",
"method": "json",
"object": { "set": [ { "line": "terrain", "id": "t_thconc_r", "x": 12, "y": 15, "x2": 12, "y2": 16 } ] }
},
{
"type": "effect_on_condition",
"id": "lab_cyan_mutagen_check_2",
Expand All @@ -303,41 +155,20 @@
},
"effect": [ { "mapgen_update": "release_bots_6", "om_terrain": "lab_2x2_MUT_tier_2_NW_final_flr" } ]
},
{
"//": "Opens bot release if you lack a mutagen security ID card.",
"type": "mapgen",
"update_mapgen_id": "release_bots_6",
"method": "json",
"object": { "set": [ { "line": "terrain", "id": "t_thconc_r", "x": 11, "y": 15, "x2": 11, "y2": 16 } ] }
},
{
"type": "effect_on_condition",
"id": "lab_cyan_mutagen_check_3",
"recurrence": [ 15, 30 ],
"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" } ]
},
{
"//": "Opens bot release if you lack a mutagen security ID card.",
"type": "mapgen",
"update_mapgen_id": "release_bots_7",
"method": "json",
"object": { "set": [ { "line": "terrain", "id": "t_thconc_r", "x": 11, "y": 3, "x2": 11, "y2": 5 } ] }
},
{
"type": "effect_on_condition",
"id": "lab_cyan_mutagen_check_4",
"recurrence": [ 15, 30 ],
"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" } ]
},
{
"//": "Opens bot release if you lack a mutagen ID card.",
"type": "mapgen",
"update_mapgen_id": "release_bots_8",
"method": "json",
"object": { "set": [ { "line": "terrain", "id": "t_thconc_r", "x": 12, "y": 3, "x2": 12, "y2": 5 } ] }
},
{
"type": "effect_on_condition",
"id": "lab_pink_mutagen_check",
Expand Down
0 data/json/mutations/changing_eocs.json → ...ondition/mutation_eocs/changing_eocs.json
View file
File renamed without changes.
23 changes: 23 additions & 0 deletions data/json/effects_on_condition/mutation_eocs/mutation_activation_eocs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"type": "effect_on_condition",
"id": "EOC_BIOLUM3_activated",
"condition": { "compare_num": [ { "u_val": "stamina" }, ">=", { "const": 3000 } ] },
"effect": [
{ "u_assign_activity": "ACT_GENERIC_EOC", "duration": "3 seconds" },
{ "arithmetic": [ { "u_val": "stamina" }, "-=", { "const": 700 } ] },
{ "queue_eocs": [ "EOC_BIOLUM3_cast" ], "time_in_future": 2 }
],
"false_effect": [ { "u_message": "You don't have enough stamina to activate your Bioluminescent Flare.", "type": "bad" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_BIOLUM3_cast",
"effect": [
{
"u_cast_spell": { "id": "spell_spit_flare", "message": "You launch a glob of bioluminescent material!" },
"targeted": true
}
]
}
]
7 changes: 7 additions & 0 deletions ...n/effects_on_condition/mutation_eocs.json → ...n/mutation_eocs/mutation_effect_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,5 +222,12 @@
{ "u_add_trait": "CHITIN2" },
{ "u_add_trait": "CRUSTACEAN_CARAPACE" }
]
},
{
"type": "effect_on_condition",
"id": "EOC_RASHY_SKIN",
"recurrence": [ "2 hour", "24 hours" ],
"condition": { "and": [ { "u_has_trait": "SKIN_RASHY" }, { "not": { "u_has_effect": "formication" } } ] },
"effect": [ { "u_add_effect": "formication", "duration": "10 minutes", "target_part": "random" } ]
}
]
28 changes: 0 additions & 28 deletions data/json/mutations/mutation_eocs.json → ...ition/mutation_eocs/prosthetics_eocs.json
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,4 @@
[
{
"type": "effect_on_condition",
"id": "EOC_BIOLUM3_activated",
"condition": { "compare_num": [ { "u_val": "stamina" }, ">=", { "const": 3000 } ] },
"effect": [
{ "u_assign_activity": "ACT_GENERIC_EOC", "duration": "3 seconds" },
{ "arithmetic": [ { "u_val": "stamina" }, "-=", { "const": 700 } ] },
{ "queue_eocs": [ "EOC_BIOLUM3_cast" ], "time_in_future": 2 }
],
"false_effect": [ { "u_message": "You don't have enough stamina to activate your Bioluminescent Flare.", "type": "bad" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_BIOLUM3_cast",
"effect": [
{
"u_cast_spell": { "id": "spell_spit_flare", "message": "You launch a glob of bioluminescent material!" },
"targeted": true
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_RASHY_SKIN",
"recurrence": [ "2 hour", "24 hours" ],
"condition": { "and": [ { "u_has_trait": "SKIN_RASHY" }, { "not": { "u_has_effect": "formication" } } ] },
"effect": [ { "u_add_effect": "formication", "duration": "10 minutes", "target_part": "random" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_PROSTHETIC_RIGHT_WEAR",
Expand Down
Loading

0 comments on commit 6942b2f

Please sign in to comment.