Skip to content

Commit

Permalink
Fix the check error originating from TALK_lumbermill_fabricate.json (
Browse files Browse the repository at this point in the history
…#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>
  • Loading branch information
MNG-cataclysm and github-actions[bot] authored Jan 14, 2023
1 parent 720d4b5 commit 7c3a129
Showing 1 changed file with 74 additions and 57 deletions.
131 changes: 74 additions & 57 deletions data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }
}
Expand Down Expand Up @@ -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" } }
}
Expand Down Expand Up @@ -186,6 +202,7 @@
{
"type": "effect_on_condition",
"id": "EOC_LUMBER_BUY_FALSE_EFFECT",
"global": false
"global": false,
"effect": [ ]
}
]

0 comments on commit 7c3a129

Please sign in to comment.