From 4d23de8ba52380f99f1c89844364399e2f2f1b9c Mon Sep 17 00:00:00 2001 From: Vgoloshivskiy <56963648+Vgoloshivskiy@users.noreply.github.com> Date: Sat, 17 Aug 2024 22:59:54 +0300 Subject: [PATCH] Fif for dialog fixing dialog for armor repair --- .../robofac_intercom_prototypes.json | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json index 96717e070dd73..10e41bfcc0f06 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json @@ -206,17 +206,27 @@ { "text": "I salvaged this combat exoskeleton. Do you think you could repair it?", "condition": { - "or": [ - { "u_has_var": "dialogue_hub_rnd_u_current_project", "value": "phase_immersion_suit" }, - { "u_has_var": "dialogue_hub_rnd_u_current_project", "value": "rm13_armor" }, - { "u_has_var": "dialogue_hub_rnd_u_current_project", "value": "combat_exoskeleton_light_salvaged" } + "and": [ + { "u_has_items": { "item": "combat_exoskeleton_light_salvaged", "count": 1 } }, + { "not": { "u_has_var": "dialogue_hub_rnd_u_project_ongoing", "value": "yes" } } ] }, "topic": "TALK_ROBOFAC_INTERCOM_EXOSKELETON_REPAIR" }, { "text": "How are my armor repairs coming?", - "condition": { "or": [ { "u_has_var": "dialogue_hub_rnd_u_current_project", "value": "combat_exoskeleton_light_salvaged" } ] }, + "condition": { + "and": [ + { "math": [ "u_timer_hub_rnd_u_waiting_on_hub", ">", "time('now')" ] }, + { + "or": [ + { "u_has_var": "dialogue_hub_rnd_u_current_project", "value": "combat_exoskeleton_light_salvaged" }, + { "u_has_var": "dialogue_hub_rnd_u_current_project", "value": "phase_immersion_suit" }, + { "u_has_var": "dialogue_hub_rnd_u_current_project", "value": "rm13_armor" } + ] + } + ] + }, "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ONGOING" }, {