Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Seasonal Mutation EOCs #69591

Merged
merged 135 commits into from
Dec 16, 2023
Merged
Show file tree
Hide file tree
Changes from 134 commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
001d8e4
seasonal EOCs
fairyarmadillo Nov 20, 2023
a09c2e2
Update data/json/effects.json
fairyarmadillo Nov 20, 2023
bed453d
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 20, 2023
b2bba35
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 20, 2023
1c66c72
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 20, 2023
849d059
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 20, 2023
0ffbf9d
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 20, 2023
abb4448
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 20, 2023
6d755b1
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 20, 2023
365b9ff
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 20, 2023
147e923
Update data/json/effects.json
fairyarmadillo Nov 20, 2023
c266b10
Update raw_fruit.json
fairyarmadillo Nov 20, 2023
90c4434
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Nov 20, 2023
3a552e4
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
15e8254
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
082967c
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
20b2770
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
c19ad24
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
4cc5891
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
75ed9ae
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
883bd77
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
2f22be6
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
cc17269
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Nov 21, 2023
d0c6c13
leaf updates
fairyarmadillo Dec 1, 2023
cd486a8
Update professions.json
fairyarmadillo Dec 3, 2023
35b1548
fix conflict
fairyarmadillo Dec 3, 2023
097e8a1
Revert "Update professions.json"
fairyarmadillo Dec 3, 2023
6d85035
Fur, plant stuff
fairyarmadillo Dec 5, 2023
63851ac
Communion
fairyarmadillo Dec 5, 2023
775bfd1
Tinkering with communion
fairyarmadillo Dec 5, 2023
b0ec7ce
Photosynthesis is back
fairyarmadillo Dec 7, 2023
febd1e3
Photosynthesizing.
fairyarmadillo Dec 7, 2023
cb8fa8b
Merge branch 'master' into seasonal_eocs
fairyarmadillo Dec 7, 2023
e824c42
SAD
fairyarmadillo Dec 8, 2023
409b234
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Dec 8, 2023
af77a67
phelloderrrrm
fairyarmadillo Dec 8, 2023
6800688
tree talkin
fairyarmadillo Dec 8, 2023
9b086a5
bugfixin
fairyarmadillo Dec 8, 2023
8e0adaf
photosynthesis etc
fairyarmadillo Dec 9, 2023
106f304
Merge branch 'master' into seasonal_eocs
fairyarmadillo Dec 9, 2023
64a5386
balance
fairyarmadillo Dec 9, 2023
e252c54
dialing in photosynthesis
fairyarmadillo Dec 9, 2023
d0bbf8c
transparent ugliness
fairyarmadillo Dec 9, 2023
b2a03d3
Update npc.cpp
fairyarmadillo Dec 10, 2023
2a1d501
Update npc.cpp
fairyarmadillo Dec 10, 2023
7a5c55b
bugfixes and mods
fairyarmadillo Dec 10, 2023
88f772a
Update mutations.json
fairyarmadillo Dec 11, 2023
17b828e
Adjusting rates
fairyarmadillo Dec 11, 2023
dfdb88c
Final touches
fairyarmadillo Dec 12, 2023
967a870
linting
fairyarmadillo Dec 12, 2023
6b2c55f
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
0efcff5
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
a07d02d
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
53289c8
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
043e034
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
e02131d
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
4440aae
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
b2e2609
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
e5f4705
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
4cc5898
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
1e0e9d8
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
1f229e0
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
ec67cfd
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
2cddaf7
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
52fcb8b
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
8bf3086
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
f3bd4f9
minor fixes
fairyarmadillo Dec 12, 2023
7676411
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Dec 12, 2023
495f07a
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
fairyarmadillo Dec 12, 2023
14f7549
Update mutations.json
fairyarmadillo Dec 12, 2023
b37675c
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Dec 12, 2023
421329d
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
cd904f7
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
849f8aa
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
4c1edff
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
14b4edc
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
02a63c9
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
65ed057
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
1c28558
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
b739f91
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
e0d406f
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
7328bc4
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
320bd5a
Update src/mutation.cpp
fairyarmadillo Dec 12, 2023
b56bd83
Update src/mutation.h
fairyarmadillo Dec 12, 2023
3806fea
Update src/mutation.cpp
fairyarmadillo Dec 12, 2023
a43ee25
Update src/map.cpp
fairyarmadillo Dec 12, 2023
f4aad59
Update src/item.cpp
fairyarmadillo Dec 12, 2023
b64937a
Update src/character_attire.cpp
fairyarmadillo Dec 12, 2023
f0fe78f
Update src/item.cpp
fairyarmadillo Dec 12, 2023
2b7300d
Update src/item.cpp
fairyarmadillo Dec 12, 2023
49a41d7
Update src/character_attire.cpp
fairyarmadillo Dec 12, 2023
3655f98
Update src/character.cpp
fairyarmadillo Dec 12, 2023
c9c42c5
Update src/character.cpp
fairyarmadillo Dec 12, 2023
b70a6fd
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
5f4237e
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
5cb70fe
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
b833085
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
52cebdc
Update src/character.cpp
fairyarmadillo Dec 12, 2023
a93c530
Update src/character.cpp
fairyarmadillo Dec 12, 2023
b2d0657
Update src/character.cpp
fairyarmadillo Dec 12, 2023
d41292d
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
7b8d3b1
Update src/activity_handlers.cpp
fairyarmadillo Dec 12, 2023
47f1f87
fix merge conflict error
fairyarmadillo Dec 12, 2023
a5013a0
Update effects.json
fairyarmadillo Dec 12, 2023
736b74b
Update effects.json
fairyarmadillo Dec 12, 2023
cf411ff
Update data/json/effects.json
fairyarmadillo Dec 12, 2023
40fe89d
fixes
fairyarmadillo Dec 12, 2023
dd3dbd7
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Dec 12, 2023
b07bbd3
astyle
fairyarmadillo Dec 12, 2023
eeeea58
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
5f3cfe9
astyle
fairyarmadillo Dec 12, 2023
51389f3
Update src/suffer.cpp
fairyarmadillo Dec 12, 2023
6dcdaf8
Update suffer.cpp
fairyarmadillo Dec 12, 2023
97a1fc3
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Dec 12, 2023
cab2394
Update snippets.json
fairyarmadillo Dec 12, 2023
b00e024
make test happy
fairyarmadillo Dec 13, 2023
31ea5f0
Update data/json/mutations/mutations.json
fairyarmadillo Dec 13, 2023
0c0cd21
check compliance
fairyarmadillo Dec 13, 2023
ccbcbe8
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Dec 13, 2023
d90033f
Update src/suffer.cpp
fairyarmadillo Dec 13, 2023
5761066
bugfix
fairyarmadillo Dec 13, 2023
8759978
Update data/mods/Magiclysm/items/ethereal_items.json
fairyarmadillo Dec 13, 2023
1bd24e0
Update suffer.cpp
fairyarmadillo Dec 13, 2023
c8d20c0
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Dec 13, 2023
b25481c
Update src/suffer.cpp
fairyarmadillo Dec 13, 2023
9086144
Update suffer.cpp
fairyarmadillo Dec 13, 2023
093983c
Merge branch 'seasonal_eocs' of https://github.com/fairyarmadillo/Cat…
fairyarmadillo Dec 13, 2023
91db7bd
Update src/suffer.cpp
fairyarmadillo Dec 14, 2023
c720ebc
Update suffer.cpp
fairyarmadillo Dec 14, 2023
0bc2fcd
Merge branch 'master' into seasonal_eocs
fairyarmadillo Dec 15, 2023
100438b
Update mutation_effect_eocs.json
fairyarmadillo Dec 15, 2023
e26e8d7
Update mutation_effect_eocs.json
fairyarmadillo Dec 15, 2023
e8f1e65
Update med.json
fairyarmadillo Dec 15, 2023
68b6788
Update altered_object_auras.json
fairyarmadillo Dec 15, 2023
07aa01d
Update altered_object_auras.json
fairyarmadillo Dec 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading