forked from opentibiabr/canary
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Some fixes events, configkey, optional stages, xp gain rate
- Loading branch information
Showing
19 changed files
with
332 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| local skills = { | ||
| [32384] = {id=SKILL_SWORD,voc=4}, -- KNIGHT | ||
| [32385] = {id=SKILL_AXE,voc=4}, -- KNIGHT | ||
| [32386] = {id=SKILL_CLUB,voc=4}, -- KNIGHT | ||
| [32387] = {id=SKILL_DISTANCE,voc=3,range=CONST_ANI_SIMPLEARROW}, -- PALADIN | ||
| [32388] = {id=SKILL_MAGLEVEL,voc=2,range=CONST_ANI_SMALLICE}, -- DRUID | ||
| [32389] = {id=SKILL_MAGLEVEL,voc=1,range=CONST_ANI_FIRE}, -- SORCERER | ||
| [32124] = {id=SKILL_SWORD,voc=4}, -- KNIGHT | ||
| [32125] = {id=SKILL_AXE,voc=4}, -- KNIGHT | ||
| [32126] = {id=SKILL_CLUB,voc=4}, -- KNIGHT | ||
| [32127] = {id=SKILL_DISTANCE,voc=3,range=CONST_ANI_SIMPLEARROW}, -- PALADIN | ||
| [32128] = {id=SKILL_MAGLEVEL,voc=2,range=CONST_ANI_SMALLICE}, -- DRUID | ||
| [32129] = {id=SKILL_MAGLEVEL,voc=1,range=CONST_ANI_FIRE}, -- SORCERER | ||
| [40114] = {id=SKILL_SWORD,voc=4}, -- KNIGHT | ||
| [40115] = {id=SKILL_AXE,voc=4}, -- KNIGHT | ||
| [40116] = {id=SKILL_CLUB,voc=4}, -- KNIGHT | ||
| [40117] = {id=SKILL_DISTANCE,voc=3,range=CONST_ANI_SIMPLEARROW}, -- PALADIN | ||
| [40118] = {id=SKILL_MAGLEVEL,voc=2,range=CONST_ANI_SMALLICE}, -- DRUID | ||
| [40119] = {id=SKILL_MAGLEVEL,voc=1,range=CONST_ANI_FIRE}, -- SORCERER | ||
| [40120] = {id=SKILL_SWORD,voc=4}, -- KNIGHT | ||
| [40121] = {id=SKILL_AXE,voc=4}, -- KNIGHT | ||
| [40122] = {id=SKILL_CLUB,voc=4}, -- KNIGHT | ||
| [40123] = {id=SKILL_DISTANCE,voc=3,range=CONST_ANI_SIMPLEARROW}, -- PALADIN | ||
| [40124] = {id=SKILL_MAGLEVEL,voc=2,range=CONST_ANI_SMALLICE}, -- DRUID | ||
| [40125] = {id=SKILL_MAGLEVEL,voc=1,range=CONST_ANI_FIRE} -- SORCERER | ||
| } | ||
|
|
||
| local houseDummies = {32143, 32144, 32145, 32146, 32147, 32148} | ||
| local freeDummies = {32142, 32149} | ||
|
|
||
| local function removeExerciseWeapon(player, exercise) | ||
| exercise:remove(1) | ||
| player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Your training weapon vanished.") | ||
| stopEvent(training) | ||
| player:setStorageValue(Storage.isTraining,0) | ||
| player:setTraining(false) | ||
| end | ||
|
|
||
| local function startTraining(playerId, startPosition, itemid, tilePosition, bonusDummy, dummyId) | ||
| local player = Player(playerId) | ||
| if player ~= nil then | ||
| if Tile(tilePosition):getItemById(dummyId) then | ||
| local playerPosition = player:getPosition() | ||
| if startPosition:getDistance(playerPosition) == 0 and getTilePzInfo(playerPosition) then | ||
| if player:getItemCount(itemid) >= 1 then | ||
| local exercise = player:getItemById(itemid,true) | ||
| if exercise:isItem() then | ||
| if exercise:hasAttribute(ITEM_ATTRIBUTE_CHARGES) then | ||
| local charges_n = exercise:getAttribute(ITEM_ATTRIBUTE_CHARGES) | ||
| if charges_n >= 1 then | ||
| exercise:setAttribute(ITEM_ATTRIBUTE_CHARGES,(charges_n-1)) | ||
|
|
||
| local voc = player:getVocation() | ||
|
|
||
| if skills[itemid].id == SKILL_MAGLEVEL then | ||
| local magicRate = getRateFromTable(magicLevelStages, player:getBaseMagicLevel(), configManager.getNumber(configKeys.RATE_MAGIC)) | ||
| if not bonusDummy then | ||
| player:addManaSpent(math.ceil(500*magicRate)) | ||
| else | ||
| player:addManaSpent(math.ceil(500*magicRate)*1.1) -- 10% | ||
| end | ||
| else | ||
| local skillRate = getRateFromTable(skillsStages, player:getSkillLevel(skills[itemid].id), configManager.getNumber(configKeys.RATE_SKILL)) | ||
| if not bonusDummy then | ||
| player:addSkillTries(skills[itemid].id, 7*skillRate) | ||
| else | ||
| player:addSkillTries(skills[itemid].id, (7*skillRate)*1.1) -- 10% | ||
| end | ||
| end | ||
| tilePosition:sendMagicEffect(CONST_ME_HITAREA) | ||
| if skills[itemid].range then | ||
| playerPosition:sendDistanceEffect(tilePosition, skills[itemid].range) | ||
| end | ||
| if exercise:getAttribute(ITEM_ATTRIBUTE_CHARGES) == 0 then | ||
| removeExerciseWeapon(player, exercise) | ||
| else | ||
| local training = addEvent(startTraining, voc:getAttackSpeed(), playerId,startPosition,itemid,tilePosition,bonusDummy,dummyId) | ||
| player:setStorageValue(Storage.isTraining,1) | ||
| player:setTraining(true) | ||
| end | ||
| else | ||
| removeExerciseWeapon(player, exercise) | ||
| end | ||
| end | ||
| end | ||
| end | ||
| else | ||
| player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Your training has stopped.") | ||
| stopEvent(training) | ||
| player:setStorageValue(Storage.isTraining,0) | ||
| player:setTraining(false) | ||
| end | ||
| else | ||
| stopEvent(training) | ||
| player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Your training has stopped.") | ||
| player:setStorageValue(Storage.isTraining, 0) | ||
| player:setTraining(false) | ||
| end | ||
| else | ||
| stopEvent(training) | ||
| if player then | ||
| player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Your training has stopped.") | ||
| player:setStorageValue(Storage.isTraining,0) | ||
| player:setTraining(false) | ||
| end | ||
| end | ||
| return true | ||
| end | ||
|
|
||
| local exerciseTraining = Action() | ||
|
|
||
| function exerciseTraining.onUse(player, item, fromPosition, target, toPosition, isHotkey) | ||
| local startPos = player:getPosition() | ||
| if player:getStorageValue(Storage.isTraining) == 1 then | ||
| player:sendTextMessage(MESSAGE_FAILURE, "You are already training.") | ||
| return false | ||
| end | ||
| if target:isItem() then | ||
| if isInArray(houseDummies,target:getId()) then | ||
| if not skills[item.itemid].range and (startPos:getDistance(target:getPosition()) > 1) then | ||
| player:sendTextMessage(MESSAGE_FAILURE, "Get closer to the dummy.") | ||
| stopEvent(training) | ||
| return true | ||
| end | ||
| player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You started training.") | ||
| startTraining(player:getId(),startPos,item.itemid,target:getPosition(), true, target:getId()) | ||
| elseif isInArray(freeDummies, target:getId()) then | ||
| if not skills[item.itemid].range and (startPos:getDistance(target:getPosition()) > 1) then | ||
| player:sendTextMessage(MESSAGE_FAILURE, "Get closer to the dummy.") | ||
| stopEvent(training) | ||
| return true | ||
| end | ||
| player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You started training.") | ||
| startTraining(player:getId(),startPos,item.itemid,target:getPosition(), false, target:getId()) | ||
| end | ||
| end | ||
| return true | ||
| end | ||
|
|
||
| for id = 32124, 32126 do | ||
| exerciseTraining:id(id) | ||
| end | ||
|
|
||
| for id = 32127, 32129 do | ||
| exerciseTraining:id(id) | ||
| exerciseTraining:allowFarUse(true) | ||
| end | ||
|
|
||
| for id = 32384, 32386 do | ||
| exerciseTraining:id(id) | ||
| end | ||
|
|
||
| for id = 32387, 32389 do | ||
| exerciseTraining:id(id) | ||
| exerciseTraining:allowFarUse(true) | ||
| end | ||
|
|
||
| for id = 40114, 40116 do | ||
| exerciseTraining:id(id) | ||
| end | ||
|
|
||
| for id = 40117, 40119 do | ||
| exerciseTraining:id(id) | ||
| exerciseTraining:allowFarUse(true) | ||
| end | ||
|
|
||
| for id = 40120, 40122 do | ||
| exerciseTraining:id(id) | ||
| end | ||
|
|
||
| for id = 40123, 40125 do | ||
| exerciseTraining:id(id) | ||
| exerciseTraining:allowFarUse(true) | ||
| end | ||
|
|
||
| exerciseTraining:register() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| local advanceSave = CreatureEvent("AdvanceSave") | ||
|
|
||
| function advanceSave.onAdvance(player, skill, oldLevel, newLevel) | ||
| if skill ~= SKILL_LEVEL or newLevel <= oldLevel then | ||
| return true | ||
| end | ||
|
|
||
| player:save() | ||
|
|
||
| if Game.getStorageValue(GlobalStorage.XpDisplayMode) > 0 then | ||
| local baseRate = getRateFromTable(experienceStages, player:getLevel(), configManager.getNumber(configKeys.RATE_EXP)) | ||
|
|
||
| -- Event scheduler | ||
| if SCHEDULE_EXP_RATE ~= 100 then | ||
| baseRate = math.max(0, (baseRate * SCHEDULE_EXP_RATE)/100) | ||
| end | ||
|
|
||
| player:setBaseXpGain(baseRate * 100) | ||
| end | ||
| return true | ||
| end | ||
|
|
||
| advanceSave:register() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.