mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-06-09 05:54:50 +02:00
Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system
# Conflicts: # Data/scripts/commands/EmoteStandardCommand.lua # Data/scripts/quests/man/man0g0.lua # Data/scripts/quests/man/man0g1.lua # Data/scripts/quests/man/man0u0.lua Resolved using Theirs.
This commit is contained in:
commit
02fe9e070d
182 changed files with 3871 additions and 1332 deletions
|
@ -26,8 +26,8 @@ function onTrigger(player, argc, qty, name, lastName)
|
|||
currency = 1000001;
|
||||
qty = tonumber(qty) or 1;
|
||||
location = INVENTORY_CURRENCY;
|
||||
|
||||
actionList = player:AddExp(qty, player.charaWork.parameterSave.state_mainSkill[0], 0);
|
||||
print("ASDASDASDASDASD");
|
||||
actionList = player:AddExp(qty, player.charaWork.parameterSave.state_mainSkill[1], 0);
|
||||
player:DoBattleAction(0, 0, actionList);
|
||||
else
|
||||
print(sender.."unable to add experience, ensure player name is valid.");
|
||||
|
|
|
@ -6,17 +6,17 @@ properties = {
|
|||
description = ""
|
||||
}
|
||||
|
||||
function onTrigger(player, argc, animation, regionId, layoutId, maxLayoutId)
|
||||
layoutId = tonumber(layoutId);
|
||||
function onTrigger(player, argc, animation, layoutId, instanceId, maxInstanceId)
|
||||
instanceId = tonumber(instanceId);
|
||||
|
||||
if (maxLayoutId ~= nil) then
|
||||
maxLayoutId = tonumber(maxLayoutId);
|
||||
if (maxInstanceId ~= nil) then
|
||||
maxInstanceId = tonumber(maxInstanceId);
|
||||
else
|
||||
maxLayoutId = layoutId;
|
||||
maxInstanceId = instanceId;
|
||||
end
|
||||
|
||||
actorClassId = 5900001;
|
||||
while (layoutId <= maxLayoutId) do
|
||||
while (instanceId <= maxInstanceId) do
|
||||
if (actorClassId == nil) then
|
||||
player:SendMessage(0x20, "", "No actor class id provided.");
|
||||
return;
|
||||
|
@ -32,16 +32,16 @@ function onTrigger(player, argc, animation, regionId, layoutId, maxLayoutId)
|
|||
|
||||
if (actorClassId ~= nil) then
|
||||
zone = player.CurrentArea;
|
||||
actor = zone:SpawnActor(actorClassId, "mapobj", pos[1], pos[2], pos[3], tonumber(regionId), tonumber(layoutId));
|
||||
actor = zone:SpawnActor(actorClassId, "mapobj", pos[1], pos[2], pos[3], tonumber(layoutId), tonumber(instanceId));
|
||||
|
||||
print("test");
|
||||
wait(0.8);
|
||||
wait(2);
|
||||
actor:PlayMapObjAnimation(player, animation);
|
||||
zone:DespawnActor("mapobj");
|
||||
wait(0.5);
|
||||
player:SendMessage(0x20, "", "Layout ID: "..layoutId);
|
||||
player:SendMessage(0x20, "", "Playing animation for instance: " .. instanceId);
|
||||
end
|
||||
layoutId=layoutId+1;
|
||||
instanceId = instanceId + 1;
|
||||
end
|
||||
end;
|
||||
--!testmapobj 5900001 421 2810 2820
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue