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.

Sign up for GitHub

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

traits: update memory-based traits and bionics description #60237

Merged
merged 9 commits into from
Aug 28, 2022
Merged

traits: update memory-based traits and bionics description #60237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ed603f5
traits: update memory-based traits and bionics description
sonphantrung Aug 17, 2022
979cc57
Lint
sonphantrung Aug 17, 2022
ca1d08a
Merge branch 'CleverRaven:master' into mmm
sonphantrung Aug 18, 2022
cc251f6
Merge branch 'CleverRaven:master' into mmm
sonphantrung Aug 18, 2022
26a641b
Merge branch 'CleverRaven:master' into mmm
sonphantrung Aug 19, 2022
5100ecf
Alright, stub code rm'd
sonphantrung Aug 25, 2022
629f2a3
Revert the change to c++ (for now)
sonphantrung Aug 25, 2022
40bdd97
Period Shenanigans
sonphantrung Aug 26, 2022
21abdf3
Merge branch 'CleverRaven:master' into mmm
sonphantrung Aug 27, 2022
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
3 changes: 1 addition & 2 deletions data/json/bionics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand All @@ -1130,7 +1130,6 @@
{
"condition": "ACTIVE",
"values": [
{ "value": "MAP_MEMORY", "add": 49 },
{ "value": "READING_EXP", "add": 2 },
{ "value": "SKILL_RUST_RESIST", "add": 20 },
{ "value": "LEARNING_FOCUS", "add": 10 }
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/bionics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions data/json/mutations/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,12 +762,11 @@
"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" ],
"enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MAP_MEMORY", "multiply": 1 } ] } ]
"cancels": [ "FORGETFUL" ]
},
{
"type": "mutation",
Expand Down Expand Up @@ -1508,13 +1507,12 @@
"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" ],
"enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MAP_MEMORY", "multiply": -0.5 } ] } ]
"cancels": [ "GOODMEMORY" ]
},
{
"type": "mutation",
Expand Down