From 9dfd4929ea7e51083a67f3ca2b988f2a691b0724 Mon Sep 17 00:00:00 2001 From: mrSkortch Date: Wed, 1 Jun 2016 01:02:31 -0600 Subject: [PATCH 1/2] v71 Fixed a bug with flagFuncs to stop assigning the unitTableDef if the corresponding units entry was invalid. --- mist.lua | 28 ++++++++++++++++++++-------- mist_4_3_71.lua => mist_4_3_72.lua | 30 ++++++++++++++++++++++-------- rev changelog.txt | 25 +++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 16 deletions(-) rename mist_4_3_71.lua => mist_4_3_72.lua (99%) diff --git a/mist.lua b/mist.lua index dbd6aab..141498c 100644 --- a/mist.lua +++ b/mist.lua @@ -35,7 +35,7 @@ mist = {} -- don't change these mist.majorVersion = 4 mist.minorVersion = 3 -mist.build = 71 +mist.build = 72 -- forward declaration of log shorthand local log @@ -2128,6 +2128,7 @@ do -- @treturn table @{UnitNameTable} function mist.makeUnitTable(tbl) --Assumption: will be passed a table of strings, sequential + log:info(tbl) local units_by_name = {} local l_munits = mist.DBs.units --local reference for faster execution @@ -4522,7 +4523,9 @@ unitTableDef = table or nil end if (units.processed and units.processed < mist.getLastDBUpdateTime()) or not units.processed then -- run unit table short cuts - units = mist.makeUnitTable(unitTableDef) + if unitTableDef then + units = mist.makeUnitTable(unitTableDef) + end end if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == 0) then @@ -4592,9 +4595,11 @@ unitTableDef = table or nil if not units.processed then unitTableDef = mist.utils.deepCopy(units) end - + if (units.processed and units.processed < mist.getLastDBUpdateTime()) or not units.processed then -- run unit table short cuts - units = mist.makeUnitTable(unitTableDef) + if unitTableDef then + units = mist.makeUnitTable(unitTableDef) + end end if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == false) then @@ -4666,11 +4671,16 @@ unitTableDef = table or nil end if (units.processed and units.processed < mist.getLastDBUpdateTime()) or not units.processed then -- run unit table short cuts - units = mist.makeUnitTable(unitTableDef) + if unitTableDef then + units = mist.makeUnitTable(unitTableDef) + end end if (zone_units.processed and zone_units.processed < mist.getLastDBUpdateTime()) or not zone_units.processed then -- run unit table short cuts - zone_units = mist.makeUnitTable(zUnitTableDef) + if zUnitTableDef then + zone_units = mist.makeUnitTable(zUnitTableDef) + end + end if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == false) then @@ -4745,11 +4755,13 @@ toggle = boolean or nil end if (unitset1.processed and unitset1.processed < mist.getLastDBUpdateTime()) or not unitset1.processed then -- run unit table short cuts - unitset1 = mist.makeUnitTable(unitTableDef1) + if unitTableDef1 then + end end if (unitset2.processed and unitset2.processed < mist.getLastDBUpdateTime()) or not unitset2.processed then -- run unit table short cuts - unitset2 = mist.makeUnitTable(unitTableDef2) + if unitTableDef2 then + end end diff --git a/mist_4_3_71.lua b/mist_4_3_72.lua similarity index 99% rename from mist_4_3_71.lua rename to mist_4_3_72.lua index dbd6aab..9c631bd 100644 --- a/mist_4_3_71.lua +++ b/mist_4_3_72.lua @@ -35,7 +35,7 @@ mist = {} -- don't change these mist.majorVersion = 4 mist.minorVersion = 3 -mist.build = 71 +mist.build = 72 -- forward declaration of log shorthand local log @@ -2128,6 +2128,7 @@ do -- @treturn table @{UnitNameTable} function mist.makeUnitTable(tbl) --Assumption: will be passed a table of strings, sequential + log:info(tbl) local units_by_name = {} local l_munits = mist.DBs.units --local reference for faster execution @@ -4522,7 +4523,9 @@ unitTableDef = table or nil end if (units.processed and units.processed < mist.getLastDBUpdateTime()) or not units.processed then -- run unit table short cuts - units = mist.makeUnitTable(unitTableDef) + if unitTableDef then + units = mist.makeUnitTable(unitTableDef) + end end if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == 0) then @@ -4592,9 +4595,11 @@ unitTableDef = table or nil if not units.processed then unitTableDef = mist.utils.deepCopy(units) end - + if (units.processed and units.processed < mist.getLastDBUpdateTime()) or not units.processed then -- run unit table short cuts - units = mist.makeUnitTable(unitTableDef) + if unitTableDef then + units = mist.makeUnitTable(unitTableDef) + end end if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == false) then @@ -4666,11 +4671,16 @@ unitTableDef = table or nil end if (units.processed and units.processed < mist.getLastDBUpdateTime()) or not units.processed then -- run unit table short cuts - units = mist.makeUnitTable(unitTableDef) + if unitTableDef then + units = mist.makeUnitTable(unitTableDef) + end end if (zone_units.processed and zone_units.processed < mist.getLastDBUpdateTime()) or not zone_units.processed then -- run unit table short cuts - zone_units = mist.makeUnitTable(zUnitTableDef) + if zUnitTableDef then + zone_units = mist.makeUnitTable(zUnitTableDef) + end + end if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == false) then @@ -4745,11 +4755,15 @@ toggle = boolean or nil end if (unitset1.processed and unitset1.processed < mist.getLastDBUpdateTime()) or not unitset1.processed then -- run unit table short cuts - unitset1 = mist.makeUnitTable(unitTableDef1) + if unitTableDef1 then + unitset1 = mist.makeUnitTable(unitTableDef1) + end end if (unitset2.processed and unitset2.processed < mist.getLastDBUpdateTime()) or not unitset2.processed then -- run unit table short cuts - unitset2 = mist.makeUnitTable(unitTableDef2) + if unitTableDef2 then + unitset2 = mist.makeUnitTable(unitTableDef2) + end end diff --git a/rev changelog.txt b/rev changelog.txt index 7fa9043..e1c7b40 100644 --- a/rev changelog.txt +++ b/rev changelog.txt @@ -1,3 +1,28 @@ +v72 +fixed bug with flagFuncs to correctly check and assign unitTableDef entries. + +v71 +added shapename DB entry +dynAddStatic will now add a shapename if the object type matches a shapename DB entry + +v70 +Added assorted error checking on a few functions +v69 +- Updated mission used to create DBs. There should no longer be any unit +names that are the same as group names. + +Dynamically generated names will now be indexed accordingly to their +category. Used to be just a single counter shared between all. + +Several changes and fixes to dynAddStatic +-Fixed function wasn't working when given certain params. +-fixed country checker to better account for country names with spaces. +This fix was applied to dynAdd but not dynAddStatic, I corrected this. +-Optimized it slightly. Trimmed the fat of some of the code. + +v68 +-DB refactor-start + v66 -Added default setting for logger if no value present -Added documentation for logger From 4ff3d57d66e54c2dd1acde73444a072ebceccb96 Mon Sep 17 00:00:00 2001 From: mrSkortch Date: Wed, 1 Jun 2016 01:03:20 -0600 Subject: [PATCH 2/2] actual commit Fixed an oops --- mist.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mist.lua b/mist.lua index 141498c..9c631bd 100644 --- a/mist.lua +++ b/mist.lua @@ -4756,11 +4756,13 @@ toggle = boolean or nil if (unitset1.processed and unitset1.processed < mist.getLastDBUpdateTime()) or not unitset1.processed then -- run unit table short cuts if unitTableDef1 then + unitset1 = mist.makeUnitTable(unitTableDef1) end end if (unitset2.processed and unitset2.processed < mist.getLastDBUpdateTime()) or not unitset2.processed then -- run unit table short cuts if unitTableDef2 then + unitset2 = mist.makeUnitTable(unitTableDef2) end end