diff --git a/mafia-tools.lua b/mafia-tools.lua index ac705f4..2fc9138 100644 --- a/mafia-tools.lua +++ b/mafia-tools.lua @@ -655,6 +655,19 @@ menu.loop = function() end end +-->> MAFIAWAR +mafiawar = {} +mafiawar.biz_id = -1 +mafiawar.biz = false +mafiawar.onServerMessage = function(color, message) + +end +mafiawar.onCreate3DText = function(id, color, position, distance, testLOS, attachedPlayerId, attachedVehicleId, text) + if text:find("Владелец") then + + end +end + -->> GET GUNS get_guns = {} get_guns.warehouse = false @@ -700,6 +713,7 @@ get_guns.onServerMessage = function(color, message) get_guns.messages[#get_guns.messages+1] = message:match("^ .+%[%d+%]: (.+)") end if config.data.get_guns.auto_get_guns and get_guns.enter_textdraw and message:find("^ .+ открыл%(а%) склад с оружием$") and not message:find(getLocalPlayerNickname()) then + get_guns.warehouse = true get_guns.start_get() end if message == " Броня уже 100%" and get_guns.getgun then @@ -724,8 +738,8 @@ get_guns.onShowDialog = function(id, style, title, button1, button2, text) if title == "Статистика персонажа" then local frac, rank = text:match("Организация\t(.+).Ранг\t.+%[(.+)%]") if rank ~= nil then - rank = rank:gsub("Лидер", "10") - rank = tonumber(rank) + rank = rank:gsub("лидер", "10") + rank = tonumber(rank) config.data.stats.rank = rank config.data.stats.frac = frac config.save(config.data) @@ -1276,6 +1290,9 @@ config.default = { war = { armoff = true, armoff_id = { 0, 1, 4 } + }, + mafiawar = { + auto = true } } config.directory = string.format("%s\\moonloader\\config\\%s\\", getGameDirectory(), thisScript().name) @@ -1362,6 +1379,10 @@ function sampev.onServerMessage(color, message) if res then return table.unpack(res) end + local res = processEvent(mafiawar.onServerMessage, table.pack(color, message)) + if res then + return table.unpack(res) + end end end function sampev.onSendPickedUpPickup(id) @@ -1405,6 +1426,9 @@ end function sampev.onTextDrawHide(id) get_guns.onTextDrawHide(id) end +function sampev.onCreate3DText(id, color, position, distance, testLOS, attachedPlayerId, attachedVehicleId, text) + mafiawar.onCreate3DText(id, color, position, distance, testLOS, attachedPlayerId, attachedVehicleId, text) +end function onSendPacket(id, bs) if id == 204 then raknetBitStreamIgnoreBits(bs,40) @@ -1826,4 +1850,5 @@ utf8({ "sampSetCurrentDialogEditboxText" }, "Utf8ToAnsi") utf8({ "sampHasDialogRespond" }, nil, "AnsiToUtf8") utf8({ "sampev", "onServerMessage" }, "AnsiToUtf8", "Utf8ToAnsi") utf8({ "sampev", "onShowDialog" }, "AnsiToUtf8", "Utf8ToAnsi") -utf8({ "sampev", "onSendCommand" }, "AnsiToUtf8", "Utf8ToAnsi") \ No newline at end of file +utf8({ "sampev", "onSendCommand" }, "AnsiToUtf8", "Utf8ToAnsi") +utf8({ "sampev", "onCreate3DText" }, "AnsiToUtf8", "Utf8ToAnsi") \ No newline at end of file