weyne/MissionScriptingTools
1
0
Fork 0
mirror of https://github.com/mrSkortch/MissionScriptingTools.git synced 2025-08-15 10:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

hotfix, again

Browse Source 
Sigh
This commit is contained in:
mrSkortch 2014-10-09 17:54:59 -06:00
parent 56931faa42
commit 36d7a0c3bc
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mist.lua
View File

@ -3118,7 +3118,7 @@ stopFlag
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 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
if Group.getByName(groupName) and Group.getByName(groupName):isActive() then if Group.getByName(groupName) and Group.getByName(groupName):isExist() then
if trigger.misc.getUserFlag(flag) == 0 then if trigger.misc.getUserFlag(flag) == 0 then
trigger.action.setUserFlag(flag, true) trigger.action.setUserFlag(flag, true)
end end
@ -3193,7 +3193,7 @@ mist.flagFunc.group_alive_less_than = function(vars)
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 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
if Group.getByName(groupName) and Group.getByName(groupName):isActive() then if Group.getByName(groupName) and Group.getByName(groupName):isExist() then
if Group.getByName(groupName):getSize()/Group.getByName(groupName):getInitialSize() < percent/100 then if Group.getByName(groupName):getSize()/Group.getByName(groupName):getInitialSize() < percent/100 then
if trigger.misc.getUserFlag(flag) == 0 then if trigger.misc.getUserFlag(flag) == 0 then
trigger.action.setUserFlag(flag, true) trigger.action.setUserFlag(flag, true)
@ -3237,7 +3237,7 @@ mist.flagFunc.group_alive_more_than = function(vars)
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 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
if Group.getByName(groupName) and Group.getByName(groupName):isActive() then if Group.getByName(groupName) and Group.getByName(groupName):isExist() then
if Group.getByName(groupName):getSize()/Group.getByName(groupName):getInitialSize() > percent/100 then if Group.getByName(groupName):getSize()/Group.getByName(groupName):getInitialSize() > percent/100 then
if trigger.misc.getUserFlag(flag) == 0 then if trigger.misc.getUserFlag(flag) == 0 then
trigger.action.setUserFlag(flag, true) trigger.action.setUserFlag(flag, true)
@ -5009,6 +5009,13 @@ mist.teleportToPoint = function(vars) -- main teleport function that all of tele
return false return false
end end
end end
if not newGroupData.country and mist.DBs.groupsByName[newGroupData.groupName].country then
newGroupData.country = mist.DBs.groupsByName[newGroupData.groupName].country
end
if not newGroupData.category and mist.DBs.groupsByName[newGroupData.groupName].category then
newGroupData.category = mist.DBs.groupsByName[newGroupData.groupName].category
end
for unitNum, unitData in pairs(newGroupData.units) do for unitNum, unitData in pairs(newGroupData.units) do
if disperse then if disperse then
if maxDisp and type(maxDisp) == 'number' and unitNum ~= 1 then if maxDisp and type(maxDisp) == 'number' and unitNum ~= 1 then
@ -5023,15 +5030,17 @@ mist.teleportToPoint = function(vars) -- main teleport function that all of tele
newGroupData.units[unitNum]["x"] = unitData.x + diff.x newGroupData.units[unitNum]["x"] = unitData.x + diff.x
newGroupData.units[unitNum]["y"] = unitData.y + diff.y newGroupData.units[unitNum]["y"] = unitData.y + diff.y
end end
--[[if newGroupData.category == 'plane' or newGroupData.category = 'helicopter' then
if point.z and point.y + 10 > terrain.getHeight({point.x, point.z}) then
newGroupData.units[unitNum]["alt"] = point.y
end
end
]]
end end
--tostring, tostring(), --tostring, tostring(),
if not newGroupData.country and mist.DBs.groupsByName[newGroupData.groupName].country then
newGroupData.country = mist.DBs.groupsByName[newGroupData.groupName].country
end
if not newGroupData.category and mist.DBs.groupsByName[newGroupData.groupName].category then
newGroupData.category = mist.DBs.groupsByName[newGroupData.groupName].category
end
if route then if route then
newGroupData.route = route newGroupData.route = route

9
rev changelog.txt
View File

@ -1,4 +1,13 @@
-- changelog -- changelog
v37
- If the point given
- fixed bug with mist.flagFunc.group_alive_less_than and mist.flagFunc.group_alive_more_than
v36
-fixed a bug with databases getting an incorrect countryId value
v35
- fixed bug with mist.teleportToPoint
v34 v3.5 release v34 v3.5 release
- fixed missing entries in dbupdate - fixed missing entries in dbupdate