Skip to content

Commit f42a0f0

Browse files
MaleclypseMaleclypse
authored
Merge pull request #82569 from Maleclypse/Trim-Chimera
Trim Chimera and apply "strict_threshreq": true,
1 parent 0557af6 commit f42a0f0

File tree

1 file changed

+41
-10
lines changed

1 file changed

+41
-10
lines changed

‎data/json/mutations/mutations.json‎

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4289,6 +4289,7 @@
42894289
"types": [ "TONGUE" ],
42904290
"changes_to": [ "GASTROPOD_EXTREMITY3" ],
42914291
"threshreq": [ "THRESH_GASTROPOD" ],
4292+
"strict_threshreq": true,
42924293
"category": [ "GASTROPOD" ],
42934294
"cancels": [ "FANGS", "MANDIBLES" ],
42944295
"active": true,
@@ -4313,6 +4314,7 @@
43134314
"types": [ "TONGUE" ],
43144315
"threshreq": [ "THRESH_GASTROPOD" ],
43154316
"category": [ "GASTROPOD" ],
4317+
"strict_threshreq": true,
43164318
"active": true,
43174319
"attacks": {
43184320
"attack_text_u": "You stab into %s with your harpoon tongue!",
@@ -4514,6 +4516,7 @@
45144516
"active": true,
45154517
"activated_is_setup": false,
45164518
"activated_eocs": [ "EOC_CRUSHING_LEAP" ],
4519+
"strict_threshreq": true,
45174520
"prereqs": [ "LEAPING_LEGS" ],
45184521
"threshreq": [ "THRESH_BATRACHIAN" ],
45194522
"category": [ "BATRACHIAN" ]
@@ -4844,7 +4847,7 @@
48444847
"types": [ "HORNS" ],
48454848
"prereqs": [ "HEADBUMPS" ],
48464849
"changes_to": [ "HORNS_CURLED", "HORNS_POINTED", "ANTLERS" ],
4847-
"category": [ "CATTLE", "CHIMERA" ],
4850+
"category": [ "CATTLE", "CHIMERA", "BEAST" ],
48484851
"restricts_gear": [ "head_crown" ],
48494852
"allow_soft_gear": true,
48504853
"attacks": {
@@ -4866,7 +4869,7 @@
48664869
"description": "You have a pair of large curled horns, like those of a ram. They allow you to make a strong bashing headbutt attack, but prevent wearing any headwear.",
48674870
"types": [ "HORNS" ],
48684871
"prereqs": [ "HORNS" ],
4869-
"category": [ "CHIMERA" ],
4872+
"category": [ "CHIMERA", "BEAST" ],
48704873
"restricts_gear": [ "head_crown" ],
48714874
"attacks": {
48724875
"attack_text_u": "You headbutt %s with your curled horns!",
@@ -5177,6 +5180,7 @@
51775180
"prereqs": [ "HEAVYSLEEPER2" ],
51785181
"prereqs2": [ "FAT" ],
51795182
"threshreq": [ "THRESH_URSINE" ],
5183+
"strict_threshreq": true,
51805184
"category": [ "URSINE" ],
51815185
"active": true,
51825186
"cost": 0,
@@ -5223,6 +5227,7 @@
52235227
"types": [ "DURABILITY" ],
52245228
"prereqs": [ "MUT_TOUGH2" ],
52255229
"threshreq": [ "THRESH_URSINE", "THRESH_CATTLE" ],
5230+
"strict_threshreq": true,
52265231
"cancels": [ "FLIMSY", "FLIMSY2", "FLIMSY3", "GLASSJAW" ],
52275232
"category": [ "URSINE", "CATTLE" ],
52285233
"enchantments": [ { "values": [ { "value": "MAX_HP", "multiply": 0.4 } ] } ]
@@ -5873,6 +5878,7 @@
58735878
"types": [ "SECRETION" ],
58745879
"prereqs": [ "WEB_WALKER" ],
58755880
"threshreq": [ "THRESH_SPIDER" ],
5881+
"strict_threshreq": true,
58765882
"changes_to": [ "WEB_WEAVER" ],
58775883
"category": [ "SPIDER" ],
58785884
"comfort": [
@@ -5899,6 +5905,7 @@
58995905
"types": [ "SECRETION" ],
59005906
"prereqs": [ "WEB_SPINNER" ],
59015907
"threshreq": [ "THRESH_SPIDER" ],
5908+
"strict_threshreq": true,
59025909
"category": [ "SPIDER" ],
59035910
"leads_to": [ "WEB_RAPPEL", "WEB_ROPE" ],
59045911
"active": true,
@@ -5929,6 +5936,7 @@
59295936
"description": "Your webbing is strong enough to support your weight. Activate to rappel down any drop you encounter, at the cost of nutrition.",
59305937
"prereqs": [ "WEB_WEAVER" ],
59315938
"threshreq": [ "THRESH_SPIDER" ],
5939+
"strict_threshreq": true,
59325940
"category": [ "SPIDER" ],
59335941
"active": true,
59345942
"cost": 95,
@@ -6090,6 +6098,7 @@
60906098
"prereqs": [ "HUGE" ],
60916099
"prereqs2": [ "STR_UP_3", "STR_UP_4" ],
60926100
"threshreq": [ "THRESH_URSINE", "THRESH_CATTLE", "THRESH_CRUSTACEAN" ],
6101+
"strict_threshreq": true,
60936102
"category": [ "URSINE", "CATTLE", "CRUSTACEAN" ],
60946103
"enchantments": [
60956104
{
@@ -6175,6 +6184,7 @@
61756184
"types": [ "STR" ],
61766185
"prereqs": [ "STR_UP_3" ],
61776186
"threshreq": [ "THRESH_BEAST", "THRESH_URSINE", "THRESH_CRUSTACEAN" ],
6187+
"strict_threshreq": true,
61786188
"category": [ "BEAST", "URSINE", "CRUSTACEAN" ],
61796189
"enchantments": [ { "values": [ { "value": "STRENGTH", "add": 7 } ] } ]
61806190
},
@@ -6268,6 +6278,7 @@
62686278
"types": [ "DEX" ],
62696279
"prereqs": [ "DEX_UP_3" ],
62706280
"threshreq": [ "THRESH_CEPHALOPOD", "THRESH_FISH" ],
6281+
"strict_threshreq": true,
62716282
"category": [ "CEPHALOPOD", "FISH" ],
62726283
"enchantments": [ { "values": [ { "value": "DEXTERITY", "add": 7 } ] } ]
62736284
},
@@ -6321,6 +6332,7 @@
63216332
"prereqs": [ "INT_UP_2" ],
63226333
"changes_to": [ "INT_UP_4" ],
63236334
"threshreq": [ "THRESH_CEPHALOPOD" ],
6335+
"strict_threshreq": true,
63246336
"category": [ "CEPHALOPOD" ],
63256337
"enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 4 } ] } ]
63266338
},
@@ -6336,6 +6348,7 @@
63366348
"types": [ "INT" ],
63376349
"prereqs": [ "INT_UP_3" ],
63386350
"threshreq": [ "THRESH_CEPHALOPOD" ],
6351+
"strict_threshreq": true,
63396352
"category": [ "CEPHALOPOD" ],
63406353
"enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 7 } ] } ]
63416354
},
@@ -6415,6 +6428,7 @@
64156428
"prereqs": [ "PER_UP_2" ],
64166429
"changes_to": [ "PER_UP_4" ],
64176430
"threshreq": [ "THRESH_ELFA", "THRESH_RAPTOR", "THRESH_BIRD" ],
6431+
"strict_threshreq": true,
64186432
"category": [ "ELFA", "RAPTOR", "BIRD" ],
64196433
"enchantments": [ { "values": [ { "value": "PERCEPTION", "add": 4 } ] } ]
64206434
},
@@ -6429,6 +6443,7 @@
64296443
"prereqs": [ "PER_UP_3" ],
64306444
"leads_to": [ "BIRD_EYE" ],
64316445
"threshreq": [ "THRESH_BIRD" ],
6446+
"strict_threshreq": true,
64326447
"category": [ "BIRD" ],
64336448
"enchantments": [ { "values": [ { "value": "PERCEPTION", "add": 7 } ] } ]
64346449
},
@@ -6608,6 +6623,7 @@
66086623
"prereqs": [ "SMALL2" ],
66096624
"purifiable": false,
66106625
"threshreq": [ "THRESH_MOUSE" ],
6626+
"strict_threshreq": true,
66116627
"leads_to": [ "CRAFTY" ],
66126628
"category": [ "MOUSE" ],
66136629
"enchantments": [
@@ -6632,6 +6648,7 @@
66326648
"purifiable": false,
66336649
"prereqs": [ "SMALL_OK" ],
66346650
"threshreq": [ "THRESH_MOUSE" ],
6651+
"strict_threshreq": true,
66356652
"category": [ "MOUSE" ],
66366653
"enchantments": [
66376654
{
@@ -6667,7 +6684,7 @@
66676684
"description": "You have a pair of bumps on your skull.",
66686685
"types": [ "HORNS" ],
66696686
"changes_to": [ "HORNS", "ANTENNAE" ],
6670-
"category": [ "CATTLE", "CHIMERA", "INSECT" ]
6687+
"category": [ "CATTLE", "CHIMERA", "INSECT", "BEAST" ]
66716688
},
66726689
{
66736690
"type": "mutation",
@@ -6715,6 +6732,7 @@
67156732
"description": "You've developed an extremely long and mobile tongue. You may use it to attack your enemies and pull them towards you.",
67166733
"types": [ "TONGUE" ],
67176734
"threshreq": [ "THRESH_BATRACHIAN" ],
6735+
"strict_threshreq": true,
67186736
"category": [ "BATRACHIAN" ],
67196737
"active": true,
67206738
"attacks": {
@@ -6850,6 +6868,7 @@
68506868
"types": [ "WINGS" ],
68516869
"prereqs": [ "WINGS_STUB" ],
68526870
"threshreq": [ "THRESH_INSECT" ],
6871+
"strict_threshreq": true,
68536872
"category": [ "INSECT" ],
68546873
"restricts_gear": [ "torso" ],
68556874
"social_modifiers": { "lie": 15, "persuade": 5, "intimidate": -20 },
@@ -7294,6 +7313,7 @@
72947313
"types": [ "METABOLISM" ],
72957314
"prereqs": [ "PERSISTENCE_HUNTER" ],
72967315
"threshreq": [ "THRESH_LUPINE" ],
7316+
"strict_threshreq": true,
72977317
"category": [ "LUPINE" ],
72987318
"enchantments": [ { "values": [ { "value": "STAMINA_REGEN_MOD", "add": 0.2 }, { "value": "SLEEPINESS", "multiply": -0.2 } ] } ]
72997319
},
@@ -7719,6 +7739,7 @@
77197739
"cancels": [ "MOUTH_TENTACLES" ],
77207740
"prereqs": [ "BEAK" ],
77217741
"threshreq": [ "THRESH_BIRD" ],
7742+
"strict_threshreq": true,
77227743
"category": [ "BIRD" ],
77237744
"wet_protection": [ { "part": "mouth", "ignored": 2 } ],
77247745
"active": true,
@@ -7829,6 +7850,7 @@
78297850
"leads_to": [ "AMORPHOUS" ],
78307851
"prereqs": [ "SLIMY" ],
78317852
"threshreq": [ "THRESH_SLIME", "THRESH_GASTROPOD" ],
7853+
"strict_threshreq": true,
78327854
"category": [ "SLIME", "GASTROPOD" ],
78337855
"flags": [ "IRRITANT_IMMUNE" ],
78347856
"wet_protection": [
@@ -7945,6 +7967,7 @@
79457967
"vitamins_absorb_multi": [ [ "blood", [ [ "mutant_toxin", 0.25 ] ] ], [ "flesh", [ [ "mutant_toxin", 0.75 ] ] ] ],
79467968
"category": [ "CHIROPTERAN" ],
79477969
"threshreq": [ "THRESH_CHIROPTERAN" ],
7970+
"strict_threshreq": true,
79487971
"vitamin_rates": [ [ "iron", 800 ], [ "vitC", -600 ] ]
79497972
},
79507973
{
@@ -8631,6 +8654,7 @@
86318654
"changes_to": [ "SHELL3" ],
86328655
"prereqs": [ "SHELL" ],
86338656
"threshreq": [ "THRESH_CEPHALOPOD", "THRESH_GASTROPOD" ],
8657+
"strict_threshreq": true,
86348658
"category": [ "CEPHALOPOD", "GASTROPOD" ],
86358659
"wet_protection": [ { "part": "torso", "ignored": 26 } ],
86368660
"active": true,
@@ -8656,6 +8680,7 @@
86568680
"types": [ "TORSO_ARMOR" ],
86578681
"prereqs": [ "SHELL2" ],
86588682
"threshreq": [ "THRESH_GASTROPOD" ],
8683+
"strict_threshreq": true,
86598684
"category": [ "GASTROPOD" ],
86608685
"wet_protection": [ { "part": "torso", "ignored": 45 } ],
86618686
"active": true,
@@ -8851,8 +8876,7 @@
88518876
"flags": [ "PLANTBLOOD" ],
88528877
"valid": false,
88538878
"purifiable": false,
8854-
"threshold": true,
8855-
"threshold_substitutes": [ "THRESH_CHIMERA" ]
8879+
"threshold": true
88568880
},
88578881
{
88588882
"type": "mutation",
@@ -8946,7 +8970,7 @@
89468970
"name": { "str": "Chaos" },
89478971
"points": 1,
89488972
"description": "You can't tell what you are anymore. Everything and yet nothing, like you weren't meant to exist. But you do, and you're a force, no matter what happens. Unlocks gaining post-threshold traits from most other mutation categories.",
8949-
"//": "Acceptable substitute for all lines except the human-based ones and slime - the former are more controlled, the latter will diverge too much in anatomy.",
8973+
"//": "Acceptable substitute for many lines except the human-based ones, raptor, plant, and slime - the former are more controlled, the latter will diverge too much in anatomy.",
89508974
"valid": false,
89518975
"purifiable": false,
89528976
"threshold": true
@@ -8959,8 +8983,7 @@
89598983
"description": "The chance to undo not one but TWO extinction events. You're confident you'll do fine.",
89608984
"valid": false,
89618985
"purifiable": false,
8962-
"threshold": true,
8963-
"threshold_substitutes": [ "THRESH_CHIMERA" ]
8986+
"threshold": true
89648987
},
89658988
{
89668989
"type": "mutation",
@@ -9074,6 +9097,7 @@
90749097
"description": "You're as comfortable in water as on land, and your body has adapted around that fact. Your base swimming speed is greatly increased, and weight will hinder you much less while swimming.",
90759098
"category": [ "FISH", "BATRACHIAN" ],
90769099
"threshreq": [ "THRESH_FISH", "THRESH_BATRACHIAN" ],
9100+
"strict_threshreq": true,
90779101
"enchantments": [ { "values": [ { "value": "MOVECOST_SWIM_MOD", "multiply": -0.55 } ] } ],
90789102
"purifiable": false
90799103
},
@@ -9088,6 +9112,7 @@
90889112
"description": "Like a true fish, your eyes lack eyelids, and are instead covered by a translucent, protective membrane that blocks irritants and water, and provides minor armor. It also allows you to sleep with your eyes open! Activate to cause the approach of hostile creatures to wake you up.",
90899113
"category": [ "FISH" ],
90909114
"threshreq": [ "THRESH_FISH" ],
9115+
"strict_threshreq": true,
90919116
"armor": [ { "parts": "eyes", "cut": 3, "bash": 1 } ],
90929117
"flags": [ "EYE_MEMBRANE", "SEESLEEP" ],
90939118
"active": true
@@ -9102,6 +9127,7 @@
91029127
"prereqs": [ "SEESLEEP", "FROG_EYES", "GILLS_CEPH" ],
91039128
"category": [ "FISH", "BATRACHIAN", "CEPHALOPOD" ],
91049129
"threshreq": [ "THRESH_FISH", "THRESH_BATRACHIAN", "THRESH_CEPHALOPOD" ],
9130+
"strict_threshreq": true,
91059131
"comfort": [
91069132
{
91079133
"conditions": [ { "type": "terrain", "flag": "DEEP_WATER" } ],
@@ -9135,7 +9161,8 @@
91359161
"description": "Your gills and skin are highly permeable to moisture, and you can hydrate your body through osmosis. While submerged in fresh water, any thirst you might have will be slaked.",
91369162
"prereqs": [ "GILLS" ],
91379163
"category": [ "FISH", "BATRACHIAN" ],
9138-
"threshreq": [ "THRESH_FISH", "THRESH_BATRACHIAN" ]
9164+
"threshreq": [ "THRESH_FISH", "THRESH_BATRACHIAN" ],
9165+
"strict_threshreq": true
91399166
},
91409167
{
91419168
"type": "mutation",
@@ -10456,6 +10483,7 @@
1045610483
"types": [ "ACCLIMATIZATION" ],
1045710484
"category": [ "FISH", "CEPHALOPOD", "GASTROPOD", "LIZARD", "BATRACHIAN", "PLANT" ],
1045810485
"threshreq": [ "THRESH_FISH", "THRESH_CEPHALOPOD", "THRESH_GASTROPOD", "THRESH_LIZARD", "THRESH_BATRACHIAN" ],
10486+
"strict_threshreq": true,
1045910487
"enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 25 } ] } ]
1046010488
},
1046110489
{
@@ -10486,6 +10514,7 @@
1048610514
"category": [ "CEPHALOPOD" ],
1048710515
"prereqs": [ "CAMO1" ],
1048810516
"threshreq": [ "THRESH_CEPHALOPOD" ],
10517+
"strict_threshreq": true,
1048910518
"enchantments": [ { "values": [ { "value": "STEALTH_MODIFIER", "add": 20 } ] } ]
1049010519
},
1049110520
{
@@ -10502,7 +10531,8 @@
1050210531
"enchantments": [ { "values": [ { "value": "LEARNING_FOCUS", "add": 17 }, { "value": "SKILL_RUST_RESIST", "multiply": 0.5 } ] } ],
1050310532
"category": [ "CEPHALOPOD" ],
1050410533
"prereqs": [ "INT_UP_4" ],
10505-
"threshreq": [ "THRESH_CEPHALOPOD" ]
10534+
"threshreq": [ "THRESH_CEPHALOPOD" ],
10535+
"strict_threshreq": true
1050610536
},
1050710537
{
1050810538
"type": "mutation",
@@ -10717,6 +10747,7 @@
1071710747
"types": [ "TEETH" ],
1071810748
"prereqs": [ "FANGS" ],
1071910749
"threshreq": [ "THRESH_CHIROPTERAN" ],
10750+
"strict_threshreq": true,
1072010751
"category": [ "CHIROPTERAN" ],
1072110752
"integrated_armor": [ "integrated_vampire_fangs" ]
1072210753
},

0 commit comments

Comments
 (0)