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

Chiropteran Mutation Line #70797

Merged
merged 214 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from 171 commits
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
6067b6a
i am the night
worm-girl Jan 9, 2024
dbf8492
Update mutations.json
worm-girl Jan 9, 2024
fc24310
Update mutations.json
worm-girl Jan 9, 2024
3c192d1
Merge remote-tracking branch 'upstream/master' into chiropteran
worm-girl Jan 10, 2024
7c2b657
commas
worm-girl Jan 10, 2024
46aa9e6
teef
worm-girl Jan 12, 2024
b1c5402
Update integrated.json
worm-girl Jan 12, 2024
5c97f93
experimentation
worm-girl Jan 13, 2024
6976aa2
Update melee.cpp
worm-girl Jan 13, 2024
99bc98f
syntax, flag
worm-girl Jan 13, 2024
a808736
stuff
worm-girl Jan 14, 2024
82784b2
climbin
worm-girl Jan 16, 2024
9c7981e
Update mutations.json
worm-girl Jan 16, 2024
3e3dd87
bloooood
worm-girl Jan 16, 2024
b3ca353
more blood
worm-girl Jan 16, 2024
c32b95b
Merge branch 'master' into chiropteran
worm-girl Jan 16, 2024
ad7f964
Update dictionary.txt
worm-girl Jan 16, 2024
0fd8ca8
Merge branch 'chiropteran' of https://github.com/fairyarmadillo/Catac…
worm-girl Jan 16, 2024
f2427e8
Update mutations.json
worm-girl Jan 17, 2024
27f94a8
social
worm-girl Jan 17, 2024
c8eac1a
social stuff
worm-girl Jan 17, 2024
abdac06
friends
worm-girl Jan 17, 2024
474905b
switch to flags
worm-girl Jan 17, 2024
0cf4ee5
more friend stuff
worm-girl Jan 17, 2024
706040e
Update mutations.json
worm-girl Jan 17, 2024
e21fba2
Update mutations.json
worm-girl Jan 18, 2024
448d7bd
Update flags.json
worm-girl Jan 18, 2024
276d24d
fixes
worm-girl Jan 18, 2024
ad023fd
bite bite bite
worm-girl Jan 18, 2024
4083377
bitin
worm-girl Jan 18, 2024
40e3c45
blrlrlrlghh biting
worm-girl Jan 18, 2024
bbd3077
bites done
worm-girl Jan 19, 2024
2263d57
muzzle descs
worm-girl Jan 19, 2024
a9c58c0
tech stuff
worm-girl Jan 19, 2024
2760570
vectors
worm-girl Jan 19, 2024
01edcc7
Update MARTIALART_JSON.md
worm-girl Jan 19, 2024
4a48e56
sonar
worm-girl Jan 19, 2024
5bcb731
Merge branch 'master' into chiropteran
worm-girl Jan 19, 2024
47b6322
remove extra fang stuff for later PR
worm-girl Jan 20, 2024
23fcb52
Merge branch 'chiropteran' of https://github.com/fairyarmadillo/Catac…
worm-girl Jan 20, 2024
bb79d94
Update mutations.json
worm-girl Jan 20, 2024
8ae7a89
fixes
worm-girl Jan 20, 2024
de2b511
Update settings.json
worm-girl Jan 20, 2024
bc0d248
Update settings.json
worm-girl Jan 20, 2024
875fede
Update condition.h
worm-girl Jan 20, 2024
52bc499
echolocation
worm-girl Jan 21, 2024
4a3d922
sonar cbm
worm-girl Jan 21, 2024
89b633d
holy shit paws
worm-girl Jan 22, 2024
ea9f2f0
oh lord
worm-girl Jan 22, 2024
419690f
Update enchantments.json
worm-girl Jan 22, 2024
a51f5f3
oaaoaaaarfghghghhj
worm-girl Jan 23, 2024
44d4724
blooood
worm-girl Jan 23, 2024
1d4ff76
hm
worm-girl Jan 28, 2024
6efed8c
crit_tec_id
worm-girl Jan 31, 2024
e3ec887
fangs
worm-girl Feb 1, 2024
604ff1f
woo
worm-girl Feb 2, 2024
579d5ab
Merge branch 'master' into chiropteran
worm-girl Feb 2, 2024
451f5f5
Update settings.json
worm-girl Feb 2, 2024
130f5b9
Update data/json/mutations/mutations.json
worm-girl Feb 2, 2024
8680b58
Update data/json/mutations/mutations.json
worm-girl Feb 2, 2024
f729314
Update data/json/mutations/mutations.json
worm-girl Feb 2, 2024
bce0b89
Update data/json/mutations/mutations.json
worm-girl Feb 2, 2024
54f1139
Update src/consumption.cpp
worm-girl Feb 2, 2024
e6ae207
Update src/lightmap.cpp
worm-girl Feb 2, 2024
00d642a
Update src/ranged.cpp
worm-girl Feb 2, 2024
0653e46
Update src/consumption.cpp
worm-girl Feb 2, 2024
aacff51
Update data/json/mutations/mutations.json
worm-girl Feb 2, 2024
2e8fd05
itemgroups
worm-girl Feb 2, 2024
9613207
Merge branch 'chiropteran' of https://github.com/fairyarmadillo/Catac…
worm-girl Feb 2, 2024
4f6ed0b
Update techniques.json
worm-girl Feb 2, 2024
52489b5
Update data/json/techniques.json
worm-girl Feb 2, 2024
f2a0bd2
Update src/consumption.cpp
worm-girl Feb 2, 2024
af0e6e1
Update data/json/techniques.json
worm-girl Feb 2, 2024
d9223ab
Update data/json/techniques.json
worm-girl Feb 2, 2024
07d1da3
Update data/json/techniques.json
worm-girl Feb 2, 2024
345b337
Update data/json/mutations/mutations.json
worm-girl Feb 2, 2024
7881770
tests
worm-girl Feb 3, 2024
e64a1e7
im dum
worm-girl Feb 3, 2024
170c6d7
Update exodii_merchant_itemlist.json
worm-girl Feb 3, 2024
3311d34
dictionary
worm-girl Feb 3, 2024
50523f9
Update dictionary.txt
worm-girl Feb 3, 2024
93bf6a0
arpen fix
worm-girl Feb 3, 2024
b62223d
balance
worm-girl Feb 3, 2024
c56a441
Update swords_and_blades.json
worm-girl Feb 3, 2024
2a63176
dont list damage on the item because it lies
worm-girl Feb 3, 2024
1e81cf7
Merge branch 'chiropteran' of https://github.com/fairyarmadillo/Catac…
worm-girl Feb 3, 2024
847fa65
nerf fangs a bit
worm-girl Feb 3, 2024
e1cc150
Merge branch 'master' into chiropteran
worm-girl Feb 7, 2024
99a6d19
Update src/consumption.cpp
worm-girl Feb 7, 2024
e8c8e61
astyle
worm-girl Feb 8, 2024
ce704b0
Update consumption.cpp
worm-girl Feb 8, 2024
1f8990c
Update src/consumption.cpp
worm-girl Feb 8, 2024
788405c
Update src/consumption.cpp
worm-girl Feb 8, 2024
58a23e5
Update src/consumption.cpp
worm-girl Feb 8, 2024
3332df2
Update src/consumption.cpp
worm-girl Feb 8, 2024
e098981
Update src/consumption.cpp
worm-girl Feb 8, 2024
87d8924
Update src/consumption.cpp
worm-girl Feb 8, 2024
4b19965
Update src/consumption.cpp
worm-girl Feb 8, 2024
ba423ef
Update src/consumption.cpp
worm-girl Feb 8, 2024
5a43626
Update src/consumption.cpp
worm-girl Feb 8, 2024
71e4c90
Update src/consumption.cpp
worm-girl Feb 8, 2024
3156bdf
Update src/consumption.cpp
worm-girl Feb 8, 2024
34b5374
Update src/consumption.cpp
worm-girl Feb 8, 2024
10dfb04
Update src/consumption.cpp
worm-girl Feb 8, 2024
fc81636
Update src/consumption.cpp
worm-girl Feb 8, 2024
8edcec9
Update src/consumption.cpp
worm-girl Feb 8, 2024
8a6005c
Update src/consumption.cpp
worm-girl Feb 8, 2024
f955fc7
Update src/consumption.cpp
worm-girl Feb 8, 2024
c44d83e
Update src/consumption.cpp
worm-girl Feb 8, 2024
e36e959
Update src/consumption.cpp
worm-girl Feb 8, 2024
3f8bc89
Update src/consumption.cpp
worm-girl Feb 8, 2024
277ffb4
Update src/consumption.cpp
worm-girl Feb 8, 2024
d301e27
Update src/consumption.cpp
worm-girl Feb 8, 2024
03642aa
Update src/consumption.cpp
worm-girl Feb 8, 2024
488f117
Update src/consumption.cpp
worm-girl Feb 8, 2024
7ea3dcf
Update src/consumption.cpp
worm-girl Feb 8, 2024
90e43ba
Update src/consumption.cpp
worm-girl Feb 8, 2024
48e28f3
Update src/consumption.cpp
worm-girl Feb 8, 2024
6d435c6
Update src/consumption.cpp
worm-girl Feb 8, 2024
22f0dd2
Update src/consumption.cpp
worm-girl Feb 8, 2024
0a9ca2a
Update src/consumption.cpp
worm-girl Feb 8, 2024
54eab51
Update src/consumption.cpp
worm-girl Feb 8, 2024
7cdae47
Update src/consumption.cpp
worm-girl Feb 8, 2024
c499612
Update src/consumption.cpp
worm-girl Feb 8, 2024
3b6a59c
Update src/consumption.cpp
worm-girl Feb 8, 2024
ebd8ec1
Update src/consumption.cpp
worm-girl Feb 8, 2024
d681b19
Update src/consumption.cpp
worm-girl Feb 8, 2024
bfbacf2
Update src/consumption.cpp
worm-girl Feb 8, 2024
8d46970
Update src/consumption.cpp
worm-girl Feb 8, 2024
f218f66
Update src/consumption.cpp
worm-girl Feb 8, 2024
9e46424
Update src/consumption.cpp
worm-girl Feb 8, 2024
1ee1fcd
Update src/consumption.cpp
worm-girl Feb 8, 2024
c250988
Update src/consumption.cpp
worm-girl Feb 8, 2024
f9c64e2
Update src/consumption.cpp
worm-girl Feb 8, 2024
bd6c0f9
Update src/consumption.cpp
worm-girl Feb 8, 2024
4ff6d3f
Update src/consumption.cpp
worm-girl Feb 8, 2024
3e432e4
Update src/consumption.cpp
worm-girl Feb 8, 2024
d55d6f3
Update src/consumption.cpp
worm-girl Feb 8, 2024
37e2cc8
Update src/consumption.cpp
worm-girl Feb 8, 2024
479e2a5
github what the hell
worm-girl Feb 8, 2024
1aaedc9
math_parser_diag instead of condition
worm-girl Feb 10, 2024
2d8ed22
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
worm-girl Feb 10, 2024
e723b37
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
worm-girl Feb 10, 2024
a75d048
Update data/json/effects_on_condition/mutation_eocs/mutation_effect_e…
worm-girl Feb 10, 2024
28e6e41
Update src/math_parser_diag.cpp
worm-girl Feb 10, 2024
a1a6553
change to characters_nearby, document
worm-girl Feb 10, 2024
39c4d94
Update math_parser_diag.cpp
worm-girl Feb 10, 2024
ffe7477
Update doc/NPCs.md
worm-girl Feb 10, 2024
d4988ff
weee
worm-girl Feb 10, 2024
1e5f1b4
updates
worm-girl Feb 10, 2024
e43b452
Update mutations.json
worm-girl Feb 10, 2024
a58b311
Update src/math_parser_diag.cpp
worm-girl Feb 10, 2024
5bd338c
Update .vscode/settings.json
worm-girl Feb 11, 2024
a129f6d
Update doc/NPCs.md
worm-girl Feb 11, 2024
55fc9ec
Update src/math_parser_diag.cpp
worm-girl Feb 11, 2024
27e311e
Update src/lightmap.cpp
worm-girl Feb 11, 2024
5f83ad2
Update lightmap.cpp
worm-girl Feb 11, 2024
ec5f386
Update lightmap.cpp
worm-girl Feb 11, 2024
59929ba
Update lightmap.cpp
worm-girl Feb 11, 2024
09bd8bc
Update lightmap.cpp
worm-girl Feb 11, 2024
ff78f8b
Update map.h
worm-girl Feb 11, 2024
41a231c
Merge branch 'chiropteran' of https://github.com/fairyarmadillo/Catac…
worm-girl Feb 11, 2024
795d44b
Balance etc
worm-girl Feb 11, 2024
2073484
More little tweaks
worm-girl Feb 11, 2024
b0860ea
Update src/character.cpp
worm-girl Feb 11, 2024
516de48
Update character.cpp
worm-girl Feb 11, 2024
0944f69
Update bonuses.cpp
worm-girl Feb 12, 2024
5bdf6cd
Update consumption.cpp
worm-girl Feb 12, 2024
ca0b826
Update morale_types.cpp
worm-girl Feb 13, 2024
482cec0
Update mutations.json
worm-girl Feb 14, 2024
9651b39
Update data/mods/Aftershock/mutations/mutations.json
worm-girl Feb 14, 2024
7151f1a
Remove social and fang stuff
worm-girl Feb 17, 2024
6373c0d
cleanup
worm-girl Feb 17, 2024
b2f2019
Update effects.json
worm-girl Feb 17, 2024
7d2ccda
Update morale_types.json
worm-girl Feb 17, 2024
1a6b02c
Update activity_handlers.cpp
worm-girl Feb 17, 2024
92aa781
Update mtype.h
worm-girl Feb 17, 2024
3540375
Update species.json
worm-girl Feb 17, 2024
29f2ebe
Update mutation_effect_eocs.json
worm-girl Feb 17, 2024
e2839ed
Update activity_handlers.cpp
worm-girl Feb 17, 2024
56fb073
Update activity_handlers.cpp
worm-girl Feb 17, 2024
987cc2d
Update NPCs.md
worm-girl Feb 17, 2024
852295d
Update MARTIALART_JSON.md
worm-girl Feb 17, 2024
52e2fa1
Update MARTIALART_JSON.md
worm-girl Feb 17, 2024
72cde71
Update MARTIALART_JSON.md
worm-girl Feb 17, 2024
7b27fd4
Update effects_eocs.json
worm-girl Feb 17, 2024
712de54
Update math_parser_diag.cpp
worm-girl Feb 17, 2024
37953e5
Update math_parser_diag.cpp
worm-girl Feb 17, 2024
44e1f6a
Update math_parser_diag.cpp
worm-girl Feb 17, 2024
14bc337
Update morale_types.h
worm-girl Feb 17, 2024
02bb954
Update mtype.cpp
worm-girl Feb 17, 2024
c7d153a
Update integrated.json
worm-girl Feb 17, 2024
ec12358
Update effects_eocs.json
worm-girl Feb 17, 2024
0912ee1
Merge branch 'chiropteran' of https://github.com/fairyarmadillo/Catac…
worm-girl Feb 17, 2024
ecef2bb
Update monster_flags.json
worm-girl Feb 17, 2024
57c79fe
Update flags.json
worm-girl Feb 17, 2024
b93b7dd
Update mutation_category.json
worm-girl Feb 17, 2024
2176428
Update mutation_type.json
worm-girl Feb 17, 2024
5f00ff6
Update mutations.json
worm-girl Feb 17, 2024
99835de
update sonar
worm-girl Feb 18, 2024
572e800
remove NATURAL_WEAPON flag for now
worm-girl Feb 18, 2024
ba7f79d
redesc natural_stance for now
worm-girl Feb 18, 2024
b1ca54d
astyle
worm-girl Feb 18, 2024
67fa581
fix subaquatic sonar
worm-girl Feb 18, 2024
208ca65
Update consumption.cpp
worm-girl Feb 18, 2024
3ece0d9
Update melee.cpp
worm-girl Feb 18, 2024
7cedc4a
Update melee.cpp
worm-girl Feb 18, 2024
8edddcc
Update consumption.cpp
worm-girl Feb 18, 2024
f10398a
Update monattack.cpp
worm-girl Feb 18, 2024
a0b2cf8
Update monattack.cpp
worm-girl Feb 18, 2024
da7753a
Update morale_types.cpp
worm-girl Feb 18, 2024
6c48fd4
fixes
worm-girl Feb 19, 2024
e4f5e4d
Update melee.cpp
worm-girl Feb 19, 2024
71a1966
Update melee.cpp
worm-girl Feb 19, 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
13 changes: 13 additions & 0 deletions data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,7 @@
"name": { "str": "Enhanced Hearing" },
"description": "When this bionic is active, your hearing will be drastically improved, allowing you to hear ten times better than the average person. Additionally, high-intensity sounds will be automatically dampened before they can damage your hearing.",
"occupied_bodyparts": [ [ "head", 2 ] ],
"mutation_conflicts": [ "BATEARS" ],
"flags": [ "BIONIC_TOGGLED", "IMMUNE_HEARING_DAMAGE" ],
"active_flags": [ "SUPER_HEARING" ],
"auto_deactivates": [ "bio_earplugs" ],
Expand Down Expand Up @@ -1600,6 +1601,18 @@
"flags": [ "BIONIC_NPC_USABLE" ],
"enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "WEAPON_DISPERSION", "multiply": -0.25 } ] } ]
},
{
"id": "bio_sonar",
"type": "bionic",
"name": { "str": "Subaquatic Navigation System" },
"description": "While active, a tiny device in your inner ear periodically generates ultrasonic pulses which aid in navigation, provided you are underwater and able to hear.",
"occupied_bodyparts": [ [ "head", 1 ] ],
"act_cost": "1 J",
"trigger_cost": "5 J",
"flags": [ "BIONIC_TOGGLED" ],
"activated_eocs": [ "EOC_BIO_SONAR_activated" ],
"deactivated_eocs": [ "EOC_BIO_SONAR_deactivated" ]
},
{
"id": "bio_taser",
"type": "bionic",
Expand Down
2 changes: 1 addition & 1 deletion data/json/climbing.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
"//": "Allows players to safely climb up/down or hold position against a wall.",
"copy-from": "generic_superpower",
"down": {
"menu_text": "Crawl down the wall with your sticky pads.",
"menu_text": "Crawl down the wall.",
"confirm_text": "Crawl down the wall?",
"msg_after": "You crawl down the wall.",
"//": "Can be used repeatedly to descend 1 floor at a time.",
Expand Down
42 changes: 42 additions & 0 deletions data/json/dreams.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@
"category": "GASTROPOD",
"strength": 1
},
{
"type": "dream",
"messages": [
"You dream about the moon.",
"You dream you're safely at home with a bustling family.",
"You dream of chasing a beautiful butterfly."
],
"category": "CHIROPTERAN",
"strength": 1
},
{
"type": "dream",
"messages": [
Expand Down Expand Up @@ -207,6 +217,17 @@
"category": "RABBIT",
"strength": 2
},
{
"type": "dream",
"messages": [
"You dream of flying.",
"You have an upsetting dream about falling and being unable to get back up.",
"Tinnitus follows you into your dreams, where it becomes a chorus of crickets.",
"You dream of warm breath and fresh blood."
],
"category": "CHIROPTERAN",
"strength": 2
},
{
"type": "dream",
"messages": [
Expand Down Expand Up @@ -442,6 +463,17 @@
"category": "BIRD",
"strength": 3
},
{
"type": "dream",
"messages": [
"You have a nightmare of being all alone, but then your family flies home to comfort you.",
"You dream of sneaking into someone's home to listen to them sleep.",
"You taste iron all night long, like you've bitten your tongue.",
"You dream in sounds and smells, not images."
],
"category": "CHIROPTERAN",
"strength": 3
},
{
"type": "dream",
"messages": [
Expand Down Expand Up @@ -721,6 +753,16 @@
"category": "CATTLE",
"strength": 4
},
{
"type": "dream",
"messages": [
"In your dreams, your fangs slip through flesh like scalpels. You quickly crawl away to let your clumsy prey bleed out.",
"You flutter through the air, listening for echoes to guide you through your dream.",
"You dream of friends and family crowded around, chattering noisily, grooming one another, and sharing blood."
],
"category": "CHIROPTERAN",
"strength": 4
},
{
"type": "dream",
"messages": [
Expand Down
113 changes: 110 additions & 3 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,10 @@
"type": "effect_type",
"id": "sneezing",
"name": [ "Sneezing" ],
"desc": [ "Effect to briefly distract you while you sneeze. You should not be able to see this." ],
"rating": "bad",
"desc": [ "It's hard to pay attention to anything when you're in the middle of sneezing!" ],
"max_duration": "1 s",
"base_mods": { "speed_mod": [ -20 ], "dex_mod": [ -2 ], "per_mod": [ -4 ] },
"show_in_info": false
"base_mods": { "speed_mod": [ -20 ], "dex_mod": [ -2 ], "per_mod": [ -4 ] }
},
{
"type": "effect_type",
Expand Down Expand Up @@ -1720,6 +1720,31 @@
"rating": "bad",
"blood_analysis_description": "Rat Primer Contamination"
},
{
"type": "effect_type",
"id": "mutagen_chiropteran",
"name": [ "Chiropteran Mutation", "Chiropteran Transformation", "Chiropteran Metamorphosis" ],
"desc": [
"You consumed chiropteran primer.",
"You taste iron, and you want more.",
"Every sound is a painful screech in your ears. It's all too much!."
],
"max_intensity": 3,
"resist_traits": [ "THRESH_CHIROPTERAN" ],
"base_mods": {
"hurt_min": [ 1 ],
"hurt_max": [ 2 ],
"hurt_chance": [ -22 ],
"hurt_tick": [ 150 ],
"pain_min": [ 1 ],
"pain_max": [ 2 ],
"pain_chance": [ 100 ],
"pain_tick": [ 75 ]
},
"scaling_mods": { "dex_mod": [ 1 ], "int_mod": [ -2 ], "speed_mod": [ 3.5 ], "hurt_chance": [ 21, 0 ], "pain_chance": [ -30 ] },
"rating": "bad",
"blood_analysis_description": "Chiropteran Primer Contamination"
},
{
"type": "effect_type",
"id": "mutagen_slime",
Expand Down Expand Up @@ -2124,6 +2149,17 @@
],
"flags": [ "EFFECT_LIMB_SCORE_MOD" ]
},
{
"type": "effect_type",
"id": "anticoagulant_draculin",
"max_intensity": 3,
"max_duration": "20 m",
"rating": "bad",
"blood_analysis_description": "Draculin",
"//": "yes it's actually called that. It is also the strongest anti-clotting factor known to science. It inhibits the synthesis of thrombin, so most earth animals/mutants should be affected, except maybe bugs.",
"immune_flags": [ "DRACULIN_IMMUNE" ],
"effect_dur_scaling": [ { "effect_id": "bleed", "modifier": 2.0, "same_bp": false } ]
},
{
"type": "effect_type",
"id": "anticoagulant",
Expand Down Expand Up @@ -3913,6 +3949,48 @@
"//": "Mood debuff is handled separately by bad_food_mood_debuff EoC.",
"rating": "bad"
},
{
"type": "effect_type",
"id": "social_satisfied",
"name": [ "Good Company" ],
"desc": [ "It feels good to spend time around others." ],
"max_duration": "6 h",
"max_intensity": 1,
"rating": "good"
},
{
"type": "effect_type",
"id": "social_dissatisfied",
"name": [ "Lonely", "Very Lonely", "All Alone" ],
"desc": [
"You feel a little lonely.",
"You could really use a friend right now.",
"What's the point of surviving if you're all alone?"
],
"max_intensity": 3,
"rating": "bad"
},
{
"type": "effect_type",
"id": "asocial_satisfied",
"name": [ "Alone" ],
"desc": [ "Being on your own makes you feel good." ],
"max_intensity": 1,
"max_duration": "6 h",
"rating": "good"
},
{
"type": "effect_type",
"id": "asocial_dissatisfied",
"name": [ "Irritable", "Annoyed", "Crowded" ],
"desc": [
"Being around others has left you feeling drained.",
"OK, that's enough social time. You'd really rather be alone now.",
"Your nerves are frayed from all this socializing. You need some alone time to recharge."
],
"max_intensity": 3,
"rating": "bad"
},
{
"type": "effect_type",
"id": "genetics_damaged",
Expand Down Expand Up @@ -4859,5 +4937,34 @@
"desc": [ "You are descending at a safe speed." ],
"flags": [ "FEATHER_FALL" ],
"max_duration": "1 s"
},
{
"type": "effect_type",
"id": "quadruped_full",
"name": [ "" ],
"//": "Allows fully-quadrupedal mutants to run and crouch on all fours. For annoying reasons, this is handled via enchantments."
},
{
"type": "effect_type",
"id": "quadruped_half",
"name": [ "" ],
"//": "Allows quadrupedal mutants with front paws only to crouch-walk slightly faster than normal. For annoying reasons, this is handled via enchantments."
},
{
"type": "effect_type",
"id": "natural_stance",
"name": [ "Natural Stance" ],
"rating": "good",
"desc": [
"You are positioned to take advantage of your mutated anatomy, and will favor any natural attacks you may have. You receive no penalties for crouching in melee combat."
]
},
{
"type": "effect_type",
"id": "subaquatic_sonar",
"name": [ "Subaquatic SONAR" ],
"desc": [
"Every few seconds, an ultrasonic pulse is broadcast from your location. If you're underwater and your hearing is good enough, you may be able to navigate by the pings that come back."
]
}
]
14 changes: 14 additions & 0 deletions data/json/effects_on_condition/bionic_eocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,19 @@
"condition": { "u_has_bionics": "bio_leaky" },
"deactivate_condition": { "not": { "u_has_bionics": "bio_leaky" } },
"effect": [ { "u_mod_healthy": -1, "cap": -200 } ]
},
{
"type": "effect_on_condition",
"id": "EOC_BIO_SONAR_activated",
"recurrence": [ "1 seconds", "1 seconds" ],
"condition": { "and": [ { "not": { "u_has_effect": "subaquatic_sonar" } }, { "u_has_bionics": "bio_sonar" } ] },
"effect": [ { "u_add_effect": "subaquatic_sonar", "duration": "PERMANENT" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_BIO_SONAR_deactivated",
"recurrence": [ "1 seconds", "1 seconds" ],
"condition": { "u_has_effect": "subaquatic_sonar" },
"effect": [ { "u_lose_effect": "subaquatic_sonar" } ]
}
]
48 changes: 48 additions & 0 deletions data/json/effects_on_condition/effects_eocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,53 @@
}
],
"false_effect": [ { "u_lose_morale": "morale_bad_protein_bar" } ]
},
{
"type": "effect_on_condition",
"id": "eoc_social_satisfied",
"recurrence": [ "1 minutes", "5 minutes" ],
"condition": { "u_has_effect": "social_satisfied" },
"effect": [ { "u_add_morale": "morale_social", "bonus": 6, "max_bonus": 6, "duration": "1 days", "decay_start": "1 days" } ],
"false_effect": [ { "u_lose_morale": "morale_social" } ]
},
{
"type": "effect_on_condition",
"id": "eoc_social_dissatisfied",
"recurrence": [ "1 minutes", "5 minutes" ],
"condition": { "u_has_effect": "social_dissatisfied" },
"effect": [
{
"u_add_morale": "morale_asocial",
"bonus": { "math": [ "u_effect_intensity('social_dissatisfied') * -7" ] },
"max_bonus": -21,
"duration": "1 days",
"decay_start": "1 days"
}
],
"false_effect": [ { "u_lose_morale": "morale_social_dissatisfied" } ]
},
{
"type": "effect_on_condition",
"id": "eoc_asocial_satisfied",
"recurrence": [ "1 minutes", "5 minutes" ],
"condition": { "u_has_effect": "asocial_satisfied" },
"effect": [ { "u_add_morale": "morale_asocial", "bonus": 10, "max_bonus": 10, "duration": "1 days", "decay_start": "1 days" } ],
"false_effect": [ { "u_lose_morale": "morale_asocial" } ]
},
{
"type": "effect_on_condition",
"id": "eoc_asocial_dissatisfied",
"recurrence": [ "1 minutes", "5 minutes" ],
"condition": { "u_has_effect": "asocial_dissatisfied" },
"effect": [
{
"u_add_morale": "morale_social",
"bonus": { "math": [ "u_effect_intensity('asocial_dissatisfied') * -7" ] },
"max_bonus": -21,
"duration": "1 days",
"decay_start": "1 days"
}
],
"false_effect": [ { "u_lose_morale": "morale_asocial_dissatisfied" } ]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"condition": {
"and": [
{ "expects_vars": [ "prep_time", "spell_to_cast", "message_success", "message_fail" ] },
{ "math": [ "u_val('stamina')", ">", "_energy_amount" ] }
{ "math": [ "u_val('stamina')", ">", "energy_amount" ] }
]
},
"effect": [
Expand Down
Loading
Loading