mirror of
https://github.com/edubart/otclient.git
synced 2025-10-15 20:14:54 +02:00
Get rid of trailing whitespace.
Commit generated by command:
find -type f ! -path '*.git*' ! -path '*.png' ! -path '*.ico' ! -path \
'*.ogg' | xargs -I '{}' sed -i '{}' -e 's/\t*$//g' -e 's/ *$//g'
This commit is contained in:
Jacek Wielemborek
@@ -14,7 +14,7 @@ function g_game.findPlayerItem(itemId, subType)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return g_game.findItemInContainers(itemId, subType)
|
||||
end
|
||||
|
||||
|
||||
@@ -19,5 +19,5 @@ Module
|
||||
dofile 'market'
|
||||
dofile 'thing'
|
||||
dofile 'spells'
|
||||
|
||||
|
||||
dofiles 'ui'
|
||||
|
||||
@@ -154,7 +154,7 @@ function Player:hasState(_state, states)
|
||||
for i = 1, 32 do
|
||||
local pow = math.pow(2, i-1)
|
||||
if pow > states then break end
|
||||
|
||||
|
||||
local states = bit32.band(states, pow)
|
||||
if states == _state then
|
||||
return true
|
||||
|
||||
@@ -57,7 +57,7 @@ function ProtocolLogin:sendLoginPacket()
|
||||
msg:addU32(xteaKey[3])
|
||||
msg:addU32(xteaKey[4])
|
||||
end
|
||||
|
||||
|
||||
if g_game.getFeature(GameAccountNames) then
|
||||
msg:addString(self.accountName)
|
||||
else
|
||||
@@ -77,7 +77,7 @@ function ProtocolLogin:sendLoginPacket()
|
||||
if g_game.getProtocolVersion() >= 770 then
|
||||
msg:encryptRsa()
|
||||
end
|
||||
|
||||
|
||||
if g_game.getFeature(GameProtocolChecksum) then
|
||||
self:enableChecksum()
|
||||
end
|
||||
@@ -137,7 +137,7 @@ function ProtocolLogin:parseCharacterList(msg)
|
||||
local worldsCount = msg:getU8()
|
||||
for i=1, worldsCount do
|
||||
local world = {}
|
||||
local worldId = msg:getU8()
|
||||
local worldId = msg:getU8()
|
||||
world.worldName = msg:getString()
|
||||
world.worldIp = msg:getString()
|
||||
world.worldPort = msg:getU16()
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
SpelllistSettings = {
|
||||
['Default'] = {
|
||||
['Default'] = {
|
||||
iconFile = '/images/game/spells/defaultspells',
|
||||
iconSize = {width = 32, height = 32},
|
||||
spellListWidth = 210,
|
||||
spellWindowWidth = 550,
|
||||
spellOrder = {'Animate Dead', 'Annihilation', 'Avalanche', 'Berserk', 'Blood Rage', 'Brutal Strike', 'Cancel Invisibility', 'Challenge', 'Chameleon', 'Charge', 'Conjure Arrow', 'Conjure Bolt', 'Conjure Explosive Arrow', 'Conjure Piercing Bolt', 'Conjure Poisoned Arrow', 'Conjure Power Bolt', 'Conjure Sniper Arrow', 'Convince Creature', 'Creature Illusion', 'Cure Bleeding', 'Cure Burning', 'Cure Curse', 'Cure Electrification', 'Cure Poison', 'Cure Poison Rune', 'Curse', 'Death Strike', 'Desintegrate', 'Destroy Field', 'Divine Caldera', 'Divine Healing', 'Divine Missile', 'Electrify', 'Enchant Party', 'Enchant Spear', 'Enchant Staff', 'Energy Beam', 'Energy Field', 'Energy Strike', 'Energy Wall', 'Energy Wave', 'Energybomb', 'Envenom', 'Eternal Winter', 'Ethereal Spear', 'Explosion', 'Fierce Berserk', 'Find Person', 'Fire Field', 'Fire Wall', 'Fire Wave', 'Fireball', 'Firebomb', 'Flame Strike', 'Food', 'Front Sweep', 'Great Energy Beam', 'Great Fireball', 'Great Light', 'Groundshaker', 'Haste', 'Heal Friend', 'Heal Party', 'Heavy Magic Missile', 'Hells Core', 'Holy Flash', 'Holy Missile', 'Ice Strike', 'Ice Wave', 'Icicle', 'Ignite', 'Inflict Wound', 'Intense Healing', 'Intense Healing Rune', 'Intense Recovery', 'Intense Wound Cleansing', 'Invisibility', 'Levitate', 'Light', 'Light Healing', 'Light Magic Missile', 'Lightning', 'Magic Rope', 'Magic Shield', 'Magic Wall', 'Mass Healing', 'Paralyze', 'Physical Strike', 'Poison Bomb', 'Poison Field', 'Poison Wall', 'Protect Party', 'Protector', 'Rage of the Skies', 'Recovery', 'Salvation', 'Sharpshooter', 'Soulfire', 'Stalagmite', 'Stone Shower', 'Strong Energy Strike', 'Strong Ethereal Spear', 'Strong Flame Strike', 'Strong Haste', 'Strong Ice Strike', 'Strong Ice Wave', 'Strong Terra Strike', 'Sudden Death', 'Summon Creature', 'Swift Foot', 'Terra Strike', 'Terra Wave', 'Thunderstorm', 'Train Party', 'Ultimate Energy Strike', 'Ultimate Flame Strike', 'Ultimate Healing', 'Ultimate Healing Rune', 'Ultimate Ice Strike', 'Ultimate Light', 'Ultimate Terra Strike', 'Whirlwind Throw', 'Wild Growth', 'Wound Cleansing', 'Wrath of Nature'}
|
||||
}--[[,
|
||||
|
||||
['Sample'] = {
|
||||
iconFile = '/images/game/spells/sample',
|
||||
|
||||
['Sample'] = {
|
||||
iconFile = '/images/game/spells/sample',
|
||||
iconSize = {width = 64, height = 64},
|
||||
spellOrder = {'Critical Strike', 'Firefly', 'Fire Breath', 'Moonglaives', 'Wind Walk'}
|
||||
}]]
|
||||
@@ -142,7 +142,7 @@ SpellInfo = {
|
||||
['Thunderstorm'] = {id = 117, words = 'adori mas vis', exhaustion = 2000, premium = false, type = 'Conjure', icon = 'thunderstorm', mana = 430, level = 28, soul = 3, group = {[3] = 2000}, vocations = {1, 5}},
|
||||
['Holy Missile'] = {id = 130, words = 'adori san', exhaustion = 2000, premium = false, type = 'Conjure', icon = 'holymissile', mana = 350, level = 27, soul = 3, group = {[3] = 2000}, vocations = {3, 7}}
|
||||
},
|
||||
|
||||
|
||||
['Sample'] = {
|
||||
['Wind Walk'] = {id = 1, words = 'windwalk', description = 'Run at enormous speed.', exhaustion = 2000, premium = false, type = 'Instant', icon = 1, mana = 50, level = 10, soul = 0, group = {[3] = 2000}, vocations = {1, 2}},
|
||||
['Fire Breath'] = {id = 2, words = 'firebreath', description = 'A strong firewave.', exhaustion = 2000, premium = false, type = 'Instant', icon = 2, mana = 350, level = 27, soul = 0, group = {[1] = 2000}, vocations = {4, 8}},
|
||||
@@ -209,89 +209,89 @@ SpellIcons = {
|
||||
['sniperarrow'] = {112, 108},
|
||||
['whirlwindthrow'] = {19, 107},
|
||||
['groundshaker'] = {25, 106},
|
||||
['fierceberserk'] = {22, 105},
|
||||
['fierceberserk'] = {22, 105},
|
||||
-- [[ 96 - 104 Unknown ]]
|
||||
['powerbolt'] = {108, 95},
|
||||
['wildgrowth'] = {61, 94},
|
||||
['challenge'] = {97, 93},
|
||||
['enchantstaff'] = {103, 92},
|
||||
['poisonbomb'] = {70, 91},
|
||||
['cancelinvisibility'] = {95, 90},
|
||||
['flamestrike'] = {26, 89},
|
||||
['energystrike'] = {29, 88},
|
||||
['deathstrike'] = {38, 87},
|
||||
['magicwall'] = {72, 86},
|
||||
['healfriend'] = {8, 84},
|
||||
['animatedead'] = {93, 83},
|
||||
['masshealing'] = {9, 82},
|
||||
['levitate'] = {125, 81},
|
||||
['berserk'] = {21, 80},
|
||||
['conjurebolt'] = {107, 79},
|
||||
['desintegrate'] = {88, 78},
|
||||
['stalagmite'] = {66, 77},
|
||||
['magicrope'] = {105, 76},
|
||||
['ultimatelight'] = {115, 75},
|
||||
['powerbolt'] = {108, 95},
|
||||
['wildgrowth'] = {61, 94},
|
||||
['challenge'] = {97, 93},
|
||||
['enchantstaff'] = {103, 92},
|
||||
['poisonbomb'] = {70, 91},
|
||||
['cancelinvisibility'] = {95, 90},
|
||||
['flamestrike'] = {26, 89},
|
||||
['energystrike'] = {29, 88},
|
||||
['deathstrike'] = {38, 87},
|
||||
['magicwall'] = {72, 86},
|
||||
['healfriend'] = {8, 84},
|
||||
['animatedead'] = {93, 83},
|
||||
['masshealing'] = {9, 82},
|
||||
['levitate'] = {125, 81},
|
||||
['berserk'] = {21, 80},
|
||||
['conjurebolt'] = {107, 79},
|
||||
['desintegrate'] = {88, 78},
|
||||
['stalagmite'] = {66, 77},
|
||||
['magicrope'] = {105, 76},
|
||||
['ultimatelight'] = {115, 75},
|
||||
-- [[ 71 - 64 TFS House Commands ]]
|
||||
-- [[ 63 - 70 Unknown ]]
|
||||
['annihilation'] = {24, 62},
|
||||
['brutalstrike'] = {23, 61},
|
||||
['annihilation'] = {24, 62},
|
||||
['brutalstrike'] = {23, 61},
|
||||
-- [[ 60 Unknown ]]
|
||||
['frontsweep'] = {20, 59},
|
||||
-- [[ 58 Unknown ]]
|
||||
['strongetherealspear'] = {59, 57},
|
||||
['wrathofnature'] = {48, 56},
|
||||
['energybomb'] = {86, 55},
|
||||
['paralyze'] = {71, 54},
|
||||
['strongetherealspear'] = {59, 57},
|
||||
['wrathofnature'] = {48, 56},
|
||||
['energybomb'] = {86, 55},
|
||||
['paralyze'] = {71, 54},
|
||||
-- [[ 53 Unknown ]]
|
||||
-- [[ 52 TFS Retrieve Friend ]]
|
||||
['conjurearrow'] = {106, 51},
|
||||
['soulfire'] = {67, 50},
|
||||
['explosivearrow'] = {109, 49},
|
||||
['poisonedarrow'] = {111, 48},
|
||||
['conjurearrow'] = {106, 51},
|
||||
['soulfire'] = {67, 50},
|
||||
['explosivearrow'] = {109, 49},
|
||||
['poisonedarrow'] = {111, 48},
|
||||
-- [[ 46 / 47 Unknown ]]
|
||||
['invisible'] = {94, 45},
|
||||
['magicshield'] = {124, 44},
|
||||
['strongicewave'] = {46, 43},
|
||||
['food'] = {99, 42},
|
||||
['invisible'] = {94, 45},
|
||||
['magicshield'] = {124, 44},
|
||||
['strongicewave'] = {46, 43},
|
||||
['food'] = {99, 42},
|
||||
-- [[ 40 / 41 Unknown ]]
|
||||
['stronghaste'] = {102, 39},
|
||||
['creatureillusion'] = {100, 38},
|
||||
['stronghaste'] = {102, 39},
|
||||
['creatureillusion'] = {100, 38},
|
||||
-- [[ 37 TFS Move ]]
|
||||
['salvation'] = {60, 36},
|
||||
-- [[ 34 / 35 Unknown ]]
|
||||
['energywall'] = {84, 33},
|
||||
['poisonwall'] = {68, 32},
|
||||
['antidote'] = {10, 31},
|
||||
['destroyfield'] = {87, 30},
|
||||
['curepoison'] = {10, 29},
|
||||
['firewall'] = {80, 28},
|
||||
['energyfield'] = {85, 27},
|
||||
['poisonfield'] = {69, 26},
|
||||
['firefield'] = {81, 25},
|
||||
['hellscore'] = {49, 24},
|
||||
['greatenergybeam'] = {42, 23},
|
||||
['energybeam'] = {41, 22},
|
||||
['suddendeath'] = {64, 21},
|
||||
['findperson'] = {114, 20},
|
||||
['firewave'] = {44, 19},
|
||||
['explosion'] = {83, 18},
|
||||
['firebomb'] = {82, 17},
|
||||
['greatfireball'] = {78, 16},
|
||||
['fireball'] = {79, 15},
|
||||
['chameleon'] = {91, 14},
|
||||
['energywave'] = {43, 13},
|
||||
['convincecreature'] = {90, 12},
|
||||
['greatlight'] = {116, 11},
|
||||
['light'] = {117, 10},
|
||||
['summoncreature'] = {118, 9},
|
||||
['heavymagicmissile'] = {77, 8},
|
||||
['lightmagicmissile'] = {73, 7},
|
||||
['haste'] = {101, 6},
|
||||
['ultimatehealingrune'] = {62, 5},
|
||||
['intensehealingrune'] = {74, 4},
|
||||
['ultimatehealing'] = {1, 3},
|
||||
['intensehealing'] = {7, 2},
|
||||
['lighthealing'] = {6, 1}
|
||||
['salvation'] = {60, 36},
|
||||
-- [[ 34 / 35 Unknown ]]
|
||||
['energywall'] = {84, 33},
|
||||
['poisonwall'] = {68, 32},
|
||||
['antidote'] = {10, 31},
|
||||
['destroyfield'] = {87, 30},
|
||||
['curepoison'] = {10, 29},
|
||||
['firewall'] = {80, 28},
|
||||
['energyfield'] = {85, 27},
|
||||
['poisonfield'] = {69, 26},
|
||||
['firefield'] = {81, 25},
|
||||
['hellscore'] = {49, 24},
|
||||
['greatenergybeam'] = {42, 23},
|
||||
['energybeam'] = {41, 22},
|
||||
['suddendeath'] = {64, 21},
|
||||
['findperson'] = {114, 20},
|
||||
['firewave'] = {44, 19},
|
||||
['explosion'] = {83, 18},
|
||||
['firebomb'] = {82, 17},
|
||||
['greatfireball'] = {78, 16},
|
||||
['fireball'] = {79, 15},
|
||||
['chameleon'] = {91, 14},
|
||||
['energywave'] = {43, 13},
|
||||
['convincecreature'] = {90, 12},
|
||||
['greatlight'] = {116, 11},
|
||||
['light'] = {117, 10},
|
||||
['summoncreature'] = {118, 9},
|
||||
['heavymagicmissile'] = {77, 8},
|
||||
['lightmagicmissile'] = {73, 7},
|
||||
['haste'] = {101, 6},
|
||||
['ultimatehealingrune'] = {62, 5},
|
||||
['intensehealingrune'] = {74, 4},
|
||||
['ultimatehealing'] = {1, 3},
|
||||
['intensehealing'] = {7, 2},
|
||||
['lighthealing'] = {6, 1}
|
||||
}
|
||||
|
||||
VocationNames = {
|
||||
|
||||
@@ -43,17 +43,17 @@ end
|
||||
|
||||
function UICreatureButton:setup(creature)
|
||||
self.creature = creature
|
||||
|
||||
|
||||
local creatureWidget = self:getChildById('creature')
|
||||
local labelWidget = self:getChildById('label')
|
||||
local lifeBarWidget = self:getChildById('lifeBar')
|
||||
|
||||
|
||||
labelWidget:setText(creature:getName())
|
||||
creatureWidget:setCreature(creature)
|
||||
|
||||
|
||||
self:setId('CreatureButton_' .. creature:getName():gsub('%s','_'))
|
||||
self:setLifeBarPercent(creature:getHealthPercent())
|
||||
|
||||
|
||||
self:updateSkull(creature:getSkull())
|
||||
self:updateEmblem(creature:getEmblem())
|
||||
end
|
||||
|
||||
@@ -273,18 +273,18 @@ function UIMinimap:createFlagWindow(pos)
|
||||
|
||||
flagRadioGroup:selectWidget(flagRadioGroup:getFirstWidget())
|
||||
|
||||
local successFunc = function()
|
||||
local successFunc = function()
|
||||
self:addFlag(pos, flagRadioGroup:getSelectedWidget().icon, description:getText())
|
||||
self:destroyFlagWindow()
|
||||
end
|
||||
|
||||
local cancelFunc = function()
|
||||
self:destroyFlagWindow()
|
||||
|
||||
local cancelFunc = function()
|
||||
self:destroyFlagWindow()
|
||||
end
|
||||
|
||||
|
||||
okButton.onClick = successFunc
|
||||
cancelButton.onClick = cancelFunc
|
||||
|
||||
|
||||
self.flagWindow.onEnter = successFunc
|
||||
self.flagWindow.onEscape = cancelFunc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user