Index: scripts/zones/Heavens_Tower/npcs/Rakano-Marukano.lua =================================================================== --- scripts/zones/Heavens_Tower/npcs/Rakano-Marukano.lua (revision 2793) +++ scripts/zones/Heavens_Tower/npcs/Rakano-Marukano.lua (working copy) @@ -22,17 +22,16 @@ function onTrigger(player,npc) - local new_nation = WINDURST; local old_nation = player:getNation(); - local rank = getNationRank(new_nation); + local rank = getNationRank(WINDURST); - if(old_nation == new_nation) then + if(old_nation == WINDURST) then player:startEvent(0x2714,0,0,0,old_nation); elseif(player:getCurrentMission(old_nation) ~= 255 or player:getVar("MissionStatus") ~= 0) then - player:startEvent(0x2713,0,0,0,new_nation); - elseif(old_nation ~= new_nation) then + player:startEvent(0x2713,0,0,0,WINDURST); + elseif(old_nation ~= WINDURST) then local has_gil = 0; - local cost = 0; + cost = 0; if(rank == 1) then cost = 40000; @@ -46,7 +45,7 @@ has_gil = 1 end - player:startEvent(0x2712,0,1,player:getRank(),new_nation,has_gil,cost); + player:startEvent(0x2712,0,1,player:getRank(),WINDURST,has_gil,cost); end end; @@ -69,7 +68,7 @@ -- printf("RESULT: %u",option); if(csid == 0x2712 and option == 1) then - player:setNation(new_nation) + player:setNation(WINDURST) player:setGil(player:getGil() - cost); player:setRankPoints(0); end Index: scripts/zones/Metalworks/npcs/Mythily.lua =================================================================== --- scripts/zones/Metalworks/npcs/Mythily.lua (revision 2793) +++ scripts/zones/Metalworks/npcs/Mythily.lua (working copy) @@ -19,18 +19,17 @@ ----------------------------------- function onTrigger(player,npc) - - local new_nation = BASTOK; + local old_nation = player:getNation(); - local rank = getNationRank(new_nation); + local rank = getNationRank(BASTOK); - if(old_nation == new_nation) then + if(old_nation == BASTOK) then player:startEvent(0x0170,0,0,0,old_nation); elseif(player:getCurrentMission(old_nation) ~= 255 or player:getVar("MissionStatus") ~= 0) then - player:startEvent(0x0169,0,0,0,new_nation); - elseif(old_nation ~= new_nation) then + player:startEvent(0x0169,0,0,0,BASTOK); + elseif(old_nation ~= BASTOK) then local has_gil = 0; - local cost = 0; + cost = 0; if(rank == 1) then cost = 40000; @@ -44,7 +43,7 @@ has_gil = 1 end - player:startEvent(0x0168,0,1,player:getRank(),new_nation,has_gil,cost); + player:startEvent(0x0168,0,1,player:getRank(),BASTOK,has_gil,cost); end end; @@ -67,7 +66,7 @@ -- printf("RESULT: %u",option); if(csid == 0x0168 and option == 1) then - player:setNation(new_nation) + player:setNation(BASTOK) player:setGil(player:getGil() - cost); player:setRankPoints(0); end Index: scripts/zones/Northern_San_dOria/npcs/Beriphaule.lua =================================================================== --- scripts/zones/Northern_San_dOria/npcs/Beriphaule.lua (revision 2793) +++ scripts/zones/Northern_San_dOria/npcs/Beriphaule.lua (working copy) @@ -19,18 +19,17 @@ ----------------------------------- function onTrigger(player,npc) - - local new_nation = SANDORIA; + local old_nation = player:getNation(); - local rank = getNationRank(new_nation); + local rank = getNationRank(SANDORIA); - if(old_nation == new_nation) then + if(old_nation == SANDORIA) then player:startEvent(0x0260,0,0,0,old_nation); elseif(player:getCurrentMission(old_nation) ~= 255 or player:getVar("MissionStatus") ~= 0) then - player:startEvent(0x025f,0,0,0,new_nation); - elseif(old_nation ~= new_nation) then + player:startEvent(0x025f,0,0,0,SANDORIA); + elseif(old_nation ~= SANDORIA) then local has_gil = 0; - local cost = 0; + cost = 0; if(rank == 1) then cost = 40000; @@ -44,7 +43,7 @@ has_gil = 1 end - player:startEvent(0x025e,0,1,player:getRank(),new_nation,has_gil,cost); + player:startEvent(0x025e,0,1,player:getRank(),SANDORIA,has_gil,cost); end end; @@ -66,7 +65,7 @@ -- printf("RESULT: %u",option); if(csid == 0x025e and option == 1) then - player:setNation(new_nation) + player:setNation(SANDORIA) player:setGil(player:getGil() - cost); player:setRankPoints(0); end