Skip to content

Commit

Permalink
Seasonal Mutation EOCs (CleverRaven#69591)
Browse files Browse the repository at this point in the history
* seasonal EOCs

* Update data/json/effects.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update raw_fruit.json

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* leaf updates

* Update professions.json

* fix conflict

* Revert "Update professions.json"

This reverts commit cd486a8.

* Fur, plant stuff

* Communion

* Tinkering with communion

* Photosynthesis is back

* Photosynthesizing.

* SAD

* phelloderrrrm

* tree talkin

* bugfixin

* photosynthesis etc

* balance

* dialing in photosynthesis

* transparent ugliness

* Update npc.cpp

* Update npc.cpp

* bugfixes and mods

* Update mutations.json

* Adjusting rates

* Final touches

* linting

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* minor fixes

* Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update mutations.json

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/mutation.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/mutation.h

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/mutation.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/map.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/item.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/character_attire.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/item.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/item.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/character_attire.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/character.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/character.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/character.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/character.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/character.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix merge conflict error

* Update effects.json

* Update effects.json

* Update data/json/effects.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fixes

* astyle

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* astyle

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update suffer.cpp

* Update snippets.json

* make test happy

* Update data/json/mutations/mutations.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* check compliance

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* bugfix

* Update data/mods/Magiclysm/items/ethereal_items.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update suffer.cpp

* Update src/suffer.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update suffer.cpp

* Update src/suffer.cpp

Co-authored-by: Maleclypse <[email protected]>

* Update suffer.cpp

* Update mutation_effect_eocs.json

* Update mutation_effect_eocs.json

* Update med.json

* Update altered_object_auras.json

* Update altered_object_auras.json

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Maleclypse <[email protected]>
  • Loading branch information
3 people authored Dec 16, 2023
1 parent 24e9f9e commit 8e41c69
Show file tree
Hide file tree
Showing 43 changed files with 1,468 additions and 211 deletions.
25 changes: 22 additions & 3 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,15 @@
"rating": "bad",
"show_in_info": true
},
{
"type": "effect_type",
"id": "sneezing",
"name": [ "Sneezing" ],
"desc": [ "Effect to briefly distract you while you sneeze. You should not be able to see this." ],
"max_duration": "1 s",
"base_mods": { "speed_mod": [ -20 ], "dex_mod": [ -2 ], "per_mod": [ -4 ] },
"show_in_info": false
},
{
"type": "effect_type",
"id": "acid_charged",
Expand Down Expand Up @@ -2926,12 +2935,12 @@
"rat_bite_fever",
"infected",
"asthma",
"common_cold",
"flu",
"pre_conjunctivitis_viral",
"pre_conjunctivitis_bacterial",
"conjunctivitis_viral",
"conjunctivitis_bacterial"
"conjunctivitis_bacterial",
"common_cold",
"flu"
],
"base_mods": { "pkill_min": [ 5 ] }
},
Expand Down Expand Up @@ -4494,6 +4503,16 @@
"resist_traits": [ "GASTROPOD_BALANCE" ],
"show_in_info": true
},
{
"type": "effect_type",
"id": "hay_fever",
"name": [ "Hay Fever" ],
"desc": [ "Your eyes are itchy and you've got a runny nose." ],
"rating": "bad",
"resist_effects": [ "took_flumed", "took_antihistamine" ],
"show_in_info": true,
"base_mods": { "per_mod": [ -2 ], "int_mod": [ -2 ], "stamina_min": [ -50 ], "stamina_max": [ -150 ], "stamina_chance": [ 300 ] }
},
{
"id": "star_vampire_blood_drank",
"type": "effect_type",
Expand Down
Loading

0 comments on commit 8e41c69

Please sign in to comment.