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

Fix hub timers #71370

Closed
wants to merge 2 commits into from
Closed

Fix hub timers #71370

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ff719
fix hub timers
GuardianDll Jan 30, 2024
38c2dbc
replace waiting_on_gun with waiting_on_hub variable
GuardianDll Jan 30, 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
32 changes: 16 additions & 16 deletions data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"text": "How is my ordered armor going?",
"condition": {
"and": [
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", "<", "time('1 d')" ] },
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", ">", "time('1 d')" ] },
{
"or": [
{ "u_has_var": "u_armor_type", "value": "robofac_armor_pieces_rig", "type": "dialogue", "context": "hub_rnd" },
Expand Down Expand Up @@ -184,7 +184,7 @@
"text": "How is my ordered armor going? It should be done by now.",
"condition": {
"and": [
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", "<", "time('1 d')" ] },
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", ">", "time('1 d')" ] },
{
"or": [
{ "u_has_var": "u_armor_type", "value": "robofac_armor_pieces_rig", "type": "dialogue", "context": "hub_rnd" },
Expand Down Expand Up @@ -261,7 +261,7 @@
"text": "How are my armor repairs coming?",
"condition": {
"and": [
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", "<", "time('1 d')" ] },
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", ">", "time('1 d')" ] },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for "it's not ready yet" so the sign is correct

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the second commit correct? I assume the idea is to have separate timers for weapon and for armor, but didn't dig deep enough

{
"u_has_var": "u_current_project",
"type": "dialogue",
Expand Down Expand Up @@ -291,7 +291,7 @@
"text": "How are my armor repairs coming?",
"condition": {
"and": [
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", "<", "time('1 d')" ] },
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", ">", "time('1 d')" ] },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "rm13_armor" }
]
},
Expand Down Expand Up @@ -324,7 +324,7 @@
"text": "Any progress on the anchor?",
"condition": {
"and": [
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", "<", "time('5 d')" ] },
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", ">", "time('5 d')" ] },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "anchor_pt_1" }
]
},
Expand Down Expand Up @@ -354,7 +354,7 @@
"text": "Any progress on the Hub anchor?",
"condition": {
"and": [
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", "<", "time('2 d')" ] },
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", ">", "time('2 d')" ] },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "anchor_pt_2" }
]
},
Expand Down Expand Up @@ -388,7 +388,7 @@
"text": "Any progress on the exotic barrel?",
"condition": {
"and": [
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", "<", "time('3 d')" ] },
{ "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", ">", "time('3 d')" ] },
{ "u_has_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "hwp_exodii" }
]
},
Expand Down Expand Up @@ -573,7 +573,7 @@
"effect": [
{ "u_sell_item": "RobofacCoin", "count": 2 },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "yes" }
],
"topic": "TALK_ROBOFAC_INTERCOM_SERVICES"
Expand All @@ -595,7 +595,7 @@
"effect": [
{ "u_sell_item": "RobofacCoin", "count": 4 },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "yes" }
],
"topic": "TALK_ROBOFAC_INTERCOM_SERVICES"
Expand All @@ -617,7 +617,7 @@
"effect": [
{ "u_sell_item": "RobofacCoin", "count": 4 },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "yes" }
],
"topic": "TALK_ROBOFAC_INTERCOM_SERVICES"
Expand All @@ -639,7 +639,7 @@
"effect": [
{ "u_sell_item": "RobofacCoin", "count": 4 },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "yes" }
],
"topic": "TALK_ROBOFAC_INTERCOM_SERVICES"
Expand All @@ -661,7 +661,7 @@
"effect": [
{ "u_sell_item": "RobofacCoin", "count": 12 },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "yes" }
],
"topic": "TALK_ROBOFAC_INTERCOM_SERVICES"
Expand Down Expand Up @@ -844,7 +844,7 @@
{ "u_sell_item": "RobofacCoin", "count": 1 },
{ "u_consume_item": "phase_immersion_suit", "count": 1, "popup": true },
{ "u_add_faction_trust": 1 },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{
"u_add_var": "u_current_project",
Expand Down Expand Up @@ -890,7 +890,7 @@
{ "u_sell_item": "RobofacCoin", "count": 1 },
{ "u_consume_item": "rm13_armor", "count": 1, "popup": true },
{ "u_add_faction_trust": 1 },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{ "u_add_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "rm13_armor" }
],
Expand Down Expand Up @@ -936,7 +936,7 @@
{ "u_sell_item": "RobofacCoin", "count": 2 },
{ "u_consume_item": "dimensional_anchor", "count": 1, "popup": true },
{ "u_add_faction_trust": 1 },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{ "u_add_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "anchor_pt_1" }
],
Expand Down Expand Up @@ -985,7 +985,7 @@
{ "u_consume_item": "dimensional_anchor", "count": 1, "popup": true },
{ "u_consume_item": "robofac_armor_rig", "count": 1, "popup": true },
{ "u_add_faction_trust": 1 },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_gun", "=", "time('now')" ] },
{ "math": [ "u_timer_hub_rnd_u_waiting_on_hub", "=", "time('now')" ] },
{ "u_add_var": "u_project_ongoing", "type": "dialogue", "context": "hub_rnd", "value": "yes" },
{ "u_add_var": "u_current_project", "type": "dialogue", "context": "hub_rnd", "value": "anchor_pt_2" }
],
Expand Down
Loading