kerboul/perun
1
0
Fork 0
mirror of https://github.com/DaKerboul/perun.git synced 2026-08-09 19:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix for Kill event

Browse Source
This commit is contained in:
Szymon Porwolik
2019-03-10 15:19:53 +01:00
parent f7f688d1a5
commit 9f50bb1397
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
01_DCS/Hooks/Perun.lua
View File

@@ -20,7 +20,7 @@ Perun.MOTD_L2 = "Wymagamy obecnosci na 255Mhz (DCS SRS)" -- (string) Message
-- Variable init -- Variable init
Perun.Version = "v0.5.0" Perun.Version = "v0.5.1"
Perun.StatusData = {} Perun.StatusData = {}
Perun.SlotsData = {} Perun.SlotsData = {}
Perun.MissionData = {} Perun.MissionData = {}
@@ -495,17 +495,17 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
elseif eventName == "kill" then elseif eventName == "kill" then
--"kill", killerPlayerID, killerUnitType, killerSide, victimPlayerID, victimUnitType, victimSide, weaponName --"kill", killerPlayerID, killerUnitType, killerSide, victimPlayerID, victimUnitType, victimSide, weaponName
_tempX=""
if net.get_player_info(arg4, "name") ~= nil then if net.get_player_info(arg4, "name") ~= nil then
_temp = " player ".. net.get_player_info(arg4, "name") .." "; _tempX = " player ".. net.get_player_info(arg4, "name") .." ";
Perun.LogStats(arg4); Perun.LogStats(arg4);
else else
_temp = " AI "; _tempX = " AI ";
end end
if net.get_player_info(arg1, "name") ~= nil then if net.get_player_info(arg1, "name") ~= nil then
_temp2 = " player ".. net.get_player_info(arg1, "name") .." "; _temp2 = " player ".. net.get_player_info(arg1, "name") .." ";
if Perun.GetCategory(arg5) == "Planes" then if Perun.GetCategory(arg5) == "Planes" then
Perun.LogStatsCount(arg1,"kill_Planes",arg2) Perun.LogStatsCount(arg1,"kill_Planes",arg2)
elseif Perun.GetCategory(arg5) == "Helicopters" then elseif Perun.GetCategory(arg5) == "Helicopters" then
@@ -523,7 +523,6 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
else else
Perun.LogStatsCount(arg1,"kill_Other",arg2) Perun.LogStatsCount(arg1,"kill_Other",arg2)
end end
if net.get_player_info(arg4, "name") ~= nil and killerSide ~= victimSide then if net.get_player_info(arg4, "name") ~= nil and killerSide ~= victimSide then
Perun.LogStatsCount(arg1,"kill_PvP",arg2) Perun.LogStatsCount(arg1,"kill_PvP",arg2)
end end
@@ -535,8 +534,7 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
arg7 = "Cannon" arg7 = "Cannon"
end end
Perun.LogEvent(eventName,Perun.SideID2Name(arg3) .. _temp2 .. " in " .. arg2 .. " killed " .. Perun.SideID2Name(arg6) .. _temp .. " in " .. arg5 .. " using " .. arg7 .. " [".. Perun.GetCategory(arg5).."]",arg7,Perun.GetCategory(arg5)); Perun.LogEvent(eventName,Perun.SideID2Name(arg3) .. _temp2 .. " in " .. arg2 .. " killed " .. Perun.SideID2Name(arg6) .. _tempX .. " in " .. arg5 .. " using " .. arg7 .. " [".. Perun.GetCategory(arg5).."]",arg7,Perun.GetCategory(arg5));
elseif eventName == "self_kill" then elseif eventName == "self_kill" then
--"self_kill", playerID --"self_kill", playerID
Perun.LogEvent(eventName,net.get_player_info(arg1, "name") .. " killed himself",nil,nil); Perun.LogEvent(eventName,net.get_player_info(arg1, "name") .. " killed himself",nil,nil);
@@ -551,8 +549,8 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
_temp = "SPECTATOR"; _temp = "SPECTATOR";
end end
Perun.LogEvent(eventName,Perun.SideID2Name( net.get_player_info(arg1, "side")) .. " player " .. net.get_player_info(arg1, "name") .. " changed slot to " .. _temp); Perun.LogEvent(eventName,Perun.SideID2Name( net.get_player_info(arg1, "side")) .. " player " .. net.get_player_info(arg1, "name") .. " changed slot to " .. _temp,nil,nil);
Perun.LogStatsCount(arg1,"init",_temp,nil,nil) Perun.LogStatsCount(arg1,"init",_temp)
elseif eventName == "connect" then elseif eventName == "connect" then
--"connect", playerID, name --"connect", playerID, name