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

Kill the remnants in the name of math #71027

Merged
merged 6 commits into from
Jan 19, 2024
Merged

Kill the remnants in the name of math #71027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a80490e
fight the old syntax
GuardianDll Jan 17, 2024
44154d8
Merge branch 'master' into mathmathmathmath
GuardianDll Jan 18, 2024
d34bc8c
mathify u_add_var, that assign numerical value
GuardianDll Jan 18, 2024
e1a15d9
remove TALK_TEST_ADJUST_VARS
GuardianDll Jan 18, 2024
3af1f50
Apply suggestions from code review
GuardianDll Jan 18, 2024
4aa1c4c
Merge branch 'CleverRaven:master' into mathmathmathmath
GuardianDll Jan 18, 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
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/terrain-traps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"and": [ { "u_has_items": { "item": "human_sample", "count": 1 } }, { "u_has_mission": "BEM_human_sample_mission" } ]
},
"effect": [
{ "u_adjust_var": "BEM_human_sample_reward_owed", "type": "counter", "context": "BEM", "adjustment": 1 },
{ "math": [ "u_counter_BEM_BEM_human_sample_reward_owed", "++" ] },
{ "u_message": "You prepare the drop as instructed", "popup": true },
{ "u_consume_item": "human_sample", "count": 1 },
{ "finish_mission": "BEM_human_sample_mission", "success": true }
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/science.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,15 +1354,15 @@
"condition": { "not": { "one_in_chance": 3 } },
"effect": [
{ "u_message": "You have a slight feeling of being watched." },
{ "u_adjust_var": "migo_interest", "type": "migo_interest", "context": "interest", "adjustment": 1 }
{ "math": [ "u_migo_interest_interest_migo_interest", "++" ] }
]
},
{
"id": "EOC_MIGO_BIO_TECH_INTEREST_INTENSE",
"condition": { "not": { "one_in_chance": 100 } },
"effect": [
{ "u_message": "You have an intense feeling of being watched." },
{ "u_adjust_var": "migo_interest", "type": "migo_interest", "context": "interest", "adjustment": 10 }
{ "math": [ "u_migo_interest_interest_migo_interest", "+=", "10" ] }
]
},
{
Expand Down
16 changes: 8 additions & 8 deletions data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
{ "npc_at_om_location": "lighthouse_ground" }
]
},
"effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
"effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
},
{
"text": "Yes. First floor is clear.",
Expand All @@ -151,7 +151,7 @@
{ "npc_at_om_location": "lighthouse_z1" }
]
},
"effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
"effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
},
{
"text": "Yes. Second floor is clear.",
Expand All @@ -163,7 +163,7 @@
{ "npc_at_om_location": "lighthouse_z2" }
]
},
"effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
"effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
},
{
"text": "Yes. Third floor is clear.",
Expand All @@ -175,7 +175,7 @@
{ "npc_at_om_location": "lighthouse_z3" }
]
},
"effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
"effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
},
{
"text": "Yes. Fourth floor is clear.",
Expand All @@ -187,7 +187,7 @@
{ "npc_at_om_location": "lighthouse_z4" }
]
},
"effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
"effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
},
{
"text": "Yes. Top floor is clear.",
Expand All @@ -198,7 +198,7 @@
{ "npc_at_om_location": "lighthouse_z5" }
]
},
"effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 },
"effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] },
"topic": "TALK_lighthouse_man_cleaned_done"
},
{
Expand All @@ -210,7 +210,7 @@
{ "npc_at_om_location": "lighthouse_ground" }
]
},
"effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 },
"effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] },
"topic": "TALK_MISSION_INQUIRE"
},
{ "text": "Not yet.", "topic": "TALK_DONE" }
Expand Down Expand Up @@ -358,7 +358,7 @@
"effect": [
"follow_only",
{ "npc_first_topic": "TALK_lighthouse_man_cleaning" },
{ "npc_add_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "0" }
{ "math": [ "npc_count_cleaning_lighthouse_man", "=", "0" ] }
]
},
"end": {
Expand Down
96 changes: 4 additions & 92 deletions data/json/npcs/TALK_TEST.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,94 +675,6 @@
}
]
},
{
"type": "talk_topic",
"id": "TALK_TEST_ADJUST_VARS",
"dynamic_line": "This is a test conversation that shouldn't appear in the game.",
"responses": [
{ "text": "This is a basic test response.", "topic": "TALK_DONE" },
{
"text": "This is a u_adjust_var test response that increments by 1.",
"topic": "TALK_DONE",
"effect": { "u_adjust_var": "test", "type": "test", "context": "var_adjust_test", "adjustment": 1 }
},
{
"text": "This is a u_adjust_var test response that decrements by 1.",
"topic": "TALK_DONE",
"effect": { "u_adjust_var": "test", "type": "test", "context": "var_adjust_test", "adjustment": -1 }
},
{
"text": "This is a npc_adjust_var test response that increments by 1.",
"topic": "TALK_DONE",
"effect": { "npc_adjust_var": "test", "type": "test", "context": "var_adjust_test", "adjustment": 1 }
},
{
"text": "This is a npc_adjust_var test response that decrements by 1.",
"topic": "TALK_DONE",
"effect": { "npc_adjust_var": "test", "type": "test", "context": "var_adjust_test", "adjustment": -1 }
},
{
"text": "This is a u_compare_var test response for == 0.",
"topic": "TALK_DONE",
"condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "==", "value": 0 }
},
{
"text": "This is a u_compare_var test response for != 0.",
"topic": "TALK_DONE",
"condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "!=", "value": 0 }
},
{
"text": "This is a u_compare_var test response for <= 0.",
"topic": "TALK_DONE",
"condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "<=", "value": 0 }
},
{
"text": "This is a u_compare_var test response for >= 0.",
"topic": "TALK_DONE",
"condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": ">=", "value": 0 }
},
{
"text": "This is a u_compare_var test response for < 0.",
"topic": "TALK_DONE",
"condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "<", "value": 0 }
},
{
"text": "This is a u_compare_var test response for > 0.",
"topic": "TALK_DONE",
"condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": ">", "value": 0 }
},
{
"text": "This is a npc_compare_var test response for == 0.",
"topic": "TALK_DONE",
"condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "==", "value": 0 }
},
{
"text": "This is a npc_compare_var test response for != 0.",
"topic": "TALK_DONE",
"condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "!=", "value": 0 }
},
{
"text": "This is a npc_compare_var test response for <= 0.",
"topic": "TALK_DONE",
"condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "<=", "value": 0 }
},
{
"text": "This is a npc_compare_var test response for >= 0.",
"topic": "TALK_DONE",
"condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": ">=", "value": 0 }
},
{
"text": "This is a npc_compare_var test response for < 0.",
"topic": "TALK_DONE",
"condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "<", "value": 0 }
},
{
"text": "This is a npc_compare_var test response for > 0.",
"topic": "TALK_DONE",
"condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": ">", "value": 0 }
}
]
},
{
"type": "talk_topic",
"id": "TALK_TEST_BIONICS",
Expand Down Expand Up @@ -961,14 +873,14 @@
"dynamic_line": "This is a test conversation that shouldn't appear in the game.",
"responses": [
{
"text": "This is a u_adjust_var test response that increments by 1.",
"text": "This is a math test response that increments by 1.",
"topic": "TALK_DONE",
"effect": { "u_adjust_var": "test", "type": "test", "context": "var_compare_test", "adjustment": 1 }
"effect": { "math": [ "u_test_var_compare_test_test", "++" ] }
},
{
"text": "This is an npc_adjust_var test response that increments by 2.",
"text": "This is an math test response that increments by 2.",
"topic": "TALK_DONE",
"effect": { "npc_adjust_var": "test", "type": "test", "context": "var_compare_test", "adjustment": 2 }
"effect": { "math": [ "n_test_var_compare_test_test", "+=", "2" ] }
},
{
"text": "This is a u_add_var time test response.",
Expand Down
7 changes: 1 addition & 6 deletions data/json/npcs/computers/TALK_MSU14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,7 @@
"effect": [
{ "run_eocs": [ "capture_generic_nre_anomaly" ] },
{ "u_spawn_item": "melchior_science_doc", "count": 1 },
{
"u_adjust_var": "dimensional_heuristics",
"type": "counter",
"context": "robofac_knowledge",
"adjustment": 1
}
{ "math": [ "u_counter_robofac_knowledge_dimensional_heuristics", "++" ] }
],
"topic": "TALK_DONE"
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/exodii/exodii_merchant_talk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,7 @@
"id": "TALK_EXODII_MERCHANT_Talk_CataclysmTimelineTough",
"type": "talk_topic",
"//": "While many people face the possibility of destruction with planning and hope, and the Exodii don't consider that unusual, it is a bit of a warning sign to be this overconfident. That said, as an individual data point it doesn't mean much.",
"speaker_effect": { "effect": { "u_adjust_var": "exodii_psychosis_judgment", "type": "counter", "context": "Exodii", "adjustment": 2 } },
"speaker_effect": { "effect": { "math": [ "u_counter_exodii_exodii_psychosis_judgment", "+=", "2" ] } },
"dynamic_line": {
"//~": "You do that then. I'll cheer for you when you stand over the vanquished corpse of the devil himself.",
"str": "Fine an' fine. Rubik'll clarion for ye when ye stand o'er the garried trick o' Anubine hisself."
Expand Down
12 changes: 3 additions & 9 deletions data/json/npcs/exodii/exodii_merchant_talk_exodization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,7 @@
]
},
"//": "If you previously refused exodization and then came back right away having changed your mind, it makes Rubik consider you somewhat flitty and unreliable. This negates your previous trust bonus and adds to the Exodii overall psych assessment of your character.",
"effect": [
{ "u_add_faction_trust": -2 },
{ "u_adjust_var": "exodii_psychosis_judgment", "type": "counter", "context": "exodii", "adjustment": 4 }
],
"effect": [ { "u_add_faction_trust": -2 }, { "math": [ "u_counter_exodii_exodii_psychosis_judgment", "+=", "4" ] } ],
"topic": "TALK_EXODII_MERCHANT_ExodizeMe1"
},
{
Expand Down Expand Up @@ -163,10 +160,7 @@
]
},
"//": "If you previously refused exodization and then came back right away having changed your mind, it makes Rubik consider you somewhat flitty and unreliable. This negates your previous trust bonus and adds to the Exodii overall psych assessment of your character.",
"effect": [
{ "u_add_faction_trust": -2 },
{ "u_adjust_var": "exodii_psychosis_judgment", "type": "counter", "context": "exodii", "adjustment": 4 }
],
"effect": [ { "u_add_faction_trust": -2 }, { "math": [ "u_counter_exodii_exodii_psychosis_judgment", "+=", "4" ] } ],
"topic": "TALK_EXODII_MERCHANT_ExodizeMe1"
},
{
Expand Down Expand Up @@ -256,7 +250,7 @@
"//": "Rubik considers it a good sign that you might be a bit unsure about diving into exodization.",
"effect": [
{ "u_add_faction_trust": 2 },
{ "u_adjust_var": "exodii_psychosis_judgment", "type": "counter", "context": "exodii", "adjustment": -2 },
{ "math": [ "u_counter_exodii_exodii_psychosis_judgment", "-=", "2" ] },
{ "u_add_var": "u_declined_exodization", "type": "decisions", "context": "blobpsychosis", "value": "yes" },
{ "u_add_var": "u_declined_exodization", "type": "timer", "context": "blobpsychosis", "time": true }
]
Expand Down
12 changes: 6 additions & 6 deletions data/json/npcs/isolated_road/isolated_road_cody_dialogue.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
"condition": {
"and": [
{ "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "artisans", "op": "<", "time": "21 d" },
{ "u_compare_var": "blacksmith_wait", "type": "number", "context": "artisans", "op": "==", "value": 3 },
{ "math": [ "u_number_artisans_blacksmith_wait", "==", "3" ] },
{ "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "artisans", "value": "armor" }
]
Expand All @@ -149,7 +149,7 @@
"condition": {
"and": [
{ "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "artisans", "op": ">=", "time": "21 d" },
{ "u_compare_var": "blacksmith_wait", "type": "number", "context": "artisans", "op": "==", "value": 3 },
{ "math": [ "u_number_artisans_blacksmith_wait", "==", "3" ] },
{ "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "artisans", "value": "armor" }
]
Expand All @@ -161,7 +161,7 @@
"condition": {
"and": [
{ "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "artisans", "op": "<", "time": "28 d" },
{ "u_compare_var": "blacksmith_wait", "type": "number", "context": "artisans", "op": "==", "value": 4 },
{ "math": [ "u_number_artisans_blacksmith_wait", "==", "4" ] },
{ "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "artisans", "value": "armor" }
]
Expand All @@ -173,7 +173,7 @@
"condition": {
"and": [
{ "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "artisans", "op": ">=", "time": "28 d" },
{ "u_compare_var": "blacksmith_wait", "type": "number", "context": "artisans", "op": "==", "value": 4 },
{ "math": [ "u_number_artisans_blacksmith_wait", "==", "4" ] },
{ "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "artisans", "value": "armor" }
]
Expand All @@ -185,7 +185,7 @@
"condition": {
"and": [
{ "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "artisans", "op": "<", "time": "35 d" },
{ "u_compare_var": "blacksmith_wait", "type": "number", "context": "artisans", "op": "==", "value": 5 },
{ "math": [ "u_number_artisans_blacksmith_wait", "==", "5" ] },
{ "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "artisans", "value": "armor" }
]
Expand All @@ -197,7 +197,7 @@
"condition": {
"and": [
{ "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "artisans", "op": ">=", "time": "35 d" },
{ "u_compare_var": "blacksmith_wait", "type": "number", "context": "artisans", "op": "==", "value": 5 },
{ "math": [ "u_number_artisans_blacksmith_wait", "==", "5" ] },
{ "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "artisans", "value": "armor" }
]
Expand Down
Loading
Loading