From 7c3a1297e52457a584b1462e2f7e92b475b94807 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Fri, 13 Jan 2023 20:13:18 -0500 Subject: [PATCH] Fix the check error originating from `TALK_lumbermill_fabricate.json` (#63102) * add brackets * Update TALK_lumbermill_fabricate.json * try removing global bools * Update data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json * Update data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Re-add global bools Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../TALK_lumbermill_fabricate.json | 131 ++++++++++-------- 1 file changed, 74 insertions(+), 57 deletions(-) diff --git a/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json b/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json index f8a7933ecafe6..fc2aa3dc1f720 100644 --- a/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json +++ b/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json @@ -27,49 +27,57 @@ }, { "text": "[100$] I'll buy some logs.", - "effect": { - "u_buy_item": "log", - "cost": 10000, - "count": 10, - "true_eocs": "EOC_BUY_LOGS_TRUE_EFFECT", - "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" - }, + "effect": [ + { + "u_buy_item": "log", + "cost": 10000, + "count": 10, + "true_eocs": "EOC_BUY_LOGS_TRUE_EFFECT", + "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" + } + ], "topic": "TALK_LUMBERMILL_FABRICATE_END", "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_log" } } }, { "text": "[120$] I'll buy some wooden panels.", - "effect": { - "u_buy_item": "wood_panel", - "cost": 12000, - "count": 10, - "true_eocs": "EOC_BUY_PANEL_TRUE_EFFECT", - "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" - }, + "effect": [ + { + "u_buy_item": "wood_panel", + "cost": 12000, + "count": 10, + "true_eocs": "EOC_BUY_PANEL_TRUE_EFFECT", + "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" + } + ], "topic": "TALK_LUMBERMILL_FABRICATE_END", "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_panel" } } }, { "text": "[240$] I'll buy some large wooden sheets.", - "effect": { - "u_buy_item": "wood_sheet", - "cost": 24000, - "count": 10, - "true_eocs": "EOC_BUY_LARGE_PANEL_TRUE_EFFECT", - "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" - }, + "effect": [ + { + "u_buy_item": "wood_sheet", + "cost": 24000, + "count": 10, + "true_eocs": "EOC_BUY_LARGE_PANEL_TRUE_EFFECT", + "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" + } + ], "topic": "TALK_LUMBERMILL_FABRICATE_END", "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_sheet" } } }, { "text": "[350$] I'll buy some wooden beams.", - "effect": { - "u_buy_item": "wood_beam", - "cost": 35000, - "count": 10, - "true_eocs": "EOC_BUY_BEAM_TRUE_EFFECT", - "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" - }, + "effect": [ + { + "u_buy_item": "wood_beam", + "cost": 35000, + "count": 10, + "true_eocs": "EOC_BUY_BEAM_TRUE_EFFECT", + "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" + } + ], "topic": "TALK_LUMBERMILL_FABRICATE_END", "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_beam" } } } @@ -99,49 +107,57 @@ }, { "text": "[100$] I'll buy some logs.", - "effect": { - "u_buy_item": "log", - "cost": 10000, - "count": 10, - "true_eocs": "EOC_BUY_LOGS_TRUE_EFFECT", - "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" - }, + "effect": [ + { + "u_buy_item": "log", + "cost": 10000, + "count": 10, + "true_eocs": "EOC_BUY_LOGS_TRUE_EFFECT", + "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" + } + ], "topic": "TALK_LUMBERMILL_FABRICATE_END", "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_log" } } }, { "text": "[120$] I'll buy some wooden panels.", - "effect": { - "u_buy_item": "wood_panel", - "cost": 12000, - "count": 10, - "true_eocs": "EOC_BUY_PANEL_TRUE_EFFECT", - "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" - }, + "effect": [ + { + "u_buy_item": "wood_panel", + "cost": 12000, + "count": 10, + "true_eocs": "EOC_BUY_PANEL_TRUE_EFFECT", + "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" + } + ], "topic": "TALK_LUMBERMILL_FABRICATE_END", "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_panel" } } }, { "text": "[240$] I'll buy some large wooden sheets.", - "effect": { - "u_buy_item": "wood_sheet", - "cost": 24000, - "count": 10, - "true_eocs": "EOC_BUY_LARGE_PANEL_TRUE_EFFECT", - "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" - }, + "effect": [ + { + "u_buy_item": "wood_sheet", + "cost": 24000, + "count": 10, + "true_eocs": "EOC_BUY_LARGE_PANEL_TRUE_EFFECT", + "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" + } + ], "topic": "TALK_LUMBERMILL_FABRICATE_END", "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_sheet" } } }, { "text": "[350$] I'll buy some wooden beams.", - "effect": { - "u_buy_item": "wood_beam", - "cost": 35000, - "count": 10, - "true_eocs": "EOC_BUY_BEAM_TRUE_EFFECT", - "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" - }, + "effect": [ + { + "u_buy_item": "wood_beam", + "cost": 35000, + "count": 10, + "true_eocs": "EOC_BUY_BEAM_TRUE_EFFECT", + "false_eocs": "EOC_LUMBER_BUY_FALSE_EFFECT" + } + ], "topic": "TALK_LUMBERMILL_FABRICATE_END", "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_beam" } } } @@ -186,6 +202,7 @@ { "type": "effect_on_condition", "id": "EOC_LUMBER_BUY_FALSE_EFFECT", - "global": false + "global": false, + "effect": [ ] } ]