Index: scripts/globals/fieldsofvalor.lua =================================================================== --- scripts/globals/fieldsofvalor.lua (revision 1908) +++ scripts/globals/fieldsofvalor.lua (working copy) @@ -528,12 +528,12 @@ newreward = getRegimeReward(rid); reward = killer:checkExpPoints(mob, newreward); tabs = killer:getVar("tabs"); - tabs = tabs+math.floor((reward/10)); + tabs = tabs+(math.floor((reward/10))*TABS_RATE); killer:setVar("tabs",tabs); - killer:messageBasic(FOV_MSG_GET_TABS,math.floor((reward/10)),tabs); + killer:messageBasic(FOV_MSG_GET_TABS,math.floor((reward/10))*EXP_RATE,tabs*TABS_RATE); killer:addGil(reward); --TODO: display msgs (based on zone annoyingly, so will need killer:getZone() then a lookup) - killer:addExp(reward); + killer:addExp(reward*EXP_RATE); if (k1 ~= 0) then killer:setVar("fov_numkilled1",0); end if (k2 ~= 0) then killer:setVar("fov_numkilled2",0); end if (k3 ~= 0) then killer:setVar("fov_numkilled3",0); end Index: scripts/globals/server.lua =================================================================== --- scripts/globals/server.lua (revision 1908) +++ scripts/globals/server.lua (working copy) @@ -31,8 +31,10 @@ function CharCreate(player) + local race = player:getRace(); + -- ADD RACE SPECIFIC STARTGEAR - switch(player:getRace()) : caseof + switch(race) : caseof { -- HUME MALE [1] = function (x) @@ -145,7 +147,7 @@ { -- SANDY CITIZEN [0x00] = function (x) - if ((player:getRace() == 0x03) or (player:getRace() == 0x04)) + if ((race == 0x03) or (race == 0x04)) then player:addItem(0x34B7); end; player:addKeyItem(0x181); @@ -153,7 +155,7 @@ -- BASTOK CITIZEN [0x01] = function (x) - if (((player:getRace() == 0x01) or (player:getRace() == 0x02) or (player:getRace() == 0x08))) + if (((race == 0x01) or (race == 0x02) or (race == 0x08))) then player:addItem(0x34B9); end; player:addKeyItem(0x182); @@ -161,7 +163,7 @@ -- WINDY CITIZEN [0x02] = function(x) - if (((player:getRace() == 0x05) or (player:getRace() == 0x06) or (player:getRace() == 0x07))) + if (((race == 0x05) or (race == 0x06) or (race == 0x07))) then player:addItem(0x34B8); end; player:addKeyItem(0x183); @@ -169,14 +171,132 @@ default = function (x) end, } - + + -- Add all maps + if (ALL_MAPS == 1) then + -- MAIN NATIONS SANDY BASTOK WINDURST JEUNO + player:addKeyItem(385); + player:addKeyItem(386); + player:addKeyItem(387); + player:addKeyItem(388); + -- ITEMS 389 to 447 + local z = 389; + while z <= 447 do + player:addKeyItem(z); + z = z + 1; + end + -- KEY ITEMS 1856 to 1893 + local z = 1856; + while z <= 1893 do + player:addKeyItem(z); + z = z + 1; + end + end + + -- Swimsuit 1 + if (JINX_MODE_2005 == 1) then + if (race < 6) then + player:addItem(14449 + race); + player:addItem(15407 + race); + elseif (race == 6) then -- For some reason, TTF isn't grouped with the others + player:addItem(14471); + player:addItem(15423); + else -- -1 to account for TTF missing. + player:addItem(14448 + race); + player:addItem(15406 + race); + end + end + + -- Swimsuit 2 + if (JINX_MODE_2008 == 1) then + player:addItem(11264 + race); + player:addItem(16320 + race); + end + + -- Swimsuit 3 + if (JINX_MODE_2012 == 1) then + player:addItem(10255 + race); + player:addItem(10329 + race); + end + + -- Summerfest 2004 + if (SUMMERFEST_2004 == 1) then + if ((race == 0x01) or (race == 0x03) or (race == 0x05) or (race == 0x08)) then + player:addItem(13819); + elseif ((race == 0x02) or (race == 0x04) or (race == 0x06) or (race == 0x07)) then + player:addItem(13820); + end + end + + -- Sunbreeze 2009 + if (SUNBREEZE_2009 == 1) then + if ((race == 0x01) or (race == 0x03) or (race == 0x05) or (race == 0x08)) then + player:addItem(11316); + elseif ((race == 0x02) or (race == 0x04) or (race == 0x06) or (race == 0x07)) then + player:addItem(11317); + end + end + + -- Sunbreeze 2011 + if (SUNBREEZE_2011 == 1) then + if ((race == 0x01) or (race == 0x03) or (race == 0x05) or (race == 0x08)) then + player:addItem(11861); + elseif ((race == 0x02) or (race == 0x04) or (race == 0x06) or (race == 0x07)) then + player:addItem(11862); + end + end + + -- Dream Set + if (CHRISTMAS == 1) then + player:addItem(15178); + player:addItem(14519); + if ((race == 0x01) or (race == 0x03) or (race == 0x05) or (race == 0x08)) then + player:addItem(11965); + elseif ((race == 0x02) or (race == 0x04) or (race == 0x06) or (race == 0x07)) then + player:addItem(11967); + end + player:addItem(15752); + end + + -- Halloween + if (HALLOWEEN == 1) then + player:addItem(13916); + player:addItem(17565); + player:addItem(18102); + player:addItem(16075); + player:addItem(11300); + end + + -- Unlock Subjob if quest level = 0 + if (SUBJOB_QUEST_LEVEL == 0) then + player:unlockJob(0); + end + + -- Unlock advanced jobs if quest level = 0 + if (ADVANCED_JOB_LEVEL == 0) then + local z = 7; + while z <= 20 do + player:unlockJob(z); + z = z + 1; + end + end + + if (INITIAL_LEVEL_CAP ~= 50) then + player:levelCap(INITIAL_LEVEL_CAP) + end + + if (START_INVENTORY > 30) then + player:changeContainerSize(0,(START_INVENTORY - 30)) + player:changeContainerSize(5,(START_INVENTORY - 30)) + end + -- SET START GIL player:setGil(START_GIL); -- ADD ADVENTURER COUPON player:addItem(0x218); - --SET TITLE + -- SET TITLE player:addTitle(NEW_ADVENTURER); end; Index: scripts/globals/settings.lua =================================================================== --- scripts/globals/settings.lua (revision 1908) +++ scripts/globals/settings.lua (working copy) @@ -18,13 +18,15 @@ --See chocoprice.lua to adjust chocobo stables. --require("scripts/globals/chocoprice"); +-- CHARACTER CONFIG INITIAL_LEVEL_CAP = 50; --The initial level cap for new players. There seems to be a hardcap of 255. -MAX_LEVEL = 75; -- Level max of the server +MAX_LEVEL = 75; -- Level max of the server, works by disabling Maat quests. START_GIL = 10; --Amount of gil given to newly created characters. -START_INVENTORY = 30; --Amount of EXTRA slots beyond 30 to be given to a character. Do not set above 80! +START_INVENTORY = 30; --Starting inventory and satchel size. Ignores values < 30. Do not set above 80! OPENING_CUTSCENE_ENABLE = 0; --Set to 1 to enable opening cutscenes, 0 to disable. SUBJOB_QUEST_LEVEL = 18; --Minimum level to accept either subjob quest. Set to 0 to start the game with subjobs unlocked. ADVANCED_JOB_LEVEL = 30; --Minimum level to accept advanced job quests. Set to 0 to start the game with advanced jobs. +ALL_MAPS = 0; -- Set to 1 to give starting characters all the maps. SHOP_PRICE = 1.000; --Multiplies prices in NPC shops. GIL_RATE = 1.000; --Multiplies gil earned from quests. Won't always display in game. @@ -76,14 +78,7 @@ RELIC_2ND_UPGRADE_WAIT_TIME = 100; -- wait time for 2nd relic upgrade (stage 2 -> stage 3) in seconds. 604800s = 1 RL week. RELIC_3RD_UPGRADE_WAIT_TIME = 100; -- wait time for 3rd relic upgrade (stage 3 -> stage 4) in seconds. 295200s = 82 hours. -ALL_MAPS = 0; --Set to 1 to give starting characters all the maps. -JINX_MODE_2005 = 0; --Set to 1 to give starting characters swimsuits from 2005. -JINX_MODE_2008 = 0; --Set to 1 to give starting characters swimsuits from 2008. -SUMMERFEST = 0; --Set to 1 to give starting characters Far East dress. -CHRISTMAS = 0; --Set to 1 to give starting characters Christmas dress. -HALLOWEEN = 0; --Set to 1 to give starting characters Halloween dress. - ---QUEST/MISSION SPECIFIC SETTINGS +-- QUEST/MISSION SPECIFIC SETTINGS WSNM_LEVEL = 70; -- Min Level to get WSNM Quests WSNM_SKILL_LEVEL = 240; AF1_QUEST_LEVEL = 40; -- Minimum level to start AF1 quest @@ -91,21 +86,22 @@ AF1_FAME = 20; -- base fame for completing an AF1 quest AF2_FAME = 40; -- base fame for completing an AF2 quest AF3_FAME = 60; -- base fame for completing an AF3 quest -DEBUG_MODE = 1; -- Set to 1 to activate auto-warping to the next location (only supported by certain missions / quests). +DEBUG_MODE = 0; -- Set to 1 to activate auto-warping to the next location (only supported by certain missions / quests). QM_RESET_TIME = 300; -- Default time (in seconds) you have from killing ???-pop mission NMs to click again and get key item, until ??? resets. ---FIELDS OF VALOR SETTINGS +-- FIELDS OF VALOR SETTINGS REGIME_WAIT = 1; --Make people wait till 00:00 game time as in retail. If it's 0, there is no wait time. +FIELD_MANUALS = 1; -- Enables Fields of Valor manuals LOW_LEVEL_REGIME = 0; --Allow people to kill regime targets even if they give no exp, allowing people to farm regime targets at 75 in low level areas. ---JOB ABILITY/TRAIT SPECIFIC SETTINGS +-- JOB ABILITY/TRAIT SPECIFIC SETTINGS SCAVENGE_RATE = 0.1; --The chance of obtaining an item when you use the Ranger job ability Scavenge. Do not set above 1! STATUS_RESIST_MULTIPLIER = 10; -- Sets the strength of status resist traits. -CIRCLE_DURATION = 600; -- Sets the duration of circle effects, in seconds. Retail is 60 seconds. +CIRCLE_DURATION = 300; -- Sets the duration of circle effects, in seconds. Retail is 5 minutes. CIRCLE_KILLER_EFFECT = 20; -- Intimidation percentage granted by circle effects. (made up number) KILLER_EFFECT = 10; -- Intimidation percentage from killer job traits. ---SPELL SPECIFIC SETTINGS +-- SPELL SPECIFIC SETTINGS MILK_OVERWRITE = 1; --Set to 1 to allow Milk and Regen to overwrite each other. Default is 1. JUICE_OVERWRITE = 1; --Set to 1 to allow Juice and Refresh to overwrite each other. Default is 1. DIA_OVERWRITE = 1; --Set to 1 to allow Bio to overwrite same tier Dia. Default is 1. @@ -127,12 +123,19 @@ ABSORB_SPELL_TICK = 9; -- duration of 1 absorb spell tick SNEAK_INVIS_DURATION_MULTIPLIER = 1; -- multiplies duration of sneak,invis,deodorize to reduce player torture. 1 = retail behavior. MUST BE INTEGER. ---CELEBRATIONS -EXPLORER_MOOGLE = 1; +-- CELEBRATIONS +EXPLORER_MOOGLE = 1; -- Enables Explorer Moogle teleports EXPLORER_MOOGLE_LEVELCAP = 10; +JINX_MODE_2005 = 0; -- Set to 1 to give starting characters swimsuits from 2005. Ex: Hume Top +JINX_MODE_2008 = 0; -- Set to 1 to give starting characters swimsuits from 2008. Ex: Custom Top +JINX_MODE_2012 = 0; -- Set to 1 to give starting characters swimsuits from 2012. Ex: Marine Top +SUMMERFEST_2004 = 0; -- Set to 1 to give starting characters Far East dress from 2004. Ex: Onoko Yukata +SUNBREEZE_2009 = 0; -- Set to 1 to give starting characters Far East dress from 2009. Ex: Otokogusa Yukata +SUNBREEZE_2011 = 0; -- Set to 1 to give starting characters Far East dress from 2011. Ex: Hikogami Yukata +CHRISTMAS = 0; -- Set to 1 to give starting characters Christmas dress. +HALLOWEEN = 0; -- Set to 1 to give starting characters Halloween items. --MISC -FIELD_MANUALS = 1; HOMEPOINT_HEAL = 0; --Set to 1 if you want Home Points to heal you like in single-player Final Fantasy games. RIVERNE_PORTERS = 120; -- Time in seconds that Unstable Displacements in Cape Riverne stay open after trading a scale. -LANTERNS_STAY_LIT = 1200; -- time in seconds that lanterns in the Den of Rancor stay lit. \ No newline at end of file +LANTERNS_STAY_LIT = 1200; -- time in seconds that lanterns in the Den of Rancor stay lit. Index: scripts/globals/teleports.lua =================================================================== --- scripts/globals/teleports.lua (revision 1908) +++ scripts/globals/teleports.lua (working copy) @@ -365,4 +365,16 @@ function toRuLudeGardens(player) player:setPos(0.000, 9.000, -38.670, -67, 243); +end; + +----------------------------------- +-- debugTeleport +----------------------------------- +function debugTeleport(player,npcid) + if (DEBUG_MODE == 1) then + local npc = GetNPCByID(npcid); + if (npc ~= nil) then + player:setPos(npc:getXPos(), npc:getYPos(), npc:getZPos(), 0, npc:getZone()); + end + end end; \ No newline at end of file Index: scripts/zones/Bastok_Mines/npcs/Gumbah.lua =================================================================== --- scripts/zones/Bastok_Mines/npcs/Gumbah.lua (revision 1908) +++ scripts/zones/Bastok_Mines/npcs/Gumbah.lua (working copy) @@ -9,6 +9,7 @@ require("scripts/globals/settings"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Bastok_Mines/TextIDs"); ----------------------------------- @@ -26,7 +27,7 @@ local bladeDarkness = player:getQuestStatus(BASTOK, BLADE_OF_DARKNESS); - if (player:getMainLvl() >= ADVANCED_JOB_LEVEL and bladeDarkness == QUEST_AVAILABLE) then + if (player:getMainLvl() >= ADVANCED_JOB_LEVEL and bladeDarkness == QUEST_AVAILABLE) then --DARK KNIGHT QUEST player:startEvent(0x0063); elseif(bladeDarkness == QUEST_COMPLETED and player:getQuestStatus(BASTOK,BLADE_OF_DEATH) == QUEST_AVAILABLE) then @@ -56,6 +57,7 @@ if (csid == 0x0063) then player:addQuest(BASTOK, BLADE_OF_DARKNESS); + debugTeleport(player,17363328); -- _3z2 elseif (csid == 0x0082) then player:addQuest(BASTOK, BLADE_OF_DEATH); player:addKeyItem(LETTER_FROM_ZEID); Index: scripts/zones/Bostaunieux_Oubliette/npcs/Novalmauge.lua =================================================================== --- scripts/zones/Bostaunieux_Oubliette/npcs/Novalmauge.lua (revision 1908) +++ scripts/zones/Bostaunieux_Oubliette/npcs/Novalmauge.lua (working copy) @@ -14,6 +14,7 @@ require("scripts/globals/keyitems"); require("scripts/globals/shop"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Bostaunieux_Oubliette/TextIDs"); ----------------------------------- @@ -29,7 +30,7 @@ end if(player:getQuestStatus(SANDORIA,THE_RUMOR) == QUEST_ACCEPTED) then count = trade:getItemCount(); - BeastBlood = trade:hasItemQty(930,1) + local BeastBlood = trade:hasItemQty(930,1) if(BeastBlood == true and count == 1) then player:startEvent(0x000c); end @@ -42,10 +43,10 @@ function onTrigger(player,npc) - troubleAtTheSluice = player:getQuestStatus(SANDORIA,TROUBLE_AT_THE_SLUICE); - TheHolyCrest = player:getVar("TheHolyCrest_Event"); - tatsVar = player:getVar("troubleAtTheSluiceVar"); - theRumor = player:getQuestStatus(SANDORIA,THE_RUMOR); + local troubleAtTheSluice = player:getQuestStatus(SANDORIA,TROUBLE_AT_THE_SLUICE); + local TheHolyCrest = player:getVar("TheHolyCrest_Event"); + local tatsVar = player:getVar("troubleAtTheSluiceVar"); + local theRumor = player:getQuestStatus(SANDORIA,THE_RUMOR); -- The Holy Crest Quest if(TheHolyCrest == 1) then @@ -89,6 +90,7 @@ if(csid == 0x0006) then player:setVar("TheHolyCrest_Event",2); + debugTeleport(player,17723419); -- Morjean, zone 231, 98 x elseif(csid == 0x0011) then player:tradeComplete(); player:addKeyItem(NEUTRALIZER); Index: scripts/zones/Buburimu_Peninsula/npcs/Song_Runes.lua =================================================================== --- scripts/zones/Buburimu_Peninsula/npcs/Song_Runes.lua (revision 1908) +++ scripts/zones/Buburimu_Peninsula/npcs/Song_Runes.lua (working copy) @@ -9,6 +9,7 @@ require("scripts/globals/settings"); require("scripts/globals/titles"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Buburimu_Peninsula/TextIDs"); ----------------------------------- @@ -18,10 +19,7 @@ function onTrade(player,npc,trade) if (player:getVar("TheOldMonument_Event") == 3) then - count = trade:getItemCount(); - gil = trade:getGil(); - - if (trade:hasItemQty(917,1) == true and count == 1 and gil == 0) then + if (trade:hasItemQty(917,1) == true and trade:getItemCount() == 1 and trade:getGil() == 0) then player:tradeComplete(); player:completeQuest(JEUNO,THE_OLD_MONUMENT); player:addItem(634,1); Index: scripts/zones/Chateau_dOraguille/npcs/Rahal.lua =================================================================== --- scripts/zones/Chateau_dOraguille/npcs/Rahal.lua (revision 1908) +++ scripts/zones/Chateau_dOraguille/npcs/Rahal.lua (working copy) @@ -9,6 +9,7 @@ ----------------------------------- require("scripts/globals/keyitems"); +require("scripts/globals/teleports"); require("scripts/zones/Chateau_dOraguille/TextIDs"); ----------------------------------- @@ -50,6 +51,7 @@ if (csid == 0x003c) then player:addKeyItem(DRAGON_CURSE_REMEDY); player:messageSpecial(KEYITEM_OBTAINED, DRAGON_CURSE_REMEDY); + debugTeleport(player,17350947); -- Hut_Door end end; \ No newline at end of file Index: scripts/zones/Davoi/npcs/Disused_Well.lua =================================================================== --- scripts/zones/Davoi/npcs/Disused_Well.lua (revision 1908) +++ scripts/zones/Davoi/npcs/Disused_Well.lua (working copy) @@ -9,6 +9,7 @@ ----------------------------------- require("scripts/globals/keyitems"); +require("scripts/globals/teleports"); require("scripts/zones/Davoi/TextIDs"); ----------------------------------- @@ -27,6 +28,7 @@ if (player:hasKeyItem(KNIGHTS_SOUL) == false and player:hasKeyItem(BOOK_OF_TASKS) and player:hasKeyItem(BOOK_OF_THE_WEST) and player:hasKeyItem(BOOK_OF_THE_EAST)) then player:addKeyItem(KNIGHTS_SOUL); player:messageSpecial(KEYITEM_OBTAINED, KNIGHTS_SOUL); + debugTeleport(player, 17719359); -- Balasiel, zone 230, -138 x else player:messageSpecial(YOU_SEE_NOTHING); end Index: scripts/zones/Konschtat_Highlands/npcs/qm2.lua =================================================================== --- scripts/zones/Konschtat_Highlands/npcs/qm2.lua (revision 1908) +++ scripts/zones/Konschtat_Highlands/npcs/qm2.lua (working copy) @@ -9,6 +9,7 @@ ----------------------------------- require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Konschtat_Highlands/TextIDs"); ----------------------------------- @@ -30,7 +31,11 @@ ----------------------------------- function onTrigger(player,npc) - player:messageSpecial(NOTHING_OUT_OF_ORDINARY); + if (player:hasItem(1152)) then + debugTeleport(player,17809421); -- Ranemaud + else + player:messageSpecial(NOTHING_OUT_OF_ORDINARY); + end end; ----------------------------------- Index: scripts/zones/Korroloka_Tunnel/npcs/qm2.lua =================================================================== --- scripts/zones/Korroloka_Tunnel/npcs/qm2.lua (revision 1908) +++ scripts/zones/Korroloka_Tunnel/npcs/qm2.lua (working copy) @@ -11,6 +11,7 @@ require("scripts/globals/settings"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Korroloka_Tunnel/TextIDs"); ----------------------------------- @@ -28,10 +29,10 @@ if(player:getQuestStatus(BASTOK,AYAME_AND_KAEDE) == QUEST_ACCEPTED) then if(player:getVar("AyameAndKaede_Event") == 2 and player:hasKeyItem(STRANGELY_SHAPED_CORAL) == false) then - leechesDespawned = (GetMobAction(17486187) == 0 and GetMobAction(17486188) == 0 and GetMobAction(17486189) == 0); - spawnTime = player:getVar("KorrolokaLeeches_Spawned"); - canSpawn = (leechesDespawned and (os.time() - spawnTime) > 30); - killedLeeches = player:getVar("KorrolokaLeeches"); + local leechesDespawned = (GetMobAction(17486187) == 0 and GetMobAction(17486188) == 0 and GetMobAction(17486189) == 0); + local spawnTime = player:getVar("KorrolokaLeeches_Spawned"); + local canSpawn = (leechesDespawned and (os.time() - spawnTime) > 30); + local killedLeeches = player:getVar("KorrolokaLeeches"); if(killedLeeches >= 1) then if((killedLeeches == 3 and (os.time() - player:getVar("KorrolokaLeeches_Timer") < 30)) or (killedLeeches < 3 and leechesDespawned and (os.time() - spawnTime) < 30)) then @@ -40,6 +41,7 @@ player:setVar("KorrolokaLeeches",0); player:setVar("KorrolokaLeeches_Spawned",0); player:setVar("KorrolokaLeeches_Timer",0); + debugTeleport(player,17743909); -- Ensetsu, zone 236 elseif(leechesDespawned) then SpawnMob(17486187,168):updateEnmity(player); -- Despawn after 3 minutes (-12 seconds for despawn delay). SpawnMob(17486188,168):updateEnmity(player); Index: scripts/zones/Lower_Jeuno/npcs/_6t2.lua =================================================================== --- scripts/zones/Lower_Jeuno/npcs/_6t2.lua (revision 1908) +++ scripts/zones/Lower_Jeuno/npcs/_6t2.lua (working copy) @@ -10,6 +10,7 @@ require("scripts/globals/settings"); require("scripts/globals/titles"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Lower_Jeuno/TextIDs"); ----------------------------------- @@ -25,23 +26,25 @@ function onTrigger(player,npc) - ChocobosWounds = player:getQuestStatus(JEUNO, CHOCOBO_S_WOUNDS) + local ChocobosWounds = player:getQuestStatus(JEUNO, CHOCOBO_S_WOUNDS) + local SaveMySon = player:getQuestStatus(JEUNO, SAVE_MY_SON) + local Level = player:getMainLvl(); if(ChocobosWounds == QUEST_AVAILABLE) then player:startEvent(0x0040); elseif(player:getVar("ChocobosWounds_Event") > 3) then player:startEvent(0x003f); - elseif(player:getQuestStatus(JEUNO, SAVE_MY_SON) == QUEST_AVAILABLE and ChocobosWounds == QUEST_COMPLETED) then + elseif(SaveMySon == QUEST_AVAILABLE and ChocobosWounds == QUEST_COMPLETED and Level >= ADVANCED_JOB_LEVEL) then player:startEvent(0x00a4); - elseif(player:getQuestStatus(JEUNO, SAVE_MY_SON) == QUEST_ACCEPTED) then - SaveMySon = player:getVar("SaveMySon_Event"); + elseif(SaveMySon == QUEST_ACCEPTED) then + local SaveMySonEvent = player:getVar("SaveMySon_Event"); - if(SaveMySon == 0) then + if(SaveMySonEvent == 0) then player:startEvent(0x00e5); - elseif(SaveMySon == 1) then + elseif(SaveMySonEvent == 1) then player:startEvent(0x00a3); end - elseif(player:needToZone() == false and player:getQuestStatus(JEUNO, SAVE_MY_SON) == QUEST_COMPLETED) then + elseif(player:needToZone() == false and SaveMySon == QUEST_COMPLETED) then player:startEvent(0x0084); end @@ -68,6 +71,7 @@ if(csid == 0x00a4 and option == 0) then player:addQuest(JEUNO, SAVE_MY_SON); + debugTeleport(player,17293694); -- Nightflowers elseif(csid == 0x00a3) then if(player:getFreeSlotsCount(0) >= 1) then player:addTitle(LIFE_SAVER); Index: scripts/zones/Lower_Jeuno/npcs/Bki_Tbujhja.lua =================================================================== --- scripts/zones/Lower_Jeuno/npcs/Bki_Tbujhja.lua (revision 1908) +++ scripts/zones/Lower_Jeuno/npcs/Bki_Tbujhja.lua (working copy) @@ -13,6 +13,7 @@ require("scripts/globals/keyitems"); require("scripts/globals/shop"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Lower_Jeuno/TextIDs"); ----------------------------------- @@ -32,8 +33,8 @@ ----------------------------------- function onTrigger(player,npc) - PainfulMemory = player:getQuestStatus(JEUNO,PAINFUL_MEMORY); - TheRequiem = player:getQuestStatus(JEUNO,THE_REQUIEM); + local PainfulMemory = player:getQuestStatus(JEUNO,PAINFUL_MEMORY); + local TheRequiem = player:getQuestStatus(JEUNO,THE_REQUIEM); if(player:getVar("TheOldMonument_Event") == 1) then player:startEvent(0x00b5); -- For the quest "The Old Monument" @@ -79,9 +80,11 @@ --printf("RESULT: %u",option); if(csid == 0x00b5) then - player:setVar("TheOldMonument_Event",2); + player:setVar("TheOldMonument_Event",2); + debugTeleport(player,17261130); -- Song_Runes, zone 118 elseif(csid == 0x00b6 and option == 0) then player:setVar("PathOfTheBard_Event",1); + debugTeleport(player,17199689); -- Song_Runes, zone 103 elseif(csid == 0x0091 and option == 1 or csid == 0x0094 and option == 1) then player:addQuest(JEUNO,THE_REQUIEM); player:setVar("TheRequiemCS",2); Index: scripts/zones/Lower_Jeuno/npcs/Mertaire.lua =================================================================== --- scripts/zones/Lower_Jeuno/npcs/Mertaire.lua (revision 1908) +++ scripts/zones/Lower_Jeuno/npcs/Mertaire.lua (working copy) @@ -33,13 +33,15 @@ function onTrigger(player,npc) - painfulMemory = player:getQuestStatus(JEUNO,PAINFUL_MEMORY); + local painfulMemory = player:getQuestStatus(JEUNO,PAINFUL_MEMORY); + local job = player:getMainJob() + local level = player:getMainLvl() - if(player:getMainJob() ~= 10 and player:getMainLvl() >= 30) then + if(job ~= 10 and level >= ADVANCED_JOB_LEVEL) then if(player:getVar("TheOldMonument_Event") == 0 and player:getQuestStatus(JEUNO,THE_OLD_MONUMENT) == QUEST_AVAILABLE) then player:startEvent(0x0066); end - elseif(player:getMainJob() == 10 and player:getMainLvl() >= 40 and painfulMemory == QUEST_AVAILABLE) then + elseif(job == 10 and level >= AF1_QUEST_LEVEL and painfulMemory == QUEST_AVAILABLE) then if(player:getVar("PainfulMemoryCS") == 0) then player:startEvent(0x008a); -- Long dialog for "Painful Memory" else Index: scripts/zones/Maze_of_Shakhrami/npcs/Excavation_Point.lua =================================================================== --- scripts/zones/Maze_of_Shakhrami/npcs/Excavation_Point.lua (revision 1908) +++ scripts/zones/Maze_of_Shakhrami/npcs/Excavation_Point.lua (working copy) @@ -8,6 +8,7 @@ ----------------------------------- require("scripts/globals/excavation"); +require("scripts/globals/teleports"); require("scripts/zones/Maze_of_Shakhrami/TextIDs"); ----------------------------------- @@ -22,6 +23,7 @@ player:tradeComplete(); player:addItem(1159); player:messageSpecial(ITEM_OBTAINED, 1159); -- Wyvern Egg + debugTeleport(player,17723419); -- Morjean, zone 231, 98 x else player:messageSpecial(ITEM_CANNOT_BE_OBTAINED, 1159); -- Wyvern Egg end Index: scripts/zones/Meriphataud_Mountains/npcs/qm1.lua =================================================================== --- scripts/zones/Meriphataud_Mountains/npcs/qm1.lua (revision 1908) +++ scripts/zones/Meriphataud_Mountains/npcs/qm1.lua (working copy) @@ -7,6 +7,7 @@ ----------------------------------- package.loaded["scripts/zones/Meriphataud_Mountains/TextIDs"] = nil; +require("scripts/globals/teleports"); require("scripts/zones/Meriphataud_Mountains/TextIDs"); ----------------------------------- Index: scripts/zones/Norg/npcs/Aeka.lua =================================================================== --- scripts/zones/Norg/npcs/Aeka.lua (revision 1908) +++ scripts/zones/Norg/npcs/Aeka.lua (working copy) @@ -10,6 +10,7 @@ require("scripts/globals/settings"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Norg/TextIDs"); ----------------------------------- @@ -91,6 +92,7 @@ player:addItem(1151); player:messageSpecial(ITEM_OBTAINED, 1151); -- Oriental Steel player:setVar("ForgeYourDestiny_Event",questItem + 0x01); + debugTeleport(player,17220130); -- qm2, zone 108 else player:messageSpecial(ITEM_CANNOT_BE_OBTAINED, 1151); -- Oriental Steel end @@ -99,6 +101,7 @@ player:tradeComplete(); player:addItem(1151); player:messageSpecial(ITEM_OBTAINED, 1151); -- Oriental Steel + debugTeleport(player,17220130); -- qm2, zone 108 else player:messageSpecial(ITEM_CANNOT_BE_OBTAINED, 1151); -- Oriental Steel end Index: scripts/zones/Norg/npcs/Jaucribaix.lua =================================================================== --- scripts/zones/Norg/npcs/Jaucribaix.lua (revision 1908) +++ scripts/zones/Norg/npcs/Jaucribaix.lua (working copy) @@ -12,6 +12,7 @@ require("scripts/globals/titles"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Norg/TextIDs"); ----------------------------------- @@ -54,7 +55,7 @@ local mLvl = player:getMainLvl(); local mJob = player:getMainJob(); - if(player:getMainLvl() >= 30 and ForgeYourDestiny == QUEST_AVAILABLE) then + if(mLvl >= ADVANCED_JOB_LEVEL and ForgeYourDestiny == QUEST_AVAILABLE) then player:startEvent(0x0019,1153,1152); -- Sacred branch, Bomb Steel elseif(ForgeYourDestiny == QUEST_ACCEPTED) then local swordTimer = player:getVar("ForgeYourDestiny_timer"); @@ -152,6 +153,7 @@ if(csid == 0x0019 and option == 1) then player:addQuest(OUTLANDS,FORGE_YOUR_DESTINY); + debugTeleport(player, 17809427); -- Aeka elseif(csid == 0x001b) then player:tradeComplete(); player:setVar("ForgeYourDestiny_timer", os.time() + 10368); --Add 3 game days Index: scripts/zones/Norg/npcs/Ranemaud.lua =================================================================== --- scripts/zones/Norg/npcs/Ranemaud.lua (revision 1908) +++ scripts/zones/Norg/npcs/Ranemaud.lua (working copy) @@ -10,6 +10,7 @@ require("scripts/globals/settings"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/norg/TextIDs"); ----------------------------------- @@ -48,15 +49,13 @@ ----------------------------------- function onTrigger(player,npc) - swordTimer = player:getVar("ForgeYourDestiny_timer") + -- local swordTimer = player:getVar("ForgeYourDestiny_timer") - if(player:getQuestStatus(OUTLANDS,FORGE_YOUR_DESTINY) == QUEST_ACCEPTED and swordTimer == 0) then + if(player:getQuestStatus(OUTLANDS,FORGE_YOUR_DESTINY) == QUEST_ACCEPTED and player:getVar("ForgeYourDestiny_timer") == 0) then if(player:hasItem(1153)) then player:startEvent(0x0030,1153); -- Sacred Branch elseif(player:hasItem(1198) == false) then - questItem = player:getVar("ForgeYourDestiny_Event"); - checkItem = testflag(tonumber(questItem),0x02); - + local checkItem = testflag(tonumber(questItem),0x02); if(checkItem == false) then player:startEvent(0x0028,1153,1198); -- Sacred Branch, Sacred Sprig elseif(checkItem == true) then @@ -89,13 +88,14 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); - questItem = player:getVar("ForgeYourDestiny_Event"); + local questItem = player:getVar("ForgeYourDestiny_Event"); if(csid == 0x0028) then if(player:getFreeSlotsCount(0) >= 1) then player:addItem(1198); player:messageSpecial(ITEM_OBTAINED, 1198); -- Sacred Sprig player:setVar("ForgeYourDestiny_Event",questItem + 0x02); + debugTeleport(player,17273384); -- qm2, zone 121 else player:messageSpecial(ITEM_CANNOT_BE_OBTAINED, 1151); -- Oriental Steel end @@ -104,6 +104,7 @@ player:tradeComplete(); player:addItem(1198); player:messageSpecial(ITEM_OBTAINED, 1198); -- Sacred Sprig + debugTeleport(player,17273384); -- qm2, zone 121 else player:messageSpecial(ITEM_CANNOT_BE_OBTAINED, 1198); -- Sacred Sprig end Index: scripts/zones/Norg/npcs/Ryoma.lua =================================================================== --- scripts/zones/Norg/npcs/Ryoma.lua (revision 1908) +++ scripts/zones/Norg/npcs/Ryoma.lua (working copy) @@ -12,6 +12,7 @@ require("scripts/globals/keyitems"); require("scripts/globals/shop"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Norg/TextIDs"); ----------------------------------- @@ -82,6 +83,7 @@ player:messageSpecial(KEYITEM_OBTAINED, SEALED_DAGGER); player:delKeyItem(STRANGELY_SHAPED_CORAL); player:setVar("AyameAndKaede_Event", 4); + debugTeleport(player, 17743909); -- Ensetsu, zone 236 elseif(csid == 0x0085) then player:addQuest(OUTLANDS,TWENTY_IN_PIRATE_YEARS); player:setVar("twentyInPirateYearsCS",1); Index: scripts/zones/Northern_San_dOria/npcs/Morjean.lua =================================================================== --- scripts/zones/Northern_San_dOria/npcs/Morjean.lua (revision 1908) +++ scripts/zones/Northern_San_dOria/npcs/Morjean.lua (working copy) @@ -9,6 +9,7 @@ require("scripts/globals/settings"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Northern_San_dOria/TextIDs"); ----------------------------------- @@ -24,7 +25,7 @@ function onTrigger(player,npc) - TheHolyCrest = player:getVar("TheHolyCrest_Event"); + local TheHolyCrest = player:getVar("TheHolyCrest_Event"); if(TheHolyCrest == 2) then player:startEvent(0x0041); @@ -58,8 +59,12 @@ if(csid == 0x0041) then player:addQuest(SANDORIA,THE_HOLY_CREST); player:setVar("TheHolyCrest_Event",3); + if (DEBUG_MODE == 1) then + player:setPos(-362, -10, -179, 0, 198); -- Maze of Shakhrami, Tahrongi entrance + end elseif(csid == 0x003e and option == 0) then player:setVar("TheHolyCrest_Event",4); + debugTeleport(player,17265237); -- qm1, zone 119 end end; Index: scripts/zones/Ordelles_Caves/npcs/qm2.lua =================================================================== --- scripts/zones/Ordelles_Caves/npcs/qm2.lua (revision 1908) +++ scripts/zones/Ordelles_Caves/npcs/qm2.lua (working copy) @@ -11,6 +11,7 @@ require("scripts/globals/settings"); require("scripts/globals/keyItems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Ordelles_Caves/TextIDs"); ----------------------------------- Index: scripts/zones/Ordelles_Caves/npcs/qm3.lua =================================================================== --- scripts/zones/Ordelles_Caves/npcs/qm3.lua (revision 1908) +++ scripts/zones/Ordelles_Caves/npcs/qm3.lua (working copy) @@ -10,6 +10,7 @@ require("scripts/globals/settings"); require("scripts/globals/keyItems"); +require("scripts/globals/teleports"); require("scripts/zones/Ordelles_Caves/TextIDs"); ----------------------------------- @@ -24,13 +25,15 @@ ----------------------------------- function onTrigger(player,npc) + local HasDew = player:hasKeyItem(STALACTITE_DEW); - if(os.time() - player:getVar("SquiresTestII") <= 60 and player:hasKeyItem(STALACTITE_DEW) == false) then + if(os.time() - player:getVar("SquiresTestII") <= 60 and HasDew == false) then player:messageSpecial(A_SQUIRE_S_TEST_II_DIALOG_II); player:addKeyItem(STALACTITE_DEW); player:messageSpecial(KEYITEM_OBTAINED, STALACTITE_DEW); player:setVar("SquiresTestII",0); - elseif(player:hasKeyItem(STALACTITE_DEW))then + debugTeleport(player,17719359); -- Balasiel, zone 230, -138 x + elseif(HasDew)then player:messageSpecial(A_SQUIRE_S_TEST_II_DIALOG_III); else player:messageSpecial(NOTHING_OUT_OF_ORDINARY); Index: scripts/zones/Port_Bastok/npcs/Ensetsu.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Ensetsu.lua (revision 1908) +++ scripts/zones/Port_Bastok/npcs/Ensetsu.lua (working copy) @@ -12,6 +12,7 @@ require("scripts/globals/titles"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Port_Bastok/TextIDs"); ----------------------------------- @@ -27,11 +28,13 @@ function onTrigger(player,npc) - AyameAndKaede = player:getQuestStatus(BASTOK,AYAME_AND_KAEDE); + local AyameAndKaede = player:getQuestStatus(BASTOK,AYAME_AND_KAEDE); + local PirateYearsCS = player:getVar("twentyInPirateYearsCS"); + local BigBoxCS = player:getVar("illTakeTheBigBoxCS"); if(AyameAndKaede == QUEST_ACCEPTED) then - questStatus = player:getVar("AyameAndKaede_Event") + local questStatus = player:getVar("AyameAndKaede_Event") if((questStatus == 1 or questStatus == 2) and player:hasKeyItem(STRANGELY_SHAPED_CORAL) == false) then player:startEvent(0x00f2); @@ -44,13 +47,13 @@ end elseif(AyameAndKaede == QUEST_COMPLETED and player:getQuestStatus(OUTLANDS,TWENTY_IN_PIRATE_YEARS) == QUEST_AVAILABLE) then player:startEvent(0x00f7); - elseif(player:getVar("twentyInPirateYearsCS") == 2) then + elseif(PirateYearsCS == 2) then player:startEvent(0x0106); - elseif(player:getVar("twentyInPirateYearsCS") == 4) then + elseif(PirateYearsCS == 4) then player:startEvent(0x0107); - elseif(player:getQuestStatus(OUTLANDS,I_LL_TAKE_THE_BIG_BOX) == QUEST_ACCEPTED and player:getVar("illTakeTheBigBoxCS") == 0) then + elseif(player:getQuestStatus(OUTLANDS,I_LL_TAKE_THE_BIG_BOX) == QUEST_ACCEPTED and BigBoxCS == 0) then player:startEvent(0x0108); - elseif(player:getVar("illTakeTheBigBoxCS") == 1) then + elseif(BigBoxCS == 1) then player:startEvent(0x0109); else player:startEvent(0x001b); @@ -79,8 +82,10 @@ if(csid == 0x00f2) then player:setVar("AyameAndKaede_Event", 2); + debugTeleport(player,17486235); -- qm2, zone 173 elseif(csid == 0x00f5) then player:setVar("AyameAndKaede_Event", 3); + debugTeleport(player, 17809462); -- Ryoma, zone 252 elseif(csid == 0x00f6) then player:delKeyItem(SEALED_DAGGER); player:addTitle(SHADOW_WALKER); Index: scripts/zones/Port_Bastok/npcs/Kaede.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Kaede.lua (revision 1908) +++ scripts/zones/Port_Bastok/npcs/Kaede.lua (working copy) @@ -11,6 +11,7 @@ require("scripts/globals/settings"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Port_Bastok/TextIDs"); ----------------------------------- @@ -36,9 +37,9 @@ function onTrigger(player,npc) - ayameKaede = player:getQuestStatus(BASTOK,AYAME_AND_KAEDE); + local ayameKaede = player:getQuestStatus(BASTOK,AYAME_AND_KAEDE); - if(ayameKaede == QUEST_AVAILABLE and player:getMainLvl() >= 30) then + if(ayameKaede == QUEST_AVAILABLE and player:getMainLvl() >= ADVANCED_JOB_LEVEL) then player:startEvent(0x00f0); elseif(ayameKaede == QUEST_ACCEPTED) then player:startEvent(0x001a); @@ -48,7 +49,7 @@ player:startEvent(0x001a); end -end; +end; ----------------------------------- -- onEventUpdate @@ -70,6 +71,7 @@ if(csid == 0x00f0) then if(player:getQuestStatus(BASTOK,AYAME_AND_KAEDE) == QUEST_AVAILABLE) then player:addQuest(BASTOK,AYAME_AND_KAEDE); + debugTeleport(player,17743879); -- Kagetora, zone 236 end end Index: scripts/zones/Port_Bastok/npcs/Kagetora.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Kagetora.lua (revision 1908) +++ scripts/zones/Port_Bastok/npcs/Kagetora.lua (working copy) @@ -10,6 +10,7 @@ require("scripts/globals/settings"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Port_Bastok/TextIDs"); ----------------------------------- @@ -63,6 +64,7 @@ if(csid == 0x00f1) then player:setVar("AyameAndKaede_Event",1); + debugTeleport(player,17743909); -- Ensetsu, zone 236 elseif(csid == 0x0105) then player:setVar("twentyInPirateYearsCS",2); end Index: scripts/zones/Port_Bastok/npcs/Valah_Molkot.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Valah_Molkot.lua (revision 1908) +++ scripts/zones/Port_Bastok/npcs/Valah_Molkot.lua (working copy) @@ -17,10 +17,10 @@ function onTrade(player,npc,trade) -count = trade:getItemCount(); -gil = trade:getGil(); +local count = trade:getItemCount(); +local gil = trade:getGil(); -itemQuality = 0; +local itemQuality = 0; if (trade:getItemCount() == 1 and trade:getGil() == 0) then if (trade:hasItemQty(957,1)) then -- Amaryllis itemQuality = 2; @@ -48,7 +48,7 @@ end end - ALadysHeart = player:getQuestStatus(BASTOK,A_LADY_S_HEART); + local ALadysHeart = player:getQuestStatus(BASTOK,A_LADY_S_HEART); if (itemQuality == 2) then if (ALadysHeart == QUEST_COMPLETED) then Index: scripts/zones/Port_San_dOria/npcs/Arminibit.lua =================================================================== --- scripts/zones/Port_San_dOria/npcs/Arminibit.lua (revision 1908) +++ scripts/zones/Port_San_dOria/npcs/Arminibit.lua (working copy) @@ -7,6 +7,7 @@ ----------------------------------- require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Port_San_dOria/TextIDs"); ----------------------------------- @@ -59,6 +60,7 @@ if(csid == 0x0018) then player:setVar("TheHolyCrest_Event",1); + debugTeleport(player,17461503); -- Novalmauge end end; \ No newline at end of file Index: scripts/zones/Port_San_dOria/npcs/Ceraulian.lua =================================================================== --- scripts/zones/Port_San_dOria/npcs/Ceraulian.lua (revision 1908) +++ scripts/zones/Port_San_dOria/npcs/Ceraulian.lua (working copy) @@ -8,7 +8,9 @@ package.loaded["scripts/zones/Port_San_dOria/TextIDs"] = nil; ----------------------------------- +require("scripts/globals/settings"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Port_San_dOria/TextIDs"); ----------------------------------- @@ -24,7 +26,7 @@ function onTrigger(player,npc) - if(player:getMainLvl() >= 30 and player:getQuestStatus(SANDORIA,THE_HOLY_CREST) == QUEST_AVAILABLE) then + if(player:getMainLvl() >= ADVANCED_JOB_LEVEL and player:getQuestStatus(SANDORIA,THE_HOLY_CREST) == QUEST_AVAILABLE) then player:startEvent(0x0018); else player:startEvent(0x024b); @@ -51,6 +53,7 @@ if(csid == 0x0018) then player:setVar("TheHolyCrest_Event",1); + debugTeleport(player,17461503); -- Novalmauge end end; \ No newline at end of file Index: scripts/zones/Qufim_Island/npcs/Nightflowers.lua =================================================================== --- scripts/zones/Qufim_Island/npcs/Nightflowers.lua (revision 1908) +++ scripts/zones/Qufim_Island/npcs/Nightflowers.lua (working copy) @@ -7,6 +7,7 @@ ----------------------------------- require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Qufim_Island/TextIDs"); ----------------------------------- @@ -22,7 +23,7 @@ function onTrigger(player,npc) - currentTime = VanadielHour(); + local currentTime = VanadielHour(); if(currentTime >= 22 or currentTime < 6) then if(player:getQuestStatus(JEUNO,SAVE_MY_SON) == QUEST_ACCEPTED and player:getVar("SaveMySon_Event") == 0) then @@ -55,6 +56,7 @@ if(csid == 0x0000) then player:setVar("SaveMySon_Event",1); + debugTeleport(player,17780840); -- _6t2 end end; \ No newline at end of file Index: scripts/zones/Sauromugue_Champaign/npcs/Tiger_Bones.lua =================================================================== --- scripts/zones/Sauromugue_Champaign/npcs/Tiger_Bones.lua (revision 1908) +++ scripts/zones/Sauromugue_Champaign/npcs/Tiger_Bones.lua (working copy) @@ -11,6 +11,7 @@ require("scripts/globals/settings"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Sauromugue_Champaign/TextIDs"); ----------------------------------- @@ -32,6 +33,7 @@ if(deadTiger == 1 and player:hasKeyItem(OLD_TIGERS_FANG) == false) then player:addKeyItem(OLD_TIGERS_FANG); player:messageSpecial(KEYITEM_OBTAINED, OLD_TIGERS_FANG); + debugTeleport(player, 17764469); -- Perih_Vashai, zone 241 elseif(deadTiger == 0) then if(GetMobAction(17268808) == 0) then SpawnMob(17268808):addStatusEffect(EFFECT_POISON,40,10,210); Index: scripts/zones/Southern_San_dOria/npcs/Balasiel.lua =================================================================== --- scripts/zones/Southern_San_dOria/npcs/Balasiel.lua (revision 1908) +++ scripts/zones/Southern_San_dOria/npcs/Balasiel.lua (working copy) @@ -12,6 +12,7 @@ require("scripts/globals/titles"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Southern_San_dOria/TextIDs"); ----------------------------------- @@ -34,14 +35,14 @@ function onTrigger(player,npc) - LvL = player:getMainLvl(); - ASquiresTest = player:getQuestStatus(SANDORIA, A_SQUIRE_S_TEST); - ASquiresTestII = player:getQuestStatus(SANDORIA,A_SQUIRE_S_TEST_II); - AKnightsTest = player:getQuestStatus(SANDORIA, A_KNIGHT_S_TEST); + local LvL = player:getMainLvl(); + local ASquiresTest = player:getQuestStatus(SANDORIA, A_SQUIRE_S_TEST); + local ASquiresTestII = player:getQuestStatus(SANDORIA,A_SQUIRE_S_TEST_II); + local AKnightsTest = player:getQuestStatus(SANDORIA, A_KNIGHT_S_TEST); - if(LvL < 7) then + if(LvL < 7 and LvL < ADVANCED_JOB_LEVEL) then player:startEvent(0x029c); - elseif(LvL >= 7 and ASquiresTest ~= QUEST_COMPLETED) then + elseif ((LvL >= 7 or LvL >= ADVANCED_JOB_LEVEL) and ASquiresTest ~= QUEST_COMPLETED) then if(ASquiresTest == 0) then if(player:getVar("SquiresTest") == 1) then player:startEvent(0x0277); @@ -51,10 +52,10 @@ elseif(ASquiresTest == QUEST_ACCEPTED) then player:startEvent(0x029b); end - elseif(LvL >= 7 and LvL < 15) then + elseif(LvL >= 7 and LvL < 15 and LvL < ADVANCED_JOB_LEVEL) then player:startEvent(0x029f); - elseif(LvL >= 15 and ASquiresTestII ~= QUEST_COMPLETED) then - StalactiteDew = player:hasKeyItem(STALACTITE_DEW) + elseif((LvL >= 15 or LvL >= ADVANCED_JOB_LEVEL) and ASquiresTestII ~= QUEST_COMPLETED) then + local StalactiteDew = player:hasKeyItem(STALACTITE_DEW) if(ASquiresTestII == QUEST_AVAILABLE) then player:startEvent(0x0271); @@ -65,9 +66,9 @@ else player:startEvent(0x029b); end - elseif(LvL >= 15 and LvL < 30) then + elseif(LvL >= 15 and LvL < 30 and LvL < ADVANCED_JOB_LEVEL) then player:startEvent(0x029e); - elseif(LvL >= 30 and AKnightsTest ~= QUEST_COMPLETED) then + elseif(LvL >= ADVANCED_JOB_LEVEL and AKnightsTest ~= QUEST_COMPLETED) then if(AKnightsTest == 0) then if(player:getVar("KnightsTest_Event") == 1) then player:startEvent(0x027b); @@ -124,6 +125,7 @@ end elseif(csid == 0x0271 or csid == 0x0276) then player:addQuest(SANDORIA,A_SQUIRE_S_TEST_II); + debugTeleport(player,17568168); -- qm2, zone 193 elseif(csid == 0x0272) then player:tradeComplete(); player:addTitle(SPELUNKER); @@ -137,6 +139,7 @@ player:addQuest(SANDORIA,A_KNIGHT_S_TEST); player:addKeyItem(BOOK_OF_TASKS); player:messageSpecial(KEYITEM_OBTAINED, BOOK_OF_TASKS); + debugTeleport(player,17719301); -- Baunise else player:setVar("KnightsTest_Event",1); end @@ -145,6 +148,7 @@ player:addKeyItem(BOOK_OF_TASKS); player:messageSpecial(KEYITEM_OBTAINED, BOOK_OF_TASKS); player:setVar("KnightsTest_Event",0); + debugTeleport(player,17719301); -- Baunise elseif(csid == 0x0274) then if(player:getFreeSlotsCount(0) >= 1) then player:addTitle(TRIED_AND_TESTED_KNIGHT); @@ -171,4 +175,4 @@ -- player:startEvent(0x0009) -- methods create madness map -- player:startEvent(0x000c) -- methods create madness map reminder -- player:startEvent(0x000d) -- methods create madness end --- player:startEvent(0x003f) -- knight stalker \ No newline at end of file +-- player:startEvent(0x003f) -- knight stalker \ No newline at end of file Index: scripts/zones/Southern_San_dOria/npcs/Baunise.lua =================================================================== --- scripts/zones/Southern_San_dOria/npcs/Baunise.lua (revision 1908) +++ scripts/zones/Southern_San_dOria/npcs/Baunise.lua (working copy) @@ -10,6 +10,7 @@ require("scripts/globals/settings"); require("scripts/globals/keyitems"); +require("scripts/globals/teleports"); require("scripts/zones/Southern_San_dOria/TextIDs"); ----------------------------------- @@ -52,6 +53,7 @@ if (csid == 0x027a) then player:addKeyItem(BOOK_OF_THE_WEST); player:messageSpecial(KEYITEM_OBTAINED, BOOK_OF_THE_WEST); + debugTeleport(player, 17719300); -- Cahaurme end end; \ No newline at end of file Index: scripts/zones/Southern_San_dOria/npcs/Cahaurme.lua =================================================================== --- scripts/zones/Southern_San_dOria/npcs/Cahaurme.lua (revision 1908) +++ scripts/zones/Southern_San_dOria/npcs/Cahaurme.lua (working copy) @@ -11,6 +11,7 @@ require("scripts/globals/settings"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Southern_San_dOria/TextIDs"); ----------------------------------- @@ -65,6 +66,7 @@ if (csid == 0x0279) then player:addKeyItem(BOOK_OF_THE_EAST); player:messageSpecial(KEYITEM_OBTAINED, BOOK_OF_THE_EAST); + debugTeleport(player,17388007); -- Disused Well end end; Index: scripts/zones/The_Sanctuary_of_ZiTah/npcs/qm2.lua =================================================================== --- scripts/zones/The_Sanctuary_of_ZiTah/npcs/qm2.lua (revision 1908) +++ scripts/zones/The_Sanctuary_of_ZiTah/npcs/qm2.lua (working copy) @@ -10,6 +10,7 @@ require("scripts/globals/settings"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/The_Sanctuary_of_ZiTah/TextIDs"); ----------------------------------- @@ -41,7 +42,11 @@ ----------------------------------- function onTrigger(player,npc) - player:messageSpecial(STURDY_BRANCH,1021); + if (player:hasItem(1153)) then + debugTeleport(player, 17809424); -- Jaucribaix + else + player:messageSpecial(STURDY_BRANCH,1021); + end end; ----------------------------------- Index: scripts/zones/Upper_Jeuno/npcs/Brutus.lua =================================================================== --- scripts/zones/Upper_Jeuno/npcs/Brutus.lua (revision 1908) +++ scripts/zones/Upper_Jeuno/npcs/Brutus.lua (working copy) @@ -26,16 +26,16 @@ function onTrigger(player,npc) - ChocobosWounds = player:getQuestStatus(JEUNO,CHOCOBO_S_WOUNDS); - saveMySon = player:getQuestStatus(JEUNO,SAVE_MY_SON); - wingsOfGold = player:getQuestStatus(JEUNO,WINGS_OF_GOLD); - scatIntoShadow = player:getQuestStatus(JEUNO,SCATTERED_INTO_SHADOW); + local ChocobosWounds = player:getQuestStatus(JEUNO,CHOCOBO_S_WOUNDS); + local SaveMySon = player:getQuestStatus(JEUNO,SAVE_MY_SON); + local wingsOfGold = player:getQuestStatus(JEUNO,WINGS_OF_GOLD); + local scatIntoShadow = player:getQuestStatus(JEUNO,SCATTERED_INTO_SHADOW); - mLvl = player:getMainLvl(); - mJob = player:getMainJob(); + local mLvl = player:getMainLvl(); + local mJob = player:getMainJob(); - if(player:getMainLvl() >= 20 and ChocobosWounds ~= QUEST_COMPLETED) then - chocoFeed = player:getVar("ChocobosWounds_Event"); + if((mLvl >= 20 or mLvl >= ADVANCED_JOB_LEVEL) and ChocobosWounds ~= QUEST_COMPLETED) then + local chocoFeed = player:getVar("ChocobosWounds_Event"); if(ChocobosWounds == QUEST_AVAILABLE) then player:startEvent(0x0047); @@ -46,9 +46,9 @@ else player:startEvent(0x0066); end - elseif(ChocobosWounds == QUEST_COMPLETED and saveMySon == QUEST_AVAILABLE) then + elseif(ChocobosWounds == QUEST_COMPLETED and SaveMySon == QUEST_AVAILABLE) then player:startEvent(0x0016); - elseif(saveMySon == QUEST_COMPLETED and player:getQuestStatus(JEUNO,PATH_OF_THE_BEASTMASTER) == QUEST_AVAILABLE) then + elseif(SaveMySon == QUEST_COMPLETED and player:getQuestStatus(JEUNO,PATH_OF_THE_BEASTMASTER) == QUEST_AVAILABLE) then player:startEvent(0x0046); elseif(mLvl >= AF1_QUEST_LEVEL and mJob == 9 and wingsOfGold == QUEST_AVAILABLE) then if(player:getVar("wingsOfGold_shortCS") == 1) then @@ -73,7 +73,7 @@ player:startEvent(0x008d); end elseif(scatIntoShadow == QUEST_ACCEPTED) then - scatIntoShadowCS = player:getVar("scatIntoShadowCS"); + local scatIntoShadowCS = player:getVar("scatIntoShadowCS"); if(player:hasKeyItem(AQUAFLORA1) or player:hasKeyItem(AQUAFLORA2) or player:hasKeyItem(AQUAFLORA3)) then player:startEvent(0x008e); elseif(scatIntoShadowCS == 0) then Index: scripts/zones/Windurst_Walls/npcs/_6n2.lua =================================================================== --- scripts/zones/Windurst_Walls/npcs/_6n2.lua (revision 1908) +++ scripts/zones/Windurst_Walls/npcs/_6n2.lua (working copy) @@ -40,7 +40,7 @@ elseif(player:getVar("KnowOnesOnions") == 1) then player:startEvent(0x0120,0,4387); elseif(player:getQuestStatus(WINDURST, I_CAN_HEAR_A_RAINBOW) == 0) then - if(player:getMainLvl() >= 30 and player:hasItem(1125)) then + if(player:getMainLvl() >= ADVANCED_JOB_LEVEL and player:hasItem(1125)) then player:startEvent(0x0180,1125,1125,1125,1125,1125,1125,1125,1125); end elseif(player:getQuestStatus(WINDURST, I_CAN_HEAR_A_RAINBOW) == 1) then Index: scripts/zones/Windurst_Woods/npcs/Perih_Vashai.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Perih_Vashai.lua (revision 1908) +++ scripts/zones/Windurst_Woods/npcs/Perih_Vashai.lua (working copy) @@ -12,6 +12,7 @@ require("scripts/globals/titles"); require("scripts/globals/keyitems"); require("scripts/globals/quests"); +require("scripts/globals/teleports"); require("scripts/zones/Windurst_Woods/TextIDs"); ----------------------------------- @@ -27,14 +28,15 @@ function onTrigger(player,npc) - TheFangedOne = player:getQuestStatus(WINDURST,THE_FANGED_ONE); + local TheFangedOne = player:getQuestStatus(WINDURST,THE_FANGED_ONE); + local OldFang = player:hasKeyItem(OLD_TIGERS_FANG); if(TheFangedOne ~= QUEST_COMPLETED) then - if(TheFangedOne == QUEST_AVAILABLE) then + if(TheFangedOne == QUEST_AVAILABLE and player:getMainLvl() >= ADVANCED_JOB_LEVEL) then player:startEvent(0x015f); - elseif(TheFangedOne == QUEST_ACCEPTED and player:hasKeyItem(OLD_TIGERS_FANG) == false) then + elseif(TheFangedOne == QUEST_ACCEPTED and OldFang == false) then player:startEvent(0x0160); - elseif(player:hasKeyItem(OLD_TIGERS_FANG) and player:getVar("TheFangedOne_Event") ~= 1) then + elseif(OldFang == true and player:getVar("TheFangedOne_Event") ~= 1) then player:startEvent(0x0165); elseif(player:getVar("TheFangedOne_Event") == 1) then player:startEvent(0x0166); @@ -64,6 +66,7 @@ if(csid == 0x015f) then player:addQuest(WINDURST,THE_FANGED_ONE); + debugTeleport(player, 17269214); -- Tiger_bones elseif(csid == 0x0165 or csid == 0x0166) then if(player:getFreeSlotsCount(0) >= 1 and player:hasItem(13117) == false) then player:delKeyItem(OLD_TIGERS_FANG); Index: sql/item_armor.sql =================================================================== --- sql/item_armor.sql (revision 1908) +++ sql/item_armor.sql (working copy) @@ -44,6 +44,38 @@ -- INSERT INTO `item_armor` VALUES(10250, 'moogle_suit', 1, 1048575, 307, 0, 3, 32, 0); +INSERT INTO `item_armor` VALUES(10256, 'marine_gilet', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10257, 'marine_top', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10258, 'woodsy_gilet', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10259, 'woodsy_top', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10260, 'creek_maillot', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10261, 'creek_top', 1, 1048575, 335, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10262, 'river_top', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10263, 'dune_gilet', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10264, 'marine_gilet_+1', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10265, 'marine_top_+1', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10266, 'woodsy_gilet_+1', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10267, 'woodsy_top_+1', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10268, 'creek_maillot_+1', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10269, 'creek_top_+1', 1, 1048575, 335, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10270, 'river_top_+1', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10271, 'dune_gilet_+1', 1, 1048575, 334, 0, 0, 32, 6); +INSERT INTO `item_armor` VALUES(10330, 'marine_boxers', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10331, 'marine_shorts', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10332, 'woodsy_boxers', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10333, 'woodsy_shorts', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10334, 'creek_boxers', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10335, 'creek_shorts', 1, 1048575, 335, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10336, 'river_shorts', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10337, 'dune_boxers', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10338, 'marine_boxers_+1', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10339, 'marine_shorts_+1', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10340, 'woodsy_boxers_+1', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10341, 'woodsy_shorts_+1', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10342, 'creek_boxers_+1', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10343, 'creek_shorts_+1', 1, 1048575, 335, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10344, 'river_shorts_+1', 1, 1048575, 334, 0, 0, 128, 8); +INSERT INTO `item_armor` VALUES(10345, 'dune_boxers_+1', 1, 1048575, 334, 0, 0, 128, 8); INSERT INTO `item_armor` VALUES(10429, 'moogle_masque', 1, 1048575, 307, 0, 0, 16, 0); INSERT INTO `item_armor` VALUES(10450, 'ogiers_surcoat', 99, 10689, 325, 0, 0, 32, 0); INSERT INTO `item_armor` VALUES(10451, 'athoss_tabard', 99, 496674, 326, 0, 0, 32, 0); Index: sql/item_basic.sql =================================================================== --- sql/item_basic.sql (revision 1908) +++ sql/item_basic.sql (working copy) @@ -33,8 +33,6 @@ -- ---------------------------- -- Records of item_basic -- ---------------------------- -INSERT INTO `item_basic` VALUES ('10250', 'moogle_suit', 'moogle_suit', '1', '2080', '0', '0', '0'); -INSERT INTO `item_basic` VALUES ('10429', 'moogle_masque', 'moogle_masque', '1', '2080', '0', '0', '0'); INSERT INTO `item_basic` VALUES ('1', 'pile_of_chocobo_bedding', 'chocobo_bedding', '1', '24640', '0', '0', '198'); INSERT INTO `item_basic` VALUES ('2', 'simple_bed', 'simple_bed', '1', '32', '34', '0', '391'); INSERT INTO `item_basic` VALUES ('3', 'oak_bed', 'oak_bed', '1', '32', '34', '0', '1403'); @@ -5113,6 +5111,40 @@ INSERT INTO `item_basic` VALUES ('8676', 'mana_tank_ii', '', '1', '0', '99', '0', '0'); INSERT INTO `item_basic` VALUES ('8677', 'smoke_screen', '', '1', '0', '99', '0', '0'); INSERT INTO `item_basic` VALUES ('8678', 'economizer', '', '1', '0', '99', '0', '0'); +INSERT INTO `item_basic` VALUES ('10250', 'moogle_suit', 'moogle_suit', '1', '2080', '0', '0', '0'); +INSERT INTO `item_basic` VALUES ('10256', 'marine_gilet', 'marine_gilet', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10257', 'marine_top', 'marine_top', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10258', 'woodsy_gilet', 'woodsy_gilet', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10259', 'woodsy_top', 'woodsy_top', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10260', 'creek_maillot', 'creek_maillot', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10261', 'creek_top', 'creek_top', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10262', 'river_top', 'river_top', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10263', 'dune_gilet', 'dune_gilet', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10264', 'marine_gilet_+1', 'marine_gilet_+1', '1', '64592', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10265', 'marine_top_+1', 'marine_top_+1', '1', '64592', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10266', 'woodsy_gilet_+1', 'woodsy_gilet_+1', '1', '64592', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10267', 'woodsy_top_+1', 'woodsy_top_+1', '1', '64592', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10268', 'creek_maillot_+1', 'creek_maillot_+1', '1', '64592', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10269', 'creek_top_+1', 'creek_top_+1', '1', '64592', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10270', 'river_top_+1', 'river_top_+1', '1', '64592', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10271', 'dune_gilet_+1', 'dune_gilet_+1', '1', '64592', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10330', 'marine_boxers', 'marine_boxers', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10331', 'marine_shorts', 'marine_shorts', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10332', 'woodsy_boxers', 'woodsy_boxers', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10333', 'woodsy_shorts', 'woodsy_shorts', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10334', 'creek_boxers', 'creek_boxers', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10335', 'creek_shorts', 'creek_shorts', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10336', 'river_shorts', 'river_shorts', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10337', 'dune_boxers', 'dune_boxers', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10338', 'marine_boxers_+1', 'marine_boxers_+1', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10339', 'marine_shorts_+1', 'marine_shorts_+1', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10340', 'woodsy_boxers_+1', 'woodsy_boxers_+1', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10341', 'woodsy_shorts_+1', 'woodsy_shorts_+1', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10342', 'creek_boxers_+1', 'creek_boxers_+1', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10343', 'creek_shorts_+1', 'creek_shorts_+1', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10344', 'river_shorts_+1', 'river_shorts_+1', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10345', 'dune_boxers_+1', 'dune_boxers_+1', '1', '63568', '0', '1', '0'); +INSERT INTO `item_basic` VALUES ('10429', 'moogle_masque', 'moogle_masque', '1', '2080', '0', '0', '0'); INSERT INTO `item_basic` VALUES ('10450', 'ogiers_surcoat', 'ogiers_surcoat', '1', '63568', '99', '0', '0'); INSERT INTO `item_basic` VALUES ('10451', 'athoss_tabard', 'athoss_tabard', '1', '63568', '99', '0', '0'); INSERT INTO `item_basic` VALUES ('10452', 'rubeus_jacket', 'rubeus_jacket', '1', '63568', '99', '0', '0'); Index: sql/item_mods.sql =================================================================== --- sql/item_mods.sql (revision 1908) +++ sql/item_mods.sql (working copy) @@ -14838,3 +14838,35 @@ INSERT INTO `item_mods` VALUES(14914, 303, 1); INSERT INTO `item_mods` VALUES(15107, 303, 1); INSERT INTO `item_mods` VALUES(11149, 303, 1); +INSERT INTO `item_mods` VALUES(10256, 1, 1); +INSERT INTO `item_mods` VALUES(10257, 1, 1); +INSERT INTO `item_mods` VALUES(10258, 1, 1); +INSERT INTO `item_mods` VALUES(10259, 1, 1); +INSERT INTO `item_mods` VALUES(10260, 1, 1); +INSERT INTO `item_mods` VALUES(10261, 1, 1); +INSERT INTO `item_mods` VALUES(10262, 1, 1); +INSERT INTO `item_mods` VALUES(10263, 1, 1); +INSERT INTO `item_mods` VALUES(10264, 1, 2); +INSERT INTO `item_mods` VALUES(10265, 1, 2); +INSERT INTO `item_mods` VALUES(10266, 1, 2); +INSERT INTO `item_mods` VALUES(10267, 1, 2); +INSERT INTO `item_mods` VALUES(10268, 1, 2); +INSERT INTO `item_mods` VALUES(10269, 1, 2); +INSERT INTO `item_mods` VALUES(10270, 1, 2); +INSERT INTO `item_mods` VALUES(10271, 1, 2); +INSERT INTO `item_mods` VALUES(10330, 1, 1); +INSERT INTO `item_mods` VALUES(10331, 1, 1); +INSERT INTO `item_mods` VALUES(10332, 1, 1); +INSERT INTO `item_mods` VALUES(10333, 1, 1); +INSERT INTO `item_mods` VALUES(10334, 1, 1); +INSERT INTO `item_mods` VALUES(10335, 1, 1); +INSERT INTO `item_mods` VALUES(10336, 1, 1); +INSERT INTO `item_mods` VALUES(10337, 1, 1); +INSERT INTO `item_mods` VALUES(10338, 1, 2); +INSERT INTO `item_mods` VALUES(10339, 1, 2); +INSERT INTO `item_mods` VALUES(10340, 1, 2); +INSERT INTO `item_mods` VALUES(10341, 1, 2); +INSERT INTO `item_mods` VALUES(10342, 1, 2); +INSERT INTO `item_mods` VALUES(10343, 1, 2); +INSERT INTO `item_mods` VALUES(10344, 1, 2); +INSERT INTO `item_mods` VALUES(10345, 1, 2); \ No newline at end of file Index: sql/item_usable.sql =================================================================== --- sql/item_usable.sql (revision 1908) +++ sql/item_usable.sql (working copy) @@ -1652,6 +1652,14 @@ INSERT INTO `item_usable` VALUES (6059, 308, 'animus_augeo_schema', 1, 1, 11, 5, 0, 0, 0, 0); INSERT INTO `item_usable` VALUES (6060, 309, 'animus_minuo_schema', 1, 1, 11, 5, 0, 0, 0, 0); INSERT INTO `item_usable` VALUES (6061, 495, 'adloquium_schema', 1, 1, 11, 5, 0, 0, 0, 0); +INSERT INTO `item_usable` VALUES (10264, 0, 'marine_gilet_+1', 1, 8, 0, 0, 1, 30, 86400, 0); +INSERT INTO `item_usable` VALUES (10265, 0, 'marine_top_+1', 1, 8, 0, 0, 1, 30, 86400, 0); +INSERT INTO `item_usable` VALUES (10266, 0, 'woodsy_gilet_+1', 1, 8, 0, 0, 1, 30, 86400, 0); +INSERT INTO `item_usable` VALUES (10267, 0, 'woodsy_top_+1', 1, 8, 0, 0, 1, 30, 86400, 0); +INSERT INTO `item_usable` VALUES (10268, 0, 'creek_maillot_+1', 1, 8, 0, 0, 1, 30, 86400, 0); +INSERT INTO `item_usable` VALUES (10269, 0, 'creek_top_+1', 1, 8, 0, 0, 1, 30, 86400, 0); +INSERT INTO `item_usable` VALUES (10270, 0, 'river_top_+1', 1, 8, 0, 0, 1, 30, 86400, 0); +INSERT INTO `item_usable` VALUES (10271, 0, 'dune_gilet_+1', 1, 8, 0, 0, 1, 30, 86400, 0); INSERT INTO `item_usable` VALUES (10875, 0, 'snowman_cap', 1, 1, 0, 0, 1, 30, 3600, 0); INSERT INTO `item_usable` VALUES (11273, 0, 'custom_gilet_+1', 1, 8, 0, 0, 1, 30, 72000, 0); INSERT INTO `item_usable` VALUES (11274, 0, 'custom_top_+1', 1, 8, 0, 0, 1, 30, 72000, 0); Index: sql/npc_list.sql =================================================================== --- sql/npc_list.sql (revision 1908) +++ sql/npc_list.sql (working copy) @@ -7189,6 +7189,7 @@ INSERT INTO `npc_list` VALUES ('17265238', 'Rahal', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '6', '27', 0x0100060300100C200C300C400C5005601B700000, '32', '119'); INSERT INTO `npc_list` VALUES ('17265239', 'Cyranuce', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '6', '27', 0x0100030316100820083008400850056000700000, '32', '119'); INSERT INTO `npc_list` VALUES ('17265240', 'Yachemidot', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '6', '27', 0x0100030300100820083008400850056000700000, '32', '119'); +INSERT INTO `npc_list` VALUES ('17265241', 'Wyvern', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '6', '27', 0x0000180000000000000000000000000000000000, '32', '119'); INSERT INTO `npc_list` VALUES ('17265243', 'Herald', '61', '-46.596', '-15.983', '203.071', '26', '13', '40', '0', '64', '0', '0', '3', 0x0100030860102C203A303A403A50306100700000, '0', '119'); INSERT INTO `npc_list` VALUES ('17265244', 'Marshal', '51', '-10.012', '-16.830', '203.505', '6', '40', '40', '0', '0', '0', '0', '3', 0x01000507001082208A305F400250006000700000, '0', '119'); INSERT INTO `npc_list` VALUES ('17265245', 'San_d_Orian_Pursuivant', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '64', '0', '2', '3', 0x010005030C106F200C300C400C50096125700000, '0', '119');