From 5a74b96c3956cdea9cf0b0dcdfd40671b29c1f82 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 7 Feb 2022 12:23:27 -0800 Subject: Updated to 2022-02-04-1939 Revert generic nv and telescopic lens changes. --- revert-03_generic-nv.patch | 364 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 364 insertions(+) create mode 100644 revert-03_generic-nv.patch (limited to 'revert-03_generic-nv.patch') diff --git a/revert-03_generic-nv.patch b/revert-03_generic-nv.patch new file mode 100644 index 0000000..fa6e34c --- /dev/null +++ b/revert-03_generic-nv.patch @@ -0,0 +1,364 @@ +--- a/data/json/mutations/mutations.json ++++ b/data/json/mutations/mutations.json +@@ -151,7 +151,7 @@ + "description": "You heal faster when sleeping and will even recover a small amount of HP when not sleeping.", + "starting_trait": true, + "types": [ "HEALING" ], +- "changes_to": [ "FASTHEALER2", "REGEN_LIZ" ], ++ "changes_to": [ "FASTHEALER2" ], + "category": [ "MEDICAL" ], + "healing_awake": 0.2, + "healing_resting": 0.5, +@@ -213,7 +213,7 @@ + "starting_trait": true, + "changes_to": [ "NIGHTVISION2" ], + "cancels": [ "ELFA_NV", "ELFA_FNV", "FEL_NV", "URSINE_EYE" ], +- "category": [ "BIRD", "CATTLE", "INSECT" ], ++ "category": [ "BIRD", "CATTLE", "INSECT", "URSINE" ], + "active": true, + "starts_active": true, + "night_vision_range": 2 +@@ -692,7 +692,7 @@ + "description": "Without glasses, your seeing radius is severely reduced! However, you are guaranteed to start with a pair of glasses.", + "starting_trait": true, + "cancels": [ "URSINE_EYE", "EAGLEEYED", "HYPEROPIC" ], +- "category": [ "BEAST", "TROGLOBITE" ] ++ "category": [ "BEAST", "TROGLOBITE", "URSINE" ] + }, + { + "type": "mutation", +@@ -1238,7 +1238,7 @@ + "prereqs": [ "NIGHTVISION" ], + "changes_to": [ "NIGHTVISION3" ], + "cancels": [ "ELFA_NV", "ELFA_FNV", "FEL_NV", "URSINE_EYE" ], +- "category": [ "FISH", "BEAST", "INSECT", "RAT", "CHIMERA", "LUPINE", "MOUSE" ], ++ "category": [ "FISH", "BEAST", "INSECT", "RAT", "CHIMERA", "LUPINE", "MOUSE", "FELINE", "URSINE" ], + "active": true, + "starts_active": true, + "night_vision_range": 4.5 +@@ -1252,7 +1252,8 @@ + "prereqs": [ "NIGHTVISION2" ], + "leads_to": [ "INFRARED" ], + "cancels": [ "ELFA_NV", "ELFA_FNV", "FEL_NV", "URSINE_EYE" ], +- "category": [ "FISH", "TROGLOBITE", "SPIDER" ], ++ "threshreq": [ "THRESH_FISH", "THRESH_TROGLOBITE", "THRESH_SPIDER", "THRESH_INSECT", "THRESH_ELFA", "THRESH_CEPHALOPOD" ], ++ "category": [ "FISH", "TROGLOBITE", "SPIDER", "INSECT", "ELFA", "CEPHALOPOD" ], + "active": true, + "starts_active": true, + "night_vision_range": 10 +@@ -1265,62 +1266,22 @@ + "visibility": 8, + "ugliness": 5, + "description": "Your eyes still bulge, yet your pupils look different somehow. Water doesn't seem to cause any trouble at all, though.", +- "leads_to": [ "CEPH_VISION" ], ++ "leads_to": [ "NIGHTVISION3" ], + "cancels": [ "BIRD_EYE", "LIZ_EYE", "FEL_EYE", "URSINE_EYE", "COMPOUND_EYES", "ELFAEYES" ], + "category": [ "CEPHALOPOD" ] + }, +- { +- "type": "mutation", +- "id": "CEPH_VISION", +- "name": { "str": "Cephalopod Vision" }, +- "points": 3, +- "description": "Your brain has caught up with your eyes. You can see much better in the dark, but sunlight seems much brighter now. Activate to toggle NV-visible areas on or off.", +- "prereqs": [ "CEPH_EYES" ], +- "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3", "ELFA_NV", "ELFA_FNV" ], +- "category": [ "CEPHALOPOD" ], +- "active": true, +- "starts_active": true, +- "night_vision_range": 10 +- }, + { + "type": "mutation", + "id": "ELFAEYES", + "name": { "str": "Fey Eyes" }, + "points": 1, + "description": "Your eyes have turned… green. It's tough to tell the exact shade as it seems to shift. The effect is… pleasant.", +- "leads_to": [ "ELFA_NV" ], + "valid": false, + "cancels": [ "BIRD_EYE", "LIZ_EYE", "FEL_EYE", "URSINE_EYE", "COMPOUND_EYES" ], ++ "leads_to": [ "NIGHTVISION2" ], + "category": [ "ELFA" ], + "social_modifiers": { "lie": 5, "persuade": 5, "intimidate": -5 } + }, +- { +- "type": "mutation", +- "id": "ELFA_NV", +- "name": { "str": "Fey Vision" }, +- "points": 3, +- "description": "The shadows don't seem as dark now. Activate to toggle NV-visible areas on or off.", +- "prereqs": [ "ELFAEYES" ], +- "changes_to": [ "ELFA_FNV" ], +- "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ], +- "category": [ "ELFA" ], +- "active": true, +- "starts_active": true, +- "night_vision_range": 4.5 +- }, +- { +- "type": "mutation", +- "id": "ELFA_FNV", +- "name": { "str": "Fey Nightsight" }, +- "points": 5, +- "description": "You have great low-light vision now, though that doesn't allow you to perform fine tasks such as crafting and reading in darkness. Activate to toggle NV-visible areas on or off.", +- "prereqs": [ "ELFA_NV" ], +- "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ], +- "category": [ "ELFA" ], +- "active": true, +- "starts_active": true, +- "night_vision_range": 10 +- }, + { + "type": "mutation", + "id": "FEL_EYE", +@@ -1330,46 +1291,10 @@ + "ugliness": 1, + "description": "Your eyes have mutated, now having a slitted pupil and glittering in light, much like those of cats. This is visually striking, but it isn't helping you see at night.", + "social_modifiers": { "lie": 2, "persuade": 2 }, +- "leads_to": [ "FEL_NV" ], ++ "prereqs": [ "NIGHTVISION" ], + "cancels": [ "ELFAEYES", "LIZ_EYE", "BIRD_EYE", "URSINE_EYE", "COMPOUND_EYES" ], + "category": [ "FELINE", "BEAST" ] + }, +- { +- "type": "mutation", +- "id": "FEL_NV", +- "name": { "str": "Feline Vision" }, +- "points": 4, +- "description": "Your optic nerves and brain caught up with your eyes. Now you can see pretty well at night. Activate to toggle NV-visible areas on or off.", +- "prereqs": [ "FEL_EYE" ], +- "cancels": [ "ELFA_NV", "ELFA_FNV", "LIZ_IR", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ], +- "category": [ "FELINE" ], +- "active": true, +- "starts_active": true, +- "night_vision_range": 4.5 +- }, +- { +- "type": "mutation", +- "id": "URSINE_EYE", +- "name": { "str": "Ursine Vision" }, +- "points": 1, +- "description": "Your visual processing has shifted: though you can see better in the dark, you're nearsighted in the light. Maybe glasses would help. Activate to toggle NV-visible areas on or off.", +- "cancels": [ +- "ELFAEYES", +- "LIZ_EYE", +- "BIRD_EYE", +- "FEL_EYE", +- "COMPOUND_EYES", +- "NIGHTVISION", +- "NIGHTVISION2", +- "NIGHTVISION3", +- "MYOPIC", +- "HYPEROPIC" +- ], +- "category": [ "URSINE" ], +- "active": true, +- "starts_active": true, +- "night_vision_range": 4.5 +- }, + { + "type": "mutation", + "id": "BIRD_EYE", +@@ -1378,7 +1303,7 @@ + "visibility": 1, + "description": "Your vision has become particularly acute: you suspect you could pick out zombies much farther away. Perception +4.", + "cancels": [ "ELFAEYES", "FEL_EYE", "LIZ_EYE", "URSINE_EYE", "COMPOUND_EYES" ], +- "prereqs": [ "PER_UP" ], ++ "prereqs": [ "PER_UP_2" ], + "threshreq": [ "THRESH_BIRD" ], + "category": [ "BIRD" ], + "passive_mods": { "per_mod": 4 } +@@ -1391,7 +1316,8 @@ + "description": "Your eyes have mutated to pick up radiation in the infrared spectrum.", + "prereqs": [ "NIGHTVISION3" ], + "cancels": [ "LIZ_IR" ], +- "category": [ "INSECT", "TROGLOBITE", "SPIDER" ] ++ "category": [ "INSECT", "TROGLOBITE", "SPIDER" ], ++ "threshreq": [ "THRESH_INSECT", "THRESH_TROGLOBITE", "THRESH_SPIDER" ] + }, + { + "type": "mutation", +@@ -1425,7 +1351,7 @@ + "types": [ "HEALING" ], + "prereqs": [ "FASTHEALER" ], + "changes_to": [ "REGEN" ], +- "category": [ "PLANT" ], ++ "category": [ "PLANT", "LIZARD" ], + "healing_awake": 0.66, + "healing_resting": 0.5, + "mending_modifier": 4.0 +@@ -1452,7 +1378,7 @@ + "purifiable": false, + "description": "Your broken limbs mend themselves without significant difficulty.", + "cancels": [ "ROT1", "ROT2", "ROT3" ], +- "prereqs": [ "FASTHEALER" ], ++ "prereqs": [ "FASTHEALER2" ], + "threshreq": [ "THRESH_LIZARD" ], + "category": [ "LIZARD" ], + "mending_modifier": 20.0 +@@ -1790,7 +1716,7 @@ + "points": 0, + "visibility": 4, + "ugliness": 1, +- "bodytemp_modifiers": [ 300, 800 ], ++ "bodytemp_modifiers": [ 250, 800 ], + "bodytemp_sleep": 250, + "description": "You shan't need to migrate south with your layer of down. It's even better with no apes around to kill you for it!", + "types": [ "SKIN" ], +@@ -1820,7 +1746,7 @@ + "points": 1, + "visibility": 10, + "ugliness": 3, +- "bodytemp_modifiers": [ 750, 1500 ], ++ "bodytemp_modifiers": [ 250, 1200 ], + "bodytemp_sleep": 500, + "description": "Thick black fur has grown to cover your entire body, providing a marginal protection against bashing attacks, and considerable protection from cold.", + "types": [ "SKIN" ], +@@ -1836,7 +1762,7 @@ + "points": 2, + "visibility": 10, + "ugliness": 3, +- "bodytemp_modifiers": [ 750, 1500 ], ++ "bodytemp_modifiers": [ 250, 1200 ], + "bodytemp_sleep": 500, + "description": "Your fur has grown out and thickened, providing noticeable protection from bashing attacks as well as considerable insulation.", + "types": [ "SKIN" ], +@@ -1851,7 +1777,7 @@ + "points": 1, + "visibility": 10, + "ugliness": 3, +- "bodytemp_modifiers": [ 750, 1500 ], ++ "bodytemp_modifiers": [ 250, 1200 ], + "bodytemp_sleep": 500, + "description": "Dense gray fur has grown to cover your entire body, providing a marginal protection against bashing attacks, and considerable protection from cold.", + "types": [ "SKIN" ], +@@ -1866,7 +1792,7 @@ + "points": 0, + "visibility": 10, + "ugliness": 3, +- "bodytemp_modifiers": [ 500, 1000 ], ++ "bodytemp_modifiers": [ 250, 1000 ], + "bodytemp_sleep": 300, + "description": "You've grown sleek brown fur, providing some protection from cold.", + "types": [ "SKIN" ], +@@ -2651,6 +2577,7 @@ + "description": "Your eyes are compound, like those of an insect. This increases your Perception by 2 so long as you aren't wearing eyewear.", + "cancels": [ "ELFAEYES", "FEL_EYE", "URSINE_EYE", "BIRD_EYE", "LIZ_EYE" ], + "prereqs": [ "EYEBULGE" ], ++ "leads_to": [ "NIGHTVISION2" ], + "category": [ "INSECT" ] + }, + { +@@ -4294,7 +4221,8 @@ + "description": "You're a real head-turner. Some people will react well to your appearance, and most people have an easier time trusting you.", + "cancels": [ "UGLY", "DEFORMED", "DEFORMED2", "DEFORMED3" ], + "prereqs": [ "PRETTY" ], +- "changes_to": [ "BEAUTIFUL2" ] ++ "changes_to": [ "BEAUTIFUL2" ], ++ "category": [ "FELINE", "LUPINE" ] + }, + { + "type": "mutation", +@@ -4963,7 +4891,8 @@ + "points": -3, + "description": "Your body's ability to digest meat is severely hampered. Eating meat has a good chance of making you vomit it back up; even if you manage to keep it down, its nutritional value is greatly reduced.", + "cancels": [ "CARNIVORE", "SAPROVORE", "ANTIFRUIT", "MEATARIAN" ], +- "leads_to": [ "RUMINANT" ] ++ "leads_to": [ "RUMINANT" ], ++ "category": [ "CATTLE" ] + }, + { + "type": "mutation", +@@ -5515,7 +5444,7 @@ + "points": -1, + "visibility": 10, + "ugliness": 3, +- "bodytemp_modifiers": [ 500, 750 ], ++ "bodytemp_modifiers": [ 250, 750 ], + "bodytemp_sleep": 200, + "mixed_effect": true, + "description": "Your protective shell has grown large enough to accommodate--if need be--your whole body. Activate to pull your head and limbs into your shell, trading mobility and vision for warmth and shelter.", + +--- a/data/json/obsoletion/mutations.json ++++ b/data/json/obsoletion/mutations.json +@@ -174,5 +174,80 @@ + "points": -4, + "description": "Spending any amount of time in familiar places makes you miserable. Must. Keep. Moving.", + "valid": false ++ }, ++ { ++ "type": "mutation", ++ "id": "ELFA_NV", ++ "name": { "str": "Fey Vision" }, ++ "points": 3, ++ "description": "The shadows don't seem as dark now. Activate to toggle NV-visible areas on or off.", ++ "prereqs": [ "ELFAEYES" ], ++ "changes_to": [ "ELFA_FNV" ], ++ "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ], ++ "active": true, ++ "starts_active": true, ++ "valid": false, ++ "night_vision_range": 4.5 ++ }, ++ { ++ "type": "mutation", ++ "id": "ELFA_FNV", ++ "name": { "str": "Fey Nightsight" }, ++ "points": 5, ++ "description": "You have great low-light vision now, though that doesn't allow you to perform fine tasks such as crafting and reading in darkness. Activate to toggle NV-visible areas on or off.", ++ "prereqs": [ "ELFA_NV" ], ++ "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ], ++ "active": true, ++ "starts_active": true, ++ "valid": false, ++ "night_vision_range": 10 ++ }, ++ { ++ "type": "mutation", ++ "id": "FEL_NV", ++ "name": { "str": "Feline Vision" }, ++ "points": 4, ++ "description": "Your optic nerves and brain caught up with your eyes. Now you can see pretty well at night. Activate to toggle NV-visible areas on or off.", ++ "prereqs": [ "FEL_EYE" ], ++ "cancels": [ "ELFA_NV", "ELFA_FNV", "LIZ_IR", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ], ++ "active": true, ++ "starts_active": true, ++ "valid": false, ++ "night_vision_range": 4.5 ++ }, ++ { ++ "type": "mutation", ++ "id": "CEPH_VISION", ++ "name": { "str": "Cephalopod Vision" }, ++ "points": 3, ++ "description": "Your brain has caught up with your eyes. You can see much better in the dark, but sunlight seems much brighter now. Activate to toggle NV-visible areas on or off.", ++ "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3", "ELFA_NV", "ELFA_FNV" ], ++ "active": true, ++ "starts_active": true, ++ "valid": false, ++ "night_vision_range": 10 ++ }, ++ { ++ "type": "mutation", ++ "id": "URSINE_EYE", ++ "name": { "str": "Ursine Vision" }, ++ "points": 1, ++ "description": "Your visual processing has shifted: though you can see better in the dark, you're nearsighted in the light. Maybe glasses would help. Activate to toggle NV-visible areas on or off.", ++ "cancels": [ ++ "ELFAEYES", ++ "LIZ_EYE", ++ "BIRD_EYE", ++ "FEL_EYE", ++ "COMPOUND_EYES", ++ "NIGHTVISION", ++ "NIGHTVISION2", ++ "NIGHTVISION3", ++ "MYOPIC", ++ "HYPEROPIC" ++ ], ++ "valid": false, ++ "active": true, ++ "starts_active": true, ++ "night_vision_range": 4.5 + } + ] -- cgit v1.2.1