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

This commit is contained in:
CuriousJorge committed 2022-02-20 23:05:49 -05:00
commit d2e814b4ee
4 files changed
+3 -3

No files matched your search

File renamed without changes.
File renamed without changes.
File renamed without changes.
+3 -3
View File
@@ -1820,9 +1820,8 @@ 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()) switch (npc.GetActorClassId())
{ {
case 1000137: case 1000137:
@@ -1832,6 +1831,7 @@ namespace Meteor.Map.Actors
case 1000841: case 1000841:
return (Quest)Server.GetStaticActors("Trl0u1"); return (Quest)Server.GetStaticActors("Trl0u1");
} }
}
return null; return null;
} }