From ed603f5e99ab2c0e3eb31f258d3f6e7912e1b3d4 Mon Sep 17 00:00:00 2001 From: Son Phan Trung Date: Wed, 17 Aug 2022 14:04:39 +0700 Subject: [PATCH 1/5] traits: update memory-based traits and bionics description --- data/json/bionics.json | 3 ++- data/json/items/bionics.json | 2 +- data/json/mutations/mutations.json | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index e7f690b24e1be..11a529c079eeb 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -1118,7 +1118,7 @@ "id": "bio_memory", "type": "bionic", "name": { "str": "Enhanced Memory Banks" }, - "description": "Your memory has been enhanced with small quantum storage drives. While active, you learn - both through reading and practice - more quickly. Additionally, you can't forget skills you've already learned, and the layout of terrain you've explored will remain in your memory for an incredibly long time.", + "description": "Your memory has been enhanced with small quantum storage drives. While active, you learn - both through reading and practice - more quickly. Additionally, you can't forget skills you've already learned.", "occupied_bodyparts": [ [ "head", 3 ] ], "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ], "active_flags": [ "CBQ_LEARN_BONUS" ], @@ -1129,6 +1129,7 @@ "enchantments": [ { "condition": "ACTIVE", + "//": "TODO: Remove MAP_MEMORY after 0.G Stable, as map memory is now permanent", "values": [ { "value": "MAP_MEMORY", "add": 49 }, { "value": "READING_EXP", "add": 2 }, diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json index 48947f4db6206..e880e40fd847e 100644 --- a/data/json/items/bionics.json +++ b/data/json/items/bionics.json @@ -574,7 +574,7 @@ "type": "BIONIC_ITEM", "name": { "str": "Enhanced Memory Banks CBM" }, "looks_like": "bio_int_enhancer", - "description": "A set of highly-advanced quantum storage drives used to enhance memory. While active, they increase the rate that the user learns skills, and give them near-perfect memory of skills and terrain.", + "description": "A set of highly-advanced quantum storage drives used to enhance memory. While active, they increase the rate that the user learns skills.", "price": 1000000, "weight": "100 g", "difficulty": 9 diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 2ef570d397738..5c29308c2c880 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -762,11 +762,12 @@ "id": "GOODMEMORY", "name": { "str": "Good Memory" }, "points": 3, - "description": "You have an exceptional memory, and find it easy to remember things. Your skills will erode slightly slower than usual, and you can remember more terrain.", + "description": "You have an exceptional memory, and find it easy to remember things. Your skills will erode slightly slower than usual.", "skill_rust_multiplier": 0.66, "starting_trait": true, "valid": false, "cancels": [ "FORGETFUL" ], + "//": "TODO: Remove this after 0.G Stable, as map memory is now permanent.", "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MAP_MEMORY", "multiply": 1 } ] } ] }, { @@ -1508,12 +1509,13 @@ "id": "FORGETFUL", "name": { "str": "Forgetful" }, "points": -3, - "description": "You have a hard time remembering things. Your skills will erode slightly faster than usual, and you can remember less terrain.", + "description": "You have a hard time remembering things. Your skills will erode slightly faster than usual.", "social_modifiers": { "lie": -5 }, "skill_rust_multiplier": 1.33, "starting_trait": true, "category": [ "BEAST", "MEDICAL", "CHIMERA", "MOUSE", "INSECT", "RABBIT" ], "cancels": [ "GOODMEMORY" ], + "//": "TODO: Remove this after 0.G Stable, as map memory is now permanent.", "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MAP_MEMORY", "multiply": -0.5 } ] } ] }, { From 979cc57301c4fc206338e746d878334eb4532889 Mon Sep 17 00:00:00 2001 From: Son Phan Trung Date: Wed, 17 Aug 2022 14:11:17 +0700 Subject: [PATCH 2/5] Lint --- data/json/bionics.json | 2 +- data/json/mutations/mutations.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index 11a529c079eeb..25e2e48dad532 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -1129,7 +1129,7 @@ "enchantments": [ { "condition": "ACTIVE", - "//": "TODO: Remove MAP_MEMORY after 0.G Stable, as map memory is now permanent", + "//": "TODO: Remove MAP_MEMORY after 0.G Stable, as map memory is now permanent", "values": [ { "value": "MAP_MEMORY", "add": 49 }, { "value": "READING_EXP", "add": 2 }, diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 5c29308c2c880..8424afec99a0c 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -767,7 +767,7 @@ "starting_trait": true, "valid": false, "cancels": [ "FORGETFUL" ], - "//": "TODO: Remove this after 0.G Stable, as map memory is now permanent.", + "//": "TODO: Remove this after 0.G Stable, as map memory is now permanent.", "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MAP_MEMORY", "multiply": 1 } ] } ] }, { @@ -1515,7 +1515,7 @@ "starting_trait": true, "category": [ "BEAST", "MEDICAL", "CHIMERA", "MOUSE", "INSECT", "RABBIT" ], "cancels": [ "GOODMEMORY" ], - "//": "TODO: Remove this after 0.G Stable, as map memory is now permanent.", + "//": "TODO: Remove this after 0.G Stable, as map memory is now permanent.", "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MAP_MEMORY", "multiply": -0.5 } ] } ] }, { From 5100ecff73048a73b727efe863d48642e36def9e Mon Sep 17 00:00:00 2001 From: Son Phan Trung Date: Thu, 25 Aug 2022 18:13:15 +0700 Subject: [PATCH 3/5] Alright, stub code rm'd --- data/json/bionics.json | 2 -- data/json/mutations/mutations.json | 4 ---- src/magic_enchantment.cpp | 1 - 3 files changed, 7 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index 25e2e48dad532..467a20ba3fc25 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -1129,9 +1129,7 @@ "enchantments": [ { "condition": "ACTIVE", - "//": "TODO: Remove MAP_MEMORY after 0.G Stable, as map memory is now permanent", "values": [ - { "value": "MAP_MEMORY", "add": 49 }, { "value": "READING_EXP", "add": 2 }, { "value": "SKILL_RUST_RESIST", "add": 20 }, { "value": "LEARNING_FOCUS", "add": 10 } diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index d83c16e62005c..effb3cec62900 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -767,8 +767,6 @@ "starting_trait": true, "valid": false, "cancels": [ "FORGETFUL" ], - "//": "TODO: Remove this after 0.G Stable, as map memory is now permanent.", - "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MAP_MEMORY", "multiply": 1 } ] } ] }, { "type": "mutation", @@ -1515,8 +1513,6 @@ "starting_trait": true, "category": [ "BEAST", "MEDICAL", "CHIMERA", "MOUSE", "INSECT", "RABBIT" ], "cancels": [ "GOODMEMORY" ], - "//": "TODO: Remove this after 0.G Stable, as map memory is now permanent.", - "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MAP_MEMORY", "multiply": -0.5 } ] } ] }, { "type": "mutation", diff --git a/src/magic_enchantment.cpp b/src/magic_enchantment.cpp index d114421bc91e1..939467d361daa 100644 --- a/src/magic_enchantment.cpp +++ b/src/magic_enchantment.cpp @@ -89,7 +89,6 @@ namespace io case enchant_vals::mod::EFFECTIVE_HEALTH_MOD: return "EFFECTIVE_HEALTH_MOD"; case enchant_vals::mod::MOD_HEALTH: return "MOD_HEALTH"; case enchant_vals::mod::MOD_HEALTH_CAP: return "MOD_HEALTH_CAP"; - case enchant_vals::mod::MAP_MEMORY: return "MAP_MEMORY"; case enchant_vals::mod::READING_EXP: return "READING_EXP"; case enchant_vals::mod::SKILL_RUST_RESIST: return "SKILL_RUST_RESIST"; case enchant_vals::mod::LEARNING_FOCUS: return "LEARNING_FOCUS"; From 629f2a32bc7c92356feb6679c68dae225288ee47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Thu, 25 Aug 2022 19:44:47 +0700 Subject: [PATCH 4/5] Revert the change to c++ (for now) --- src/magic_enchantment.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/magic_enchantment.cpp b/src/magic_enchantment.cpp index 939467d361daa..d114421bc91e1 100644 --- a/src/magic_enchantment.cpp +++ b/src/magic_enchantment.cpp @@ -89,6 +89,7 @@ namespace io case enchant_vals::mod::EFFECTIVE_HEALTH_MOD: return "EFFECTIVE_HEALTH_MOD"; case enchant_vals::mod::MOD_HEALTH: return "MOD_HEALTH"; case enchant_vals::mod::MOD_HEALTH_CAP: return "MOD_HEALTH_CAP"; + case enchant_vals::mod::MAP_MEMORY: return "MAP_MEMORY"; case enchant_vals::mod::READING_EXP: return "READING_EXP"; case enchant_vals::mod::SKILL_RUST_RESIST: return "SKILL_RUST_RESIST"; case enchant_vals::mod::LEARNING_FOCUS: return "LEARNING_FOCUS"; From 40bdd978675c4d26a3afb13aa6c4527936ad8ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Fri, 26 Aug 2022 10:45:57 +0700 Subject: [PATCH 5/5] Period Shenanigans --- data/json/mutations/mutations.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index effb3cec62900..6022cdd4e4a6e 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -766,7 +766,7 @@ "skill_rust_multiplier": 0.66, "starting_trait": true, "valid": false, - "cancels": [ "FORGETFUL" ], + "cancels": [ "FORGETFUL" ] }, { "type": "mutation", @@ -1512,7 +1512,7 @@ "skill_rust_multiplier": 1.33, "starting_trait": true, "category": [ "BEAST", "MEDICAL", "CHIMERA", "MOUSE", "INSECT", "RABBIT" ], - "cancels": [ "GOODMEMORY" ], + "cancels": [ "GOODMEMORY" ] }, { "type": "mutation",