mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-22 04:37:47 +00:00
Code Activity

Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system

Browse source
This commit is contained in:
CuriousJorge 2022-02-20 23:05:49 -05:00
commit d2e814b4ee
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Data/scripts/quests/trl1/Trl0g1.lua → Data/scripts/quests/trl/Trl0g1.lua
View file

0
Data/scripts/quests/trl1/Trl0l1.lua → Data/scripts/quests/trl/Trl0l1.lua
View file

0
Data/scripts/quests/trl1/Trl0u1.lua → Data/scripts/quests/trl/Trl0u1.lua
View file

20
Map Server/Actors/Chara/Player/Player.cs
View file

@ -1820,17 +1820,17 @@ namespace Meteor.Map.Actors
public Quest GetTutorialQuest(Npc npc) public Quest GetTutorialQuest(Npc npc)
{ {
if (npc.CurrentArea.RegionId != 101 || npc.CurrentArea.RegionId != 103 || npc.CurrentArea.RegionId != 104) if (npc.CurrentArea.RegionId == 101 || npc.CurrentArea.RegionId == 103 || npc.CurrentArea.RegionId == 104)
return null;
switch (npc.GetActorClassId())
{ {
case 1000137: switch (npc.GetActorClassId())
return (Quest)Server.GetStaticActors("Trl0l1"); {
case 1000230: case 1000137:
return (Quest)Server.GetStaticActors("Trl0g1"); return (Quest)Server.GetStaticActors("Trl0l1");
case 1000841: case 1000230:
return (Quest)Server.GetStaticActors("Trl0u1"); return (Quest)Server.GetStaticActors("Trl0g1");
case 1000841:
return (Quest)Server.GetStaticActors("Trl0u1");
}
} }
return null; return null;
} }