From 42595d9609785a5b47d4c17164891e8f442719d1 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:40:16 +0700 Subject: [PATCH 01/27] fix: exclude raptor queens, remove redundant loop in unitdef_post -exclude raptor queen from hp multiplier -remove redundant loop in unitdef_post --- lua/tweakdefs/raptor hp 1.3X.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.3X.lua b/lua/tweakdefs/raptor hp 1.3X.lua index 9cba1f2..6d175ce 100644 --- a/lua/tweakdefs/raptor hp 1.3X.lua +++ b/lua/tweakdefs/raptor hp 1.3X.lua @@ -1,4 +1,4 @@ --- NuttyB v1.52 1.3X HP +--NuttyB v1.52 1.3X HP -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then @@ -10,7 +10,7 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.maxthisunit = 0 end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health and not unitName:match('^raptor_queen_.*') then unitDef.health = unitDef.health * 1.3 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas @@ -24,9 +24,7 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - for unitName, def in pairs(UnitDefs) do - if def.customparams and def.customparams.subfolder == "other/raptors" and def.health then - def.metalcost = math.floor(def.health * 0.576923077) - end + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.576923077) end end From 99014862ed3808bddca54d7355732ab9c0c7432d Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:46:37 +0700 Subject: [PATCH 02/27] Update raptor hp 1.5X.lua --- lua/tweakdefs/raptor hp 1.5X.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.5X.lua b/lua/tweakdefs/raptor hp 1.5X.lua index 527f443..65b0339 100644 --- a/lua/tweakdefs/raptor hp 1.5X.lua +++ b/lua/tweakdefs/raptor hp 1.5X.lua @@ -1,4 +1,4 @@ --- NuttyB v1.52 1.5X HP +--NuttyB v1.52 1.5X HP -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then @@ -10,7 +10,7 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.maxthisunit = 0 end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health and not unitName:match('^raptor_queen_.*') then unitDef.health = unitDef.health * 1.5 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas @@ -24,9 +24,7 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - for unitName, def in pairs(UnitDefs) do - if def.customparams and def.customparams.subfolder == "other/raptors" and def.health then - def.metalcost = math.floor(def.health * 0.466666667) - end + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.466666667) end end From cf730fdd16b8bff38ce094e4ddae3e1c0c977201 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:47:54 +0700 Subject: [PATCH 03/27] Update raptor hp 1.7X.lua --- lua/tweakdefs/raptor hp 1.7X.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.7X.lua b/lua/tweakdefs/raptor hp 1.7X.lua index a4be6e0..28710ea 100644 --- a/lua/tweakdefs/raptor hp 1.7X.lua +++ b/lua/tweakdefs/raptor hp 1.7X.lua @@ -1,4 +1,4 @@ --- NuttyB v1.52 1.7X HP +--NuttyB v1.52 1.7X HP -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then @@ -10,7 +10,7 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.maxthisunit = 0 end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health and not unitName:match('^raptor_queen_.*') then unitDef.health = unitDef.health * 1.7 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas @@ -24,9 +24,7 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - for unitName, def in pairs(UnitDefs) do - if def.customparams and def.customparams.subfolder == "other/raptors" and def.health then - def.metalcost = math.floor(def.health * 0.411764706) - end + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.411764706) end end From 8f8872521e62543fabd0bd427a937d0b3639ab29 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:49:35 +0700 Subject: [PATCH 04/27] Update raptor hp 2.0X.lua --- lua/tweakdefs/raptor hp 2.0X.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/tweakdefs/raptor hp 2.0X.lua b/lua/tweakdefs/raptor hp 2.0X.lua index 5de5709..80e3671 100644 --- a/lua/tweakdefs/raptor hp 2.0X.lua +++ b/lua/tweakdefs/raptor hp 2.0X.lua @@ -1,4 +1,4 @@ --- NuttyB v1.52 2X HP +--NuttyB v1.52 2X HP -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then @@ -10,7 +10,7 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.maxthisunit = 0 end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health and not unitName:match('^raptor_queen_.*') then unitDef.health = unitDef.health * 2 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas @@ -24,9 +24,7 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - for unitName, def in pairs(UnitDefs) do - if def.customparams and def.customparams.subfolder == "other/raptors" and def.health then - def.metalcost = math.floor(def.health * 0.35) - end + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.35) end end From 4911413cebe7f3fd144ecf376531e0c88eaf1466 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:50:42 +0700 Subject: [PATCH 05/27] Update raptor hp 2.5X.lua --- lua/tweakdefs/raptor hp 2.5X.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/tweakdefs/raptor hp 2.5X.lua b/lua/tweakdefs/raptor hp 2.5X.lua index 6a86547..6f84e3a 100644 --- a/lua/tweakdefs/raptor hp 2.5X.lua +++ b/lua/tweakdefs/raptor hp 2.5X.lua @@ -1,4 +1,4 @@ --- NuttyB v1.52 2.5X HP +--NuttyB v1.52 2.5X HP -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then @@ -10,7 +10,7 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.maxthisunit = 0 end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health and not unitName:match('^raptor_queen_.*') then unitDef.health = unitDef.health * 2.5 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas @@ -24,9 +24,7 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - for unitName, def in pairs(UnitDefs) do - if def.customparams and def.customparams.subfolder == "other/raptors" and def.health then - def.metalcost = math.floor(def.health * 0.3) - end + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.3) end end From 70bc92398631b4a0251d121ba68bd5e1836960ef Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:51:51 +0700 Subject: [PATCH 06/27] Update raptor hp 3.0X.lua --- lua/tweakdefs/raptor hp 3.0X.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/tweakdefs/raptor hp 3.0X.lua b/lua/tweakdefs/raptor hp 3.0X.lua index 6bad92f..914e040 100644 --- a/lua/tweakdefs/raptor hp 3.0X.lua +++ b/lua/tweakdefs/raptor hp 3.0X.lua @@ -1,4 +1,4 @@ --- NuttyB v1.52 3X HP +--NuttyB v1.52 3X HP -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then @@ -10,7 +10,7 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.maxthisunit = 0 end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health and not unitName:match('^raptor_queen_.*') then unitDef.health = unitDef.health * 3 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas @@ -24,9 +24,7 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - for unitName, def in pairs(UnitDefs) do - if def.customparams and def.customparams.subfolder == "other/raptors" and def.health then - def.metalcost = math.floor(def.health * 0.25) - end + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.25) end end From 165712b617b8cc2571aacd866131f6fab71e7d63 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:52:44 +0700 Subject: [PATCH 07/27] Update raptor hp 4.0X.lua --- lua/tweakdefs/raptor hp 4.0X.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/tweakdefs/raptor hp 4.0X.lua b/lua/tweakdefs/raptor hp 4.0X.lua index eeeae2c..461c2fd 100644 --- a/lua/tweakdefs/raptor hp 4.0X.lua +++ b/lua/tweakdefs/raptor hp 4.0X.lua @@ -1,4 +1,4 @@ --- NuttyB v1.52 4X HP +--NuttyB v1.52 4X HP -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then @@ -10,7 +10,7 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.maxthisunit = 0 end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health and not unitName:match('^raptor_queen_.*') then unitDef.health = unitDef.health * 4 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas @@ -24,9 +24,7 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - for unitName, def in pairs(UnitDefs) do - if def.customparams and def.customparams.subfolder == "other/raptors" and def.health then - def.metalcost = math.floor(def.health * 0.1875) - end + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.1875) end end From 7ec38576cb543017decdf96bcff56858a9f81ced Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:53:34 +0700 Subject: [PATCH 08/27] Update raptor hp 5.0X.lua --- lua/tweakdefs/raptor hp 5.0X.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/tweakdefs/raptor hp 5.0X.lua b/lua/tweakdefs/raptor hp 5.0X.lua index a22439a..5e9f7a6 100644 --- a/lua/tweakdefs/raptor hp 5.0X.lua +++ b/lua/tweakdefs/raptor hp 5.0X.lua @@ -1,4 +1,4 @@ --- NuttyB v1.52 5X HP +--NuttyB v1.52 5X HP -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then @@ -10,7 +10,7 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.maxthisunit = 0 end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health and not unitName:match('^raptor_queen_.*') then unitDef.health = unitDef.health * 5 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas @@ -24,9 +24,7 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - for unitName, def in pairs(UnitDefs) do - if def.customparams and def.customparams.subfolder == "other/raptors" and def.health then - def.metalcost = math.floor(def.health * 0.15) - end + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.15) end end From c2d8790a3c801fafd1c3866c25a0c588408e8729 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:31:52 +0700 Subject: [PATCH 09/27] Update raptor hp 1.3X.lua --- lua/tweakdefs/raptor hp 1.3X.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.3X.lua b/lua/tweakdefs/raptor hp 1.3X.lua index 6d175ce..a90b326 100644 --- a/lua/tweakdefs/raptor hp 1.3X.lua +++ b/lua/tweakdefs/raptor hp 1.3X.lua @@ -14,7 +14,6 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.health = unitDef.health * 1.3 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas - unitDef.nochasecategory = "OBJECT" end end @@ -24,7 +23,10 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then - unitDef.metalcost = math.floor(unitDef.health * 0.576923077) + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" then + unitDef.nochasecategory = "OBJECT" + if unitDef.metalcost and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.576923077) + end end end From 529b60bcb9be23be53655149d0a823af7e87ecd7 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:32:17 +0700 Subject: [PATCH 10/27] Update raptor hp 1.5X.lua --- lua/tweakdefs/raptor hp 1.5X.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.5X.lua b/lua/tweakdefs/raptor hp 1.5X.lua index 65b0339..f8425dc 100644 --- a/lua/tweakdefs/raptor hp 1.5X.lua +++ b/lua/tweakdefs/raptor hp 1.5X.lua @@ -14,7 +14,6 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.health = unitDef.health * 1.5 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas - unitDef.nochasecategory = "OBJECT" end end @@ -24,7 +23,10 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then - unitDef.metalcost = math.floor(unitDef.health * 0.466666667) + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" then + unitDef.nochasecategory = "OBJECT" + if unitDef.metalcost and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.466666667) + end end end From 4adeade82db11a6a29b46ac8eb3c881b80df6076 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:32:49 +0700 Subject: [PATCH 11/27] Update raptor hp 1.7X.lua --- lua/tweakdefs/raptor hp 1.7X.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.7X.lua b/lua/tweakdefs/raptor hp 1.7X.lua index 28710ea..2981691 100644 --- a/lua/tweakdefs/raptor hp 1.7X.lua +++ b/lua/tweakdefs/raptor hp 1.7X.lua @@ -14,7 +14,6 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.health = unitDef.health * 1.7 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas - unitDef.nochasecategory = "OBJECT" end end @@ -24,7 +23,10 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then - unitDef.metalcost = math.floor(unitDef.health * 0.411764706) + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" then + unitDef.nochasecategory = "OBJECT" + if unitDef.metalcost and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.411764706) + end end end From 650a02251d44a80dfdcf1e9f50adfb381398e494 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:33:13 +0700 Subject: [PATCH 12/27] Update raptor hp 2.0X.lua --- lua/tweakdefs/raptor hp 2.0X.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 2.0X.lua b/lua/tweakdefs/raptor hp 2.0X.lua index 80e3671..c5678ee 100644 --- a/lua/tweakdefs/raptor hp 2.0X.lua +++ b/lua/tweakdefs/raptor hp 2.0X.lua @@ -14,7 +14,6 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.health = unitDef.health * 2 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas - unitDef.nochasecategory = "OBJECT" end end @@ -24,7 +23,10 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then - unitDef.metalcost = math.floor(unitDef.health * 0.35) + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" then + unitDef.nochasecategory = "OBJECT" + if unitDef.metalcost and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.35) + end end end From 4b52d770d55b2b4351c1f61c07ab999fe8b27ee0 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:33:44 +0700 Subject: [PATCH 13/27] Update raptor hp 2.5X.lua --- lua/tweakdefs/raptor hp 2.5X.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 2.5X.lua b/lua/tweakdefs/raptor hp 2.5X.lua index 6f84e3a..ff1a8db 100644 --- a/lua/tweakdefs/raptor hp 2.5X.lua +++ b/lua/tweakdefs/raptor hp 2.5X.lua @@ -14,7 +14,6 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.health = unitDef.health * 2.5 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas - unitDef.nochasecategory = "OBJECT" end end @@ -24,7 +23,10 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then - unitDef.metalcost = math.floor(unitDef.health * 0.3) + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" then + unitDef.nochasecategory = "OBJECT" + if unitDef.metalcost and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.3) + end end end From 1414613ed2420579ad2c0bb4b4c9dff58f9cb959 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:34:06 +0700 Subject: [PATCH 14/27] Update raptor hp 3.0X.lua --- lua/tweakdefs/raptor hp 3.0X.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 3.0X.lua b/lua/tweakdefs/raptor hp 3.0X.lua index 914e040..5157812 100644 --- a/lua/tweakdefs/raptor hp 3.0X.lua +++ b/lua/tweakdefs/raptor hp 3.0X.lua @@ -14,7 +14,6 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.health = unitDef.health * 3 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas - unitDef.nochasecategory = "OBJECT" end end @@ -24,7 +23,10 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then - unitDef.metalcost = math.floor(unitDef.health * 0.25) + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" then + unitDef.nochasecategory = "OBJECT" + if unitDef.metalcost and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.25) + end end end From be1823adf077f60aa3dc35ba5d3afafc93f40486 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:34:32 +0700 Subject: [PATCH 15/27] Update raptor hp 4.0X.lua --- lua/tweakdefs/raptor hp 4.0X.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 4.0X.lua b/lua/tweakdefs/raptor hp 4.0X.lua index 461c2fd..e0c58c3 100644 --- a/lua/tweakdefs/raptor hp 4.0X.lua +++ b/lua/tweakdefs/raptor hp 4.0X.lua @@ -14,7 +14,6 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.health = unitDef.health * 4 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas - unitDef.nochasecategory = "OBJECT" end end @@ -24,7 +23,10 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then - unitDef.metalcost = math.floor(unitDef.health * 0.1875) + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" then + unitDef.nochasecategory = "OBJECT" + if unitDef.metalcost and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.1875) + end end end From caccea3e8b9eb1afa60fa764055e202d89dd464e Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:34:56 +0700 Subject: [PATCH 16/27] Update raptor hp 5.0X.lua --- lua/tweakdefs/raptor hp 5.0X.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 5.0X.lua b/lua/tweakdefs/raptor hp 5.0X.lua index 5e9f7a6..81c94b8 100644 --- a/lua/tweakdefs/raptor hp 5.0X.lua +++ b/lua/tweakdefs/raptor hp 5.0X.lua @@ -14,7 +14,6 @@ for unitName, unitDef in pairs(UnitDefs) do unitDef.health = unitDef.health * 5 unitDef.sfxtypes = {} unitDef.explodas = unitDef.explodas - unitDef.nochasecategory = "OBJECT" end end @@ -24,7 +23,10 @@ function UnitDef_Post(unitID, unitDef) oldUnitDef_Post(unitID, unitDef) end - if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" and unitDef.health then - unitDef.metalcost = math.floor(unitDef.health * 0.15) + if unitDef.customparams and unitDef.customparams.subfolder == "other/raptors" then + unitDef.nochasecategory = "OBJECT" + if unitDef.metalcost and unitDef.health then + unitDef.metalcost = math.floor(unitDef.health * 0.15) + end end end From 156ad08ecb5fe2a2a8937634ea6abcaf5464fb60 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:45:13 +0700 Subject: [PATCH 17/27] Update raptor hp 1.3X.lua --- lua/tweakdefs/raptor hp 1.3X.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.3X.lua b/lua/tweakdefs/raptor hp 1.3X.lua index a90b326..7bd017a 100644 --- a/lua/tweakdefs/raptor hp 1.3X.lua +++ b/lua/tweakdefs/raptor hp 1.3X.lua @@ -3,10 +3,10 @@ for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then unitDef.reclaimspeed = 100 - unitDef.stealth = 0 - unitDef.builder = 0 + unitDef.stealth = false + unitDef.builder = false unitDef.workertime = unitDef.workertime * 0.5 - unitDef.canassist = 0 + unitDef.canassist = false unitDef.maxthisunit = 0 end From faa4c5425329846871060527381560ee9d515b52 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:45:34 +0700 Subject: [PATCH 18/27] Update raptor hp 1.5X.lua --- lua/tweakdefs/raptor hp 1.5X.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.5X.lua b/lua/tweakdefs/raptor hp 1.5X.lua index f8425dc..2ad8753 100644 --- a/lua/tweakdefs/raptor hp 1.5X.lua +++ b/lua/tweakdefs/raptor hp 1.5X.lua @@ -3,10 +3,10 @@ for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then unitDef.reclaimspeed = 100 - unitDef.stealth = 0 - unitDef.builder = 0 + unitDef.stealth = false + unitDef.builder = false unitDef.workertime = unitDef.workertime * 0.5 - unitDef.canassist = 0 + unitDef.canassist = false unitDef.maxthisunit = 0 end From 22bc119a45760df701544bc5d108dc58e77c99ce Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:45:54 +0700 Subject: [PATCH 19/27] Update raptor hp 1.7X.lua --- lua/tweakdefs/raptor hp 1.7X.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 1.7X.lua b/lua/tweakdefs/raptor hp 1.7X.lua index 2981691..c1427f5 100644 --- a/lua/tweakdefs/raptor hp 1.7X.lua +++ b/lua/tweakdefs/raptor hp 1.7X.lua @@ -3,10 +3,10 @@ for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then unitDef.reclaimspeed = 100 - unitDef.stealth = 0 - unitDef.builder = 0 + unitDef.stealth = false + unitDef.builder = false unitDef.workertime = unitDef.workertime * 0.5 - unitDef.canassist = 0 + unitDef.canassist = false unitDef.maxthisunit = 0 end From 2285fcb446e2410bf3a72a1348385894cef6b79b Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:46:18 +0700 Subject: [PATCH 20/27] Update raptor hp 2.0X.lua --- lua/tweakdefs/raptor hp 2.0X.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 2.0X.lua b/lua/tweakdefs/raptor hp 2.0X.lua index c5678ee..33f5e83 100644 --- a/lua/tweakdefs/raptor hp 2.0X.lua +++ b/lua/tweakdefs/raptor hp 2.0X.lua @@ -3,10 +3,10 @@ for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then unitDef.reclaimspeed = 100 - unitDef.stealth = 0 - unitDef.builder = 0 + unitDef.stealth = false + unitDef.builder = false unitDef.workertime = unitDef.workertime * 0.5 - unitDef.canassist = 0 + unitDef.canassist = false unitDef.maxthisunit = 0 end From b0d59cb864eed1f7615e2113e1bd57d7e119cef2 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:46:37 +0700 Subject: [PATCH 21/27] Update raptor hp 2.5X.lua --- lua/tweakdefs/raptor hp 2.5X.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 2.5X.lua b/lua/tweakdefs/raptor hp 2.5X.lua index ff1a8db..4f80a83 100644 --- a/lua/tweakdefs/raptor hp 2.5X.lua +++ b/lua/tweakdefs/raptor hp 2.5X.lua @@ -3,10 +3,10 @@ for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then unitDef.reclaimspeed = 100 - unitDef.stealth = 0 - unitDef.builder = 0 + unitDef.stealth = false + unitDef.builder = false unitDef.workertime = unitDef.workertime * 0.6 - unitDef.canassist = 0 + unitDef.canassist = false unitDef.maxthisunit = 0 end From 2171976c523f2547e9f146144195b6e6866034ce Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:46:56 +0700 Subject: [PATCH 22/27] Update raptor hp 3.0X.lua --- lua/tweakdefs/raptor hp 3.0X.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 3.0X.lua b/lua/tweakdefs/raptor hp 3.0X.lua index 5157812..cdfe1c2 100644 --- a/lua/tweakdefs/raptor hp 3.0X.lua +++ b/lua/tweakdefs/raptor hp 3.0X.lua @@ -3,10 +3,10 @@ for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then unitDef.reclaimspeed = 100 - unitDef.stealth = 0 - unitDef.builder = 0 + unitDef.stealth = false + unitDef.builder = false unitDef.workertime = unitDef.workertime * 0.55 - unitDef.canassist = 0 + unitDef.canassist = false unitDef.maxthisunit = 0 end From 72c5101ce92d1f18c0adaafd16dcf46d662f0be1 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:47:16 +0700 Subject: [PATCH 23/27] Update raptor hp 4.0X.lua --- lua/tweakdefs/raptor hp 4.0X.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 4.0X.lua b/lua/tweakdefs/raptor hp 4.0X.lua index e0c58c3..f92fa38 100644 --- a/lua/tweakdefs/raptor hp 4.0X.lua +++ b/lua/tweakdefs/raptor hp 4.0X.lua @@ -3,10 +3,10 @@ for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then unitDef.reclaimspeed = 100 - unitDef.stealth = 0 - unitDef.builder = 0 + unitDef.stealth = false + unitDef.builder = false unitDef.workertime = unitDef.workertime * 0.45 - unitDef.canassist = 0 + unitDef.canassist = false unitDef.maxthisunit = 0 end From 1f91c0e5ad96c75aa37e14e00d56f7d6648b2210 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:47:40 +0700 Subject: [PATCH 24/27] Update raptor hp 5.0X.lua --- lua/tweakdefs/raptor hp 5.0X.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/tweakdefs/raptor hp 5.0X.lua b/lua/tweakdefs/raptor hp 5.0X.lua index 81c94b8..3dd6823 100644 --- a/lua/tweakdefs/raptor hp 5.0X.lua +++ b/lua/tweakdefs/raptor hp 5.0X.lua @@ -3,10 +3,10 @@ for unitName, unitDef in pairs(UnitDefs) do if string.sub(unitName, 1, 24) == "raptor_land_swarmer_heal" then unitDef.reclaimspeed = 100 - unitDef.stealth = 0 - unitDef.builder = 0 + unitDef.stealth = false + unitDef.builder = false unitDef.workertime = unitDef.workertime * 0.25 - unitDef.canassist = 0 + unitDef.canassist = false unitDef.maxthisunit = 0 end From 3ee3e220e9ad7381cb8a66bcc0a9c12a150246db Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Thu, 14 Aug 2025 23:58:36 +0700 Subject: [PATCH 25/27] Update tweakunits1.lua --- lua/tweakunits1.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lua/tweakunits1.lua b/lua/tweakunits1.lua index 29d0d58..a2a94d9 100644 --- a/lua/tweakunits1.lua +++ b/lua/tweakunits1.lua @@ -1,4 +1,4 @@ ---NuttyB v1.52b Legion Com +--NuttyB v1.52c Legion Com -- Authors: ChrispyNut, BackBash -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko return { @@ -16,7 +16,7 @@ return { }, customparams = { evolution_target = 'legcomlvl2', - evolution_condition = 'timer', + evolution_condition = 'timer_global', evolution_timer = 420 }, weapondefs = { @@ -96,7 +96,8 @@ return { autoheal = 100, health = 6700, customparams = { - evolution_timer = 600 + evolution_condition = 'timer_global', + evolution_timer = 1020 }, buildoptions = { [1] = 'legrezbot', @@ -215,7 +216,8 @@ return { autoheal = 150, health = 7500, customparams = { - evolution_timer = 420 + evolution_condition = 'timer_global', + evolution_timer = 1440 }, buildoptions = { [1] = 'legdeflector', @@ -345,7 +347,8 @@ return { autoheal = 180, health = 24500, customparams = { - evolution_timer = 300 + evolution_condition = 'timer_global', + evolution_timer = 1740 }, buildoptions = { [1] = 'legdeflector', From 4458f6a78bcf4989b29d3d35a1bc0cd24ba2c1a1 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Thu, 14 Aug 2025 23:59:11 +0700 Subject: [PATCH 26/27] Update tweakunits2.lua --- lua/tweakunits2.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/tweakunits2.lua b/lua/tweakunits2.lua index 871cc63..2e96155 100644 --- a/lua/tweakunits2.lua +++ b/lua/tweakunits2.lua @@ -1,11 +1,11 @@ ---NuttyB v1.52 Armada Com +--NuttyB v1.52c Armada Com -- Authors: ChrispyNut, BackBash -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko return { armcom = { customparams = { evolution_target = 'armcomlvl2', - evolution_condition = 'timer', + evolution_condition = 'timer_global', evolution_timer = 420 }, energymake = 100, @@ -170,8 +170,8 @@ return { }, customparams = { evolution_target = 'armcomlvl3', - evolution_condition = 'timer', - evolution_timer = 900, + evolution_condition = 'timer_global', + evolution_timer = 1320, }, weapondefs = { armcomlaser = { @@ -337,8 +337,8 @@ return { }, customparams = { evolution_target = 'armcomlvl4', - evolution_condition = 'timer', - evolution_timer = 420, + evolution_condition = 'timer_global', + evolution_timer = 1740, }, weapondefs = { old_armsnipe_weapon = { From 8972f13fd60678ba0358c3d091741ae794c00065 Mon Sep 17 00:00:00 2001 From: rcorex <218065218+rcorex@users.noreply.github.com> Date: Thu, 14 Aug 2025 23:59:32 +0700 Subject: [PATCH 27/27] Update tweakunits3.lua --- lua/tweakunits3.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/tweakunits3.lua b/lua/tweakunits3.lua index c6cb19d..7266c59 100644 --- a/lua/tweakunits3.lua +++ b/lua/tweakunits3.lua @@ -1,11 +1,11 @@ ---NuttyB v1.52 Cortex Com +--NuttyB v1.52c Cortex Com -- Authors: ChrispyNut, BackBash -- docs.google.com/spreadsheets/d/1QSVsuAAMhBrhiZdTihVfSCwPzbbZWDLCtXWP23CU0ko return { corcom = { customparams = { evolution_target = 'corcomlvl2', - evolution_condition = 'timer', + evolution_condition = 'timer_global', evolution_timer = 420 }, autoheal = 80, @@ -95,8 +95,8 @@ return { }, customparams = { evolution_target = 'corcomlvl3', - evolution_condition = 'timer', - evolution_timer = 900, + evolution_condition = 'timer_global', + evolution_timer = 1320, shield_power = 500, shield_radius = 100 }, @@ -254,8 +254,8 @@ return { }, customparams = { evolution_target = 'corcomlvl4', - evolution_condition = 'timer', - evolution_timer = 420 + evolution_condition = 'timer_global', + evolution_timer = 1740 }, weapondefs = { corcomlaser = {