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

Reworks mutagens to take time and use fully customizable EOCs #55233

Merged
merged 48 commits into from
Feb 25, 2022
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b94479c
Migrate mutations to a weighted vitamin based EOC-run system
MylieDaniels Feb 8, 2022
0504536
Mutations are working! Thresholds not working in this commit.
MylieDaniels Feb 8, 2022
b9611fa
Thresholds can be achieved again
MylieDaniels Feb 9, 2022
590bbdc
Rename mutating_eocs.json to reduce possible confusion, finished muta…
MylieDaniels Feb 9, 2022
b3a0030
Removed orphaned iuse actions
MylieDaniels Feb 9, 2022
9f5d9c1
Convert jabberwocky hearts to the new system
MylieDaniels Feb 9, 2022
1c55832
Finish removing mutagen item actions
MylieDaniels Feb 9, 2022
7f2cb2a
All in-repo mod mutagens converted to new system
MylieDaniels Feb 9, 2022
8eee8e1
Cleaned up mutagen categories and re-implemented category mutation me…
MylieDaniels Feb 9, 2022
2b5f765
Documentation, up vitamins of default mutagen to 325
MylieDaniels Feb 9, 2022
570e0e9
Merge branch 'master' into mutagens-as-foods
MylieDaniels Feb 9, 2022
c21080c
Update to match renaming
MylieDaniels Feb 9, 2022
be81725
Merge branch 'mutagens-as-foods' of https://github.com/Mikenyes/Catac…
MylieDaniels Feb 9, 2022
a445bed
convert conflict-resolved portal storm eoc weighted_list_eocs weights…
MylieDaniels Feb 9, 2022
eb043a4
lint json
MylieDaniels Feb 9, 2022
a8972bf
final pass on mutagens as vitamins
MylieDaniels Feb 9, 2022
0593765
Clang cleanup!
MylieDaniels Feb 9, 2022
62b251e
Make clang happy, tone down damage and add threshold resistance, and …
MylieDaniels Feb 9, 2022
238deaf
Alpha effect tweak, now lower damage with trait
MylieDaniels Feb 9, 2022
e14b586
changed resist_trait to resist_traits
MylieDaniels Feb 9, 2022
d053120
Almost all errors fixed
MylieDaniels Feb 9, 2022
1c07162
consistency for mutagen_gastropod
MylieDaniels Feb 9, 2022
4d4f0b4
Fix linking error
MylieDaniels Feb 9, 2022
c6b9c4a
Revert change to mutation message in My Sweet Cataclysm
MylieDaniels Feb 12, 2022
b6f2a11
Human Mutagen and Mutagen Chelator
MylieDaniels Feb 13, 2022
2c49236
Merge branch 'mutagens-as-foods' of https://github.com/Mikenyes/Catac…
MylieDaniels Feb 13, 2022
14f56d7
Merge branch 'master' into mutagens-as-foods
MylieDaniels Feb 13, 2022
17c4441
Final cleanup
MylieDaniels Feb 13, 2022
36ae9a8
Make Clang happy
MylieDaniels Feb 13, 2022
a466f5d
Update tests
MylieDaniels Feb 13, 2022
fe092f2
Update dictionary.txt
MylieDaniels Feb 13, 2022
b302aa0
Update dictionary, again
MylieDaniels Feb 13, 2022
0187588
No more hanging test for Lynx Fur
MylieDaniels Feb 13, 2022
f9f6ad0
Gastropod fix
MylieDaniels Feb 16, 2022
209d4ec
Merge branch 'master' into mutagens-as-foods
MylieDaniels Feb 17, 2022
6e689ba
update to Ramza's changed recurrence format
MylieDaniels Feb 17, 2022
0234b5f
Merge branch 'master' into mutagens-as-foods
MylieDaniels Feb 19, 2022
014e4cd
Re-adds the mutagen achievement event_type
MylieDaniels Feb 19, 2022
c8707e8
Merge branch 'master' into mutagens-as-foods
MylieDaniels Feb 19, 2022
02fa9e3
de-rot pull request
MylieDaniels Feb 19, 2022
463d6c4
Update cata_variant.cpp
MylieDaniels Feb 19, 2022
3d733eb
un-crungle the PR
MylieDaniels Feb 20, 2022
e6c7c40
Merge branch 'master' into mutagens-as-foods
MylieDaniels Feb 21, 2022
ec0f41a
Apply suggestions from Venera3's code review
MylieDaniels Feb 21, 2022
ac91ff2
Apply Venera3's suggestion
MylieDaniels Feb 21, 2022
9e73bc7
Merge branch 'master' into mutagens-as-foods
MylieDaniels Feb 21, 2022
000c5ca
Minor correction
MylieDaniels Feb 21, 2022
cc964a3
More minor corrections
MylieDaniels Feb 21, 2022
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
714 changes: 646 additions & 68 deletions data/json/effects.json

Large diffs are not rendered by default.

20 changes: 0 additions & 20 deletions data/json/item_actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -704,16 +704,6 @@
"id": "MULTICOOKER",
"name": { "str": "Cook" }
},
{
"type": "item_action",
"id": "mutagen",
"name": { "str": "Consume" }
},
{
"type": "item_action",
"id": "mutagen_iv",
"name": { "str": "Inject" }
},
{
"type": "item_action",
"id": "MYCUS",
Expand Down Expand Up @@ -789,16 +779,6 @@
"id": "ELECTRICSTORAGE",
"name": { "str": "Manage external storage" }
},
{
"type": "item_action",
"id": "PURIFIER",
"name": { "str": "Consume" }
},
{
"type": "item_action",
"id": "PURIFY_IV",
"name": { "str": "Inject" }
},
{
"type": "item_action",
"id": "PURIFY_SMART",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/carnivore.json
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@
"material": [ "flesh" ],
"volume": "500 ml",
"fun": -25,
"use_action": { "type": "mutagen", "mutation_category": "BEAST", "is_strong": false },
"vitamins": [ [ "mutagen_beast", 250 ] ],
"flags": [ "PREDATOR_FUN" ]
},
{
Expand All @@ -1271,7 +1271,7 @@
"material": [ "flesh" ],
"volume": "1 L",
"fun": -25,
"use_action": { "type": "mutagen", "mutation_category": "BEAST", "is_strong": true },
"vitamins": [ [ "mutagen_beast", 300 ] ],
"flags": [ "PREDATOR_FUN" ]
},
{
Expand Down
488 changes: 288 additions & 200 deletions data/json/items/comestibles/mutagen.json

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion data/json/monster_special_attacks/spells.json
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,11 @@
],
"false_effect": [
{
"weighted_list_eocs": [ [ "EOC_shifting_mass_attack", 2 ], [ "EOC_PORTAL_TELEPORT_STUCK_START", 2 ], [ "EOC_PORTAL_INCORPOREAL", 1 ] ]
"weighted_list_eocs": [
[ "EOC_shifting_mass_attack", { "const": 2 } ],
[ "EOC_PORTAL_TELEPORT_STUCK_START", { "const": 2 } ],
[ "EOC_PORTAL_INCORPOREAL", { "const": 1 } ]
]
},
{ "u_message": "For an instant you feel the absence's hunger upon you." }
]
Expand Down
79 changes: 79 additions & 0 deletions data/json/mutations/changing_eocs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
[
{
"type": "effect_on_condition",
"id": "changing_initiate_check",
"//": "Give player the CHANGING trait when they have enough basic mutagen in their blood.",
"recurrence_min": "30 m",
"recurrence_max": "45 m",
"condition": {
"and": [
{ "compare_int": [ { "u_val": "vitamin", "name": "mutagen" }, ">=", { "const": 450 } ] },
{ "not": { "u_has_flag": "CHANGING" } }
]
},
"deactivate_condition": { "u_has_flag": "CHANGING" },
"effect": [
{
"weighted_list_eocs": [ [ "changing_failed", { "const": 2500 } ], [ "changing_successful", { "u_val": "vitamin", "name": "mutagen" } ] ]
}
]
},
{
"type": "effect_on_condition",
"id": "changing_failed",
"condition": { "one_in_chance": 4 },
"effect": [ { "u_message": "You feel a shift in your body, but it quickly reverts.", "type": "bad" } ]
},
{
"type": "effect_on_condition",
"id": "changing_successful",
"effect": [
{
"u_message": "You begin to feel a sickeningly beautiful ache, the feeling of your cells tearing apart and recombining in strange new patterns.",
"type": "mixed"
},
{ "u_add_trait": "CHANGING" },
{ "u_mutate": 0 }
]
},
{
"type": "effect_on_condition",
"id": "changing_reqs_not_met",
"condition": { "one_in_chance": 3 },
"effect": [
{
"u_message": "You can palpably feel the churning sensation within fade, your mutation cut short by a lack of nutrients.",
"type": "bad"
},
{ "u_lose_trait": "CHANGING" },
{ "arithmetic": [ { "u_val": "vitamin", "name": "mutagen" }, "=", { "const": 0 } ] }
]
},
{
"type": "effect_on_condition",
"id": "changing_mutate",
"//": "Time for mutation!",
"recurrence_min": "1 h",
"recurrence_max": "6 h",
"condition": { "and": [ { "u_has_flag": "CHANGING" } ] },
"deactivate_condition": { "not": { "u_has_flag": "CHANGING" } },
"effect": [
{
"run_eocs": [
{
"id": "changing_mutate2",
"//": "Mutate!",
"condition": { "compare_int": [ { "u_val": "vitamin", "name": "mutagen" }, ">=", { "const": 300 } ] },
"effect": [
{ "u_message": "You feel a deep, churning sensation fill your body.", "type": "mixed" },
{ "u_mutate": 0 },
{ "arithmetic": [ { "u_val": "vitamin", "name": "mutagen" }, "-=", { "const": 60 } ] },
{ "arithmetic": [ { "u_val": "vitamin", "name": "mutagen" }, "-=", { "rand": 80 } ] }
],
"false_effect": [ { "run_eocs": [ "changing_reqs_not_met" ] } ]
}
]
}
]
}
]
Loading