change comm evo to timer_global

lua/tweakdefs/raptor hp 1.3X.lua

@@ -1,20 +1,19 @@
--- 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
         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
 
-    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
-        unitDef.nochasecategory = "OBJECT"
     end
 end
 
@@ -24,9 +23,10 @@ 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)
+    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

lua/tweakdefs/raptor hp 1.5X.lua

@@ -1,20 +1,19 @@
--- 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
         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
 
-    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
-        unitDef.nochasecategory = "OBJECT"
     end
 end
 
@@ -24,9 +23,10 @@ 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)
+    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

lua/tweakdefs/raptor hp 1.7X.lua

@@ -1,20 +1,19 @@
--- 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
         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
 
-    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
-        unitDef.nochasecategory = "OBJECT"
     end
 end
 
@@ -24,9 +23,10 @@ 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)
+    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

lua/tweakdefs/raptor hp 2.0X.lua

@@ -1,20 +1,19 @@
--- 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
         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
 
-    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
-        unitDef.nochasecategory = "OBJECT"
     end
 end
 
@@ -24,9 +23,10 @@ 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)
+    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

lua/tweakdefs/raptor hp 2.5X.lua

@@ -1,20 +1,19 @@
--- 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
         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
 
-    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
-        unitDef.nochasecategory = "OBJECT"
     end
 end
 
@@ -24,9 +23,10 @@ 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)
+    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

lua/tweakdefs/raptor hp 3.0X.lua

@@ -1,20 +1,19 @@
--- 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
         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
 
-    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
-        unitDef.nochasecategory = "OBJECT"
     end
 end
 
@@ -24,9 +23,10 @@ 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)
+    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

lua/tweakdefs/raptor hp 4.0X.lua

@@ -1,20 +1,19 @@
--- 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
         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
 
-    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
-        unitDef.nochasecategory = "OBJECT"
     end
 end
 
@@ -24,9 +23,10 @@ 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)
+    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

lua/tweakdefs/raptor hp 5.0X.lua

@@ -1,20 +1,19 @@
--- 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
         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
 
-    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
-        unitDef.nochasecategory = "OBJECT"
     end
 end
 
@@ -24,9 +23,10 @@ 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)
+    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

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',