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

Enchantments forever #72328

Merged
merged 27 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f2b5ba1
remove thirst_modifier (not used anywhere)
GuardianDll Mar 9, 2024
c3660ec
remove scent_modifier (not used anywhere, use SCENT_MASK ench)
GuardianDll Mar 9, 2024
7868609
remove mending_modifier
GuardianDll Mar 9, 2024
2dcc259
remove healing_multiplier
GuardianDll Mar 9, 2024
e3692f7
remove healing_awake, add REGEN_HP_AWAKE as replacement
GuardianDll Mar 9, 2024
0f5334d
refine noise enchantments: remove SHOUT_NOISE_BASE, replace it effect…
GuardianDll Mar 9, 2024
4ec03a9
remove skill_rust_multiplier, update SKILL_RUST_RESIST so multiply va…
GuardianDll Mar 9, 2024
de3fa4a
add climate_control_str to port temperature_speed_modifier to math
GuardianDll Mar 10, 2024
2897629
jmathify temperature_speed_modifier, remove it from the code, remove …
GuardianDll Mar 11, 2024
a046883
remove test `dummy.mutation_value` that i forgot to remove with remov…
GuardianDll Mar 11, 2024
faef3e9
clean up mutation.md
GuardianDll Mar 11, 2024
6d52b9b
few fixes of climate_control_str
GuardianDll Mar 11, 2024
d557fb4
remove bodytemp_sleep, make BODYTEMP_SLEEP as replacement.
GuardianDll Mar 11, 2024
d974844
astyle
GuardianDll Mar 11, 2024
67a7d3c
Lint
GuardianDll Mar 11, 2024
f2a6201
confirmed BODYTEMP_SLEEP need to be divided 500 to have the same value
GuardianDll Mar 11, 2024
168deab
fix rust resist multiplier, tweak poor healer to satisfy test
GuardianDll Mar 12, 2024
f043cb0
Update src/magic_enchantment.h
GuardianDll Mar 12, 2024
563f3f0
remove power_trickle, add POWER_TRICKLE as replacement
GuardianDll Mar 11, 2024
97301eb
remove stat_bonus
GuardianDll Mar 12, 2024
1e1883f
remove vitamin_absorb_mod
GuardianDll Mar 12, 2024
ea97d96
refine docs
GuardianDll Mar 12, 2024
741c931
clang tidy suggests
GuardianDll Mar 13, 2024
2081fe8
Merge branch 'CleverRaven:master' into enchantments_forever
GuardianDll Mar 13, 2024
7bbf028
Merge branch 'CleverRaven:master' into enchantments_forever
GuardianDll Mar 14, 2024
a787491
Merge branch 'CleverRaven:master' into enchantments_forever
GuardianDll Mar 16, 2024
24c3e20
Merge branch 'CleverRaven:master' into enchantments_forever
GuardianDll Mar 17, 2024
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
11 changes: 5 additions & 6 deletions data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@
"name": { "str": "Wired Reflexes" },
"description": "Your reaction time has been greatly enhanced with bionic nerve stimulators, giving you a +2 bonus to dexterity.",
"occupied_bodyparts": [ [ "head", 3 ], [ "torso", 6 ], [ "arm_l", 3 ], [ "arm_r", 3 ], [ "leg_l", 7 ], [ "leg_r", 7 ] ],
"stat_bonus": [ [ "DEX", 2 ] ],
"enchantments": [ { "values": [ { "value": "DEXTERITY", "add": 2 } ] } ],
"flags": [ "BIONIC_NPC_USABLE" ]
},
{
Expand All @@ -751,9 +751,8 @@
"name": { "str": "Expanded Digestive System" },
"description": "You have been outfitted with three synthetic stomachs and industrial-grade intestines. Not only can you extract much more nutrition from food, but you are highly resistant to foodborne illness, and can sometimes eat rotten food.",
"occupied_bodyparts": [ [ "torso", 20 ] ],
"vitamin_absorb_mod": 1.5,
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "PARAIMMUNE", "IMMUNE_SPOIL" ],
"enchantments": [ { "values": [ { "value": "KCAL", "multiply": 0.5 } ] } ],
"enchantments": [ { "values": [ { "value": "KCAL", "multiply": 0.5 }, { "value": "VITAMIN_ABSORB_MOD", "multiply": 0.5 } ] } ],
"cant_remove_reason": "The CBM has replaced the patient's digestive organs and cannot be removed.",
"canceled_mutations": [
"WEAKSTOMACH",
Expand Down Expand Up @@ -883,7 +882,7 @@
"name": { "str": "Diamond Cornea" },
"description": "Your vision is greatly enhanced, giving you a +2 bonus to perception.",
"occupied_bodyparts": [ [ "eyes", 1 ] ],
"stat_bonus": [ [ "PER", 2 ] ],
"enchantments": [ { "values": [ { "value": "PERCEPTION", "add": 2 } ] } ],
"flags": [ "BIONIC_NPC_USABLE" ]
},
{
Expand Down Expand Up @@ -1121,7 +1120,7 @@
"description": "Your brain has been enhanced with bionic coprocessors, giving you a +2 bonus to intelligence.",
"cant_remove_reason": "The bionic is now critical to the continued functionality of the user's brain.",
"occupied_bodyparts": [ [ "head", 6 ] ],
"stat_bonus": [ [ "INT", 2 ] ],
"enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 2 } ] } ],
"flags": [ "BIONIC_NPC_USABLE" ]
},
{
Expand Down Expand Up @@ -1554,7 +1553,7 @@
"name": { "str": "Muscle Augmentation" },
"description": "Your muscular system has been surgically enhanced with myomer fibers, giving you a +2 bonus to strength.",
"occupied_bodyparts": [ [ "torso", 6 ], [ "arm_l", 4 ], [ "arm_r", 4 ], [ "leg_l", 8 ], [ "leg_r", 8 ] ],
"stat_bonus": [ [ "STR", 2 ] ],
"enchantments": [ { "values": [ { "value": "STRENGTH", "add": 2 } ] } ],
"flags": [ "BIONIC_NPC_USABLE" ]
},
{
Expand Down
12 changes: 12 additions & 0 deletions data/json/mutations/mutation_jmath.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,17 @@
"//_0": "your current base stat, like `u_val('intelligence_base')`",
"num_args": 1,
"return": "_0 < 16 ? (10)+(_0/2)-_0 : 2"
},
{
"type": "jmath_function",
"id": "temperature_speed_mod",
"//": "Decreases your speed, if it's below of some temperature",
"//_0": "Temperature limit, after which the speed starts to change, in farenheit",
"//_1": "How big the speed changes per 1 degree",
"//example": "temperature_speed_mod(65, 0.2) would make you lose 0.2 speed, if temperature around is lower than 65 F; temperature of 55 F would result in `(65-55)*0.2 = 10*0.2 = 2` 2 move speed decrease",
"//example2": "temperature_speed_mod(35, -1.3) would make you gain 1.3 speed, if temperature around is lower than 35 F; temperature of 32 F would result in `(35-32)*-1.3 = 3*-1.3 ~= -4` 4 move speed increase",
"//example3": "temperature_speed_mod(65, 0.2), but character has mutation, that gives CLIMATE_CONTROL_HEAT 5; it would make you lose 0.2 speed, if temperature around is lower than 60 F; temperature of 55 F would result in `(65-5-55)*0.2 = 5*0.2 = 1` 1 move speed decrease",
"num_args": 2,
"return": "min((fahrenheit(weather('temperature')) - _0 + u_climate_control_str_heat()) * _1, 0)"
}
]
Loading
Loading