From 453006c8b06f32a86bc0486068994f45861a1480 Mon Sep 17 00:00:00 2001 From: Cat Lady Date: Thu, 4 Jul 2019 10:36:23 +0200 Subject: [PATCH 1/2] Possibly fixed #2596 --- .../DevCircuitAIBrutal/stable/config/build_chain.json | 6 ++++-- .../DevCircuitAIEasy/stable/config/build_chain.json | 6 ++++-- .../DevCircuitAIHard/stable/config/build_chain.json | 6 ++++-- .../DevCircuitAINormal/stable/config/build_chain.json | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIBrutal/stable/config/build_chain.json b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIBrutal/stable/config/build_chain.json index 3ad655ed9..ac876b6f7 100644 --- a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIBrutal/stable/config/build_chain.json +++ b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIBrutal/stable/config/build_chain.json @@ -24,11 +24,13 @@ // Base defence and time to build it, in seconds "base": [[0, 20], [0, 120], [9, 300], [0, 360], [1, 400], [0, 500], [9, 530], [16, 600], [5, 660], [5, 860], [15, 900], [9, 930], [1, 980], [5, 1160], [1, 1380], [2, 1680], [13, 1800], [17, 1830]], + // FIXME last 2 aren't superweapons "superweapon": { - "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke", "staticheavyradar"], // FIXME: last 2 aren't superweapons + "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke", "staticheavyradar"], "weight": [ 0.05, 0.15, 0.25, 0.05, 0.2, 0.3], - "condition": [18, 1600] // [, ] +// [, ] + "condition": [18, 1600] }, // Fallback defence diff --git a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json index 6fc6b32b9..f01e3b144 100644 --- a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json +++ b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json @@ -24,11 +24,13 @@ // Base defence and time to build it, in seconds "base": [[0, 20], [0, 120], [9, 300], [0, 360], [1, 400], [0, 500], [9, 530], [16, 600], [5, 660], [5, 860], [15, 900], [9, 930], [1, 980], [5, 1160], [1, 1380], [2, 1680], [13, 1800], [17, 1830]], +// FIXME last 1 isn't superweapon "superweapon": { - "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], // FIXME: last 1 isn't superweapon + "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], "weight": [ 0.1, 0.2, 0.3, 0.1 0.3], - "condition": [35, 600] // [, ] +// [, ] + "condition": [35, 600] }, // Fallback defence diff --git a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json index 7ed2b2efb..9a2474264 100644 --- a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json +++ b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json @@ -24,11 +24,13 @@ // Base defence and time to build it, in seconds "base": [[0, 20], [0, 120], [9, 300], [0, 360], [1, 400], [0, 500], [9, 530], [16, 600], [5, 660], [5, 860], [15, 900], [9, 930], [1, 980], [5, 1160], [1, 1380], [2, 1680], [13, 1800], [17, 1830]], +// FIXME last 1 isn't superweapon "superweapon": { - "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], // FIXME: last 1 isn't superweapon + "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], "weight": [ 0.1, 0.2, 0.3, 0.1 0.3], - "condition": [35, 600] // [, ] +// [, ] + "condition": [35, 600] }, // Fallback defence diff --git a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAINormal/stable/config/build_chain.json b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAINormal/stable/config/build_chain.json index b2c82b2a1..a4768e3c9 100644 --- a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAINormal/stable/config/build_chain.json +++ b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAINormal/stable/config/build_chain.json @@ -24,11 +24,13 @@ // Base defence and time to build it, in seconds "base": [[0, 20], [0, 120], [9, 300], [0, 360], [1, 400], [0, 500], [9, 530], [16, 600], [5, 660], [5, 860], [15, 900], [9, 930], [1, 980], [5, 1160], [1, 1380], [2, 1680], [13, 1800], [17, 1830]], +// FIXME: last 1 isn't superweapon "superweapon": { - "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], // FIXME: last 1 isn't superweapon + "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], "weight": [ 0.1, 0.2, 0.3, 0.1 0.3], - "condition": [35, 600] // [, ] +// [, ] + "condition": [35, 600] }, // Fallback defence From 0e67fcddb3992c3f71f96160efdf655c550f198b Mon Sep 17 00:00:00 2001 From: Cat Lady Date: Sun, 7 Jul 2019 16:19:18 +0200 Subject: [PATCH 2/2] Fixed missing coma causing malformed config errors in AI Hard and below. --- .../AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json | 2 +- .../AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json | 2 +- .../Skirmish/DevCircuitAINormal/stable/config/build_chain.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json index f01e3b144..22a6a213a 100644 --- a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json +++ b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIEasy/stable/config/build_chain.json @@ -27,7 +27,7 @@ // FIXME last 1 isn't superweapon "superweapon": { "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], - "weight": [ 0.1, 0.2, 0.3, 0.1 0.3], + "weight": [ 0.1, 0.2, 0.3, 0.1, 0.3], // [, ] "condition": [35, 600] diff --git a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json index 9a2474264..249b988b2 100644 --- a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json +++ b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAIHard/stable/config/build_chain.json @@ -27,7 +27,7 @@ // FIXME last 1 isn't superweapon "superweapon": { "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], - "weight": [ 0.1, 0.2, 0.3, 0.1 0.3], + "weight": [ 0.1, 0.2, 0.3, 0.1, 0.3], // [, ] "condition": [35, 600] diff --git a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAINormal/stable/config/build_chain.json b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAINormal/stable/config/build_chain.json index a4768e3c9..38cd3238a 100644 --- a/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAINormal/stable/config/build_chain.json +++ b/LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitAINormal/stable/config/build_chain.json @@ -27,7 +27,7 @@ // FIXME: last 1 isn't superweapon "superweapon": { "unit": ["raveparty", "staticnuke", "staticheavyarty", "zenith", "staticantinuke"], - "weight": [ 0.1, 0.2, 0.3, 0.1 0.3], + "weight": [ 0.1, 0.2, 0.3, 0.1, 0.3], // [, ] "condition": [35, 600]