Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mattyx14 committed Mar 28, 2024
1 parent 6aa341b commit f8c0133
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 137 deletions.
45 changes: 20 additions & 25 deletions config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
loginOnlyWithLoginServer = false
blockedVps = "google;amazon;amazon.com;oracle;azure;vultr;google.com"
permitedVps = 0

-- Account manager
accountManager = true
namelockManager = true
newPlayerChooseVoc = true
Expand Down Expand Up @@ -162,8 +164,8 @@
loginProtectionPeriod = 5 * 1000
diagonalPush = true
deathLostPercent = 10
stairhopDelay = 0.3 * 1000
pushCreatureDelay = 1 * 280
stairhopDelay = 1 * 1000
pushCreatureDelay = 1 * 1000
deathContainerId = 1987
gainExperienceColor = 215
addManaSpentInPvPZone = true
Expand All @@ -172,25 +174,19 @@
broadcastBanishments = false
maxViolationCommentSize = 60
violationNameReportActionType = 2
optionalWarAttackableAlly = true
fistBaseAttack = 7
criticalHitChance = 7
noDamageToGuildMates = false
noDamageToPartyMembers = true

--optional PVP
-- Optional PVP
optionalProtection = false

-- Corpse Block
-- If set to true, players won't be able to immediately throw fields on top of corpses after killing the monster
allowCorpseBlock = false

-- Battle
-- Note: classicAttackSpeed set to true makes players constantly attack at regular
-- intervals regardless of other actions such as item (potion) use. This setting
-- may cause high CPU usage with many players and potentially affect performance!
optionalWarAttackableAlly = true
fistBaseAttack = 7

criticalHitChance = 7
noDamageToGuildMates = false
noDamageToPartyMembers = true

-- Rook System
rookLevelTo = 5
rookLevelToLeaveRook = 8
Expand All @@ -200,7 +196,7 @@
-- Paralyze delay
paralyzeDelay = 1500

-- Depot and Miscellaneous
-- Depot
-- set playerFollowExhaust to 2000 if someone causes lags and kicks by following unreachable creatures too often
useCapacity = true
defaultDepotSize = 400
Expand All @@ -209,10 +205,9 @@
cleanItemsInMap = false
playerFollowExhaust = 500

-- 8.7x + config
-- 8.7x extras
monsterSpawnWalkback = false
allowBlockSpawn = true

classicEquipmentSlots = true

-- Summons and monsters
Expand Down Expand Up @@ -289,7 +284,7 @@
-- Item usage
timeBetweenActions = 200
timeBetweenExActions = 1000
timeBetweenCustomActions = 0
timeBetweenCustomActions = 500
checkCorpseOwner = true
hotkeyAimbotEnabled = true
maximumDoorLevel = 999
Expand Down Expand Up @@ -383,15 +378,15 @@
fairFightTimeRange = 60

-- Rates
experienceStages = true
rateExperience = 999
experienceStages = false
rateExperience = 5
rateExperienceFromPlayers = 0
levelToOfflineTraining = 8
rateSkill = 30
rateSkillOffline = 10
rateMagic = 15
rateMagicOffline = 5
rateLoot = 4
rateSkill = 1.0
rateSkillOffline = 0.5
rateMagic = 1.0
rateMagicOffline = 0.5
rateLoot = 2.0
rateSpawn = 1
rateSpawnMin = 1
rateSpawnMax = 2
Expand Down
8 changes: 4 additions & 4 deletions data/globalevents/scripts/shutdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ function prepareShutdown(minutes)
end

if(minutes == 1) then
doBroadcastMessage("O Server Save acontecerá em " .. minutes .. " minutos, por favor desloguem!")
doBroadcastMessage("Server Save will take place in " .. minutes .. " minutes, please disconnect!")
for _, pid in pairs (getPlayersOnline()) do
doPlayerSave(pid, true)
end
elseif(minutes <= 3) then
--doSaveServer()
doBroadcastMessage("[Salvando]: O Server Save acontecerá em " .. minutes .. " minutos, por favor desloguem!")
doBroadcastMessage("[Saving]: Server Save will take place in " .. minutes .. " minutes, please disconnect!")
else
doBroadcastMessage("O Server Save acontecerá em " .. minutes .. " minutos.")
doBroadcastMessage("Server Save will take place in " .. minutes .. " minutes.")
end

shutdownEvent = addEvent(prepareShutdown, 60000, minutes - 1)
Expand All @@ -36,4 +36,4 @@ end
function global()
doSaveServer()
doSetGameState(GAMESTATE_SHUTDOWN)
end
end
45 changes: 23 additions & 22 deletions data/talkactions/scripts/additemip.lua
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
function onSay(cid, words, param, channel)

local t = string.explode(param, ",")
if t[1] ~= nil and t[2] ~= nil then
doBroadcastMessage(getPlayerName(cid) .. " Acabou de dar: " .. t[2] .." ".. getItemNameById(t[1]) .. " a todos players online!")
local list = {}
for i, player in ipairs(getPlayersOnline()) do
local playerIp = getPlayerIp(player)
if not list[tostring(playerIp)] then
local t = string.explode(param, ",")
if t[1] ~= nil and t[2] ~= nil then
doBroadcastMessage(getPlayerName(cid) .. " Just gave: " .. t[2] .." ".. getItemNameById(t[1]) .. " to all online players!")
local list = {}
for i, player in ipairs(getPlayersOnline()) do
local playerIp = getPlayerIp(player)
if not list[tostring(playerIp)] then
list[tostring(playerIp)] = player
end
end
if next(list) then
for ip, pid in pairs(list) do
if isPlayer(pid) then
doPlayerAddItem(pid, t[1], t[2])
end
end
end
else
doPlayerPopupFYI(cid, "No param...\nSend:\n /additemip itemid, how_much_items\nexample:\n /additemip 2160, 10")
end
return true
end
end
end

if next(list) then
for ip, pid in pairs(list) do
if isPlayer(pid) then
doPlayerAddItem(pid, t[1], t[2])
end
end
end
else
doPlayerPopupFYI(cid, "No param...\nSend:\n /additemip itemid, how_much_items\nexample:\n /additemip 2160, 10")
end

return true
end
7 changes: 0 additions & 7 deletions data/talkactions/scripts/lifeinpercent/lifeinpercent.lua

This file was deleted.

22 changes: 11 additions & 11 deletions data/talkactions/scripts/mute.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ end

function onSay(cid, words, param)
if param == "" then
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE,"Use /mute nome, tempo (muta total), /helpmute nome, tempo (muta somente no help).")
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE,"Use /mute name, time (change total), /helpmute name, time (change only in help).")
return true
end

local t = string.explode(param, ', ')
local target = getPlayerByNameWildcard(t[1])

if not target or (isPlayerGhost(target) and getPlayerGhostAccess(target) > getPlayerGhostAccess(cid)) then
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, t[1].." não está online.")
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, t[1].." it's not online.")
return true
end

if getPlayerAccess(cid) <= getPlayerAccess(target) or getPlayerFlagValue(target, PLAYERFLAG_CANNOTBEMUTED) then
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, "Você não pode mutar este jogador.")
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, "You cannot mutate this player.")
return true
end

if words:sub(2,2) ~= "h" and getPlayerAccess(cid) < 4 then
doPlayerSendTextMessage(cid, MESSAGE_STATUS_CONSOLE_BLUE, "Este comando só está disponível para GMs, CMs e GODs. Você só pode usar o /helpmute.")
doPlayerSendTextMessage(cid, MESSAGE_STATUS_CONSOLE_BLUE, "This command is only available for GMs, CMs and GODs. You can only use the /helpmute.")
return true
end

Expand All @@ -39,26 +39,26 @@ function onSay(cid, words, param)
if not time or time < 1 then time = 60 end

if time > 100000 and getPlayerAccess(cid) < 4 then
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE,"Você não pode mutar por mais de 100000 segundos.")
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE,"You cannot mutate for more than 100000 seconds.")
return true
end

silence(target,time,true)
doPlayerSendTextMessage(target, MESSAGE_STATUS_CONSOLE_RED, " Você foi mutado no help por "..time.." segundos.")
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, t[1].." foi mutado no help por "..time.." segundos.")
doPlayerSendTextMessage(target, MESSAGE_STATUS_CONSOLE_RED, "You were mutated in help by "..time.." seconds.")
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, t[1].." was changed in help by "..time.." seconds.")

elseif words:sub(2,2) == "m" then
local time = tonumber(t[2])
if not time or time < 1 then time = 60 end
silence(target,time,false)
doPlayerSendTextMessage(target, MESSAGE_STATUS_CONSOLE_RED, " Você foi mutado por "..time.." segundos.")
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, t[1].." foi mutado por "..time.." segundos.")
doPlayerSendTextMessage(target, MESSAGE_STATUS_CONSOLE_RED, " You have been mutated by "..time.." seconds.")
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, t[1].." was mutated by "..time.." seconds.")

elseif words:sub(2,2) == "u" then
doRemoveCondition(target,CONDITION_MUTED)
doPlayerSetStorageValue(target, 455010, -1)
doPlayerSendTextMessage(target, MESSAGE_STATUS_CONSOLE_RED, "Você foi desmutado pelo: "..getCreatureName(cid))
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, t[1].." foi desmutado.")
doPlayerSendTextMessage(target, MESSAGE_STATUS_CONSOLE_RED, "You were demuted by: "..getCreatureName(cid))
doPlayerSendTextMessage(cid,MESSAGE_STATUS_CONSOLE_BLUE, t[1].." was unmuted.")
end
return true
end
39 changes: 0 additions & 39 deletions data/talkactions/scripts/resetsystem/reset_system.lua

This file was deleted.

28 changes: 0 additions & 28 deletions data/talkactions/scripts/resetsystem/resetcheck.lua

This file was deleted.

2 changes: 1 addition & 1 deletion data/talkactions/scripts/tradeoff.lua
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function onSay(cid, words, param, channel)
local duration
local durationClear

-- checkar se o item bloqueado está dentro de uma BP que o player está tentando colocar no tradeoff
-- check if the blocked item is within a BP that the player is trying to place in the tradeoff
if isContainer(item.uid) then
local getBlockedsInContainer = {}
for i=1, #config.blokedItems do
Expand Down

0 comments on commit f8c0133

Please sign in to comment.