Skip to content

Commit

Permalink
Fix commenting in scripts/zones/Southern_San_dOria/npcs/Endracion.lua
Browse files Browse the repository at this point in the history
These were accidentally reverted along with some bad script adjustment ages ago.
  • Loading branch information
TeoTwawki committed Dec 30, 2016
1 parent 53ef17b commit f134741
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions scripts/zones/Southern_San_dOria/npcs/Endracion.lua
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
-----------------------------------
-- Area: Northern San d'Oria
-- Area: Southern San d'Oria
-- NPC: Endracion
-- @pos -110 1 -34 230
-----------------------------------
package.loaded["scripts/zones/Southern_San_dOria/TextIDs"] = nil;
-----------------------------------

require("scripts/zones/Southern_San_dOria/TextIDs");
require("scripts/globals/settings");
require("scripts/globals/keyitems");
require("scripts/globals/missions");
require("scripts/zones/Southern_San_dOria/TextIDs");

-----------------------------------
-- onTrade Action
-----------------------------------

function onTrade(player,npc,trade)

CurrentMission = player:getCurrentMission(SANDORIA);
OrcishScoutCompleted = player:hasCompletedMission(SANDORIA,SMASH_THE_ORCISH_SCOUTS);
BatHuntCompleted = player:hasCompletedMission(SANDORIA,BAT_HUNT);
TheCSpringCompleted = player:hasCompletedMission(SANDORIA,THE_CRYSTAL_SPRING);
MissionStatus = player:getVar("MissionStatus");
Count = trade:getItemCount();

if (CurrentMission ~= 255) then
if (CurrentMission == SMASH_THE_ORCISH_SCOUTS and trade:hasItemQty(16656,1) and Count == 1 and OrcishScoutCompleted == false) then -- Trade Orcish Axe
player:startEvent(0x03fc); -- Finish Mission "Smash the Orcish scouts" (First Time)
Expand All @@ -43,7 +41,7 @@ function onTrade(player,npc,trade)
else
player:startEvent(0x03f2); -- Mission not activated
end

end;

-----------------------------------
Expand Down Expand Up @@ -91,7 +89,7 @@ local PresOfPapsqueCompleted = player:hasCompletedMission(SANDORIA,PRESTIGE_OF_T
player:startEvent(0x03f1,mission_mask, 0, 0 ,0 ,0 ,repeat_mask); -- Mission List
end
end

end;

-----------------------------------
Expand All @@ -110,7 +108,7 @@ end;
function onEventFinish(player,csid,option)
-- printf("onFinishCSID: %u",csid);
-- printf("onFinishOPTION: %u",option);

finishMissionTimeline(player,1,csid,option);
if (csid == 0x040b) then
player:setVar("MissionStatus",4);
Expand Down

0 comments on commit f134741

Please sign in to comment.