|
15 | 15 | "recurrence": [ "3 seconds", "3 seconds" ],
|
16 | 16 | "condition": {
|
17 | 17 | "and": [
|
| 18 | + { "not": { "u_has_trait": "mut_skyisland_personal_temperature_adaptation" } }, |
18 | 19 | { "u_has_trait": "mut_skyisland_temperature_adaptation" },
|
19 | 20 | { "or": [ { "u_at_om_location": "open_air" }, { "u_near_om_location": "sky_island_subcore", "range": 1 } ] },
|
20 | 21 | { "math": [ "u_val('pos_z') == 6" ] }
|
21 | 22 | ]
|
22 | 23 | },
|
23 |
| - "deactivate_condition": { "not": { "u_has_trait": "mut_skyisland_temperature_adaptation" } }, |
| 24 | + "deactivate_condition": { |
| 25 | + "or": [ |
| 26 | + { "not": { "u_has_trait": "mut_skyisland_temperature_adaptation" } }, |
| 27 | + { "u_has_trait": "mut_skyisland_personal_temperature_adaptation" } |
| 28 | + ] |
| 29 | + }, |
24 | 30 | "effect": [ { "math": [ "weather('temperature') = from_fahrenheit( 70 )" ] } ]
|
25 | 31 | },
|
26 | 32 | {
|
27 | 33 | "type": "effect_on_condition",
|
28 | 34 | "id": "EOC_SKY_ISLAND_CLIMATE_CONTROL_SURFACE",
|
29 | 35 | "eoc_type": "EVENT",
|
30 | 36 | "required_event": "avatar_enters_omt",
|
31 |
| - "condition": { "and": [ { "u_has_trait": "mut_skyisland_temperature_adaptation" }, { "u_at_om_location": "sky_island_core" } ] }, |
| 37 | + "condition": { |
| 38 | + "and": [ |
| 39 | + { "u_has_trait": "mut_skyisland_temperature_adaptation" }, |
| 40 | + { "u_at_om_location": "sky_island_core" }, |
| 41 | + { "not": { "u_has_trait": "mut_skyisland_personal_temperature_adaptation" } } |
| 42 | + ] |
| 43 | + }, |
32 | 44 | "effect": [ { "run_eocs": "EOC_SKY_ISLAND_CLIMATE_RESET" } ]
|
33 | 45 | },
|
34 | 46 | {
|
|
0 commit comments