diff options
author | Haru <haru@dotalux.com> | 2018-07-24 05:22:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-24 05:22:42 +0200 |
commit | 1f1b82f737809a44aaabb98499293aa75eee8125 (patch) | |
tree | ddbe3ee0b93db54a5febe237524bdf4823596911 /npc | |
parent | 019f60feb9272ac5a527c8cdb430c2328108417c (diff) | |
parent | 90f7ef5dfb75ba3d819a4ac93518ebeadcfe7cc5 (diff) | |
download | hercules-1f1b82f737809a44aaabb98499293aa75eee8125.tar.gz hercules-1f1b82f737809a44aaabb98499293aa75eee8125.tar.bz2 hercules-1f1b82f737809a44aaabb98499293aa75eee8125.tar.xz hercules-1f1b82f737809a44aaabb98499293aa75eee8125.zip |
Merge pull request #2107 from Asheraf/questinfo_vec
Questinfo System overhaul
Diffstat (limited to 'npc')
-rw-r--r-- | npc/re/jobs/novice/academy.txt | 60 | ||||
-rw-r--r-- | npc/re/warps/cities/izlude.txt | 4 |
2 files changed, 48 insertions, 16 deletions
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 1b6576737..fb19e59a7 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -98,7 +98,9 @@ iz_int,56,32,3 script Wounded Swordsman#izint 4_TOWER_01,8,8,{ end; OnInit: - questinfo(21001, QTYPE_QUEST, 1, Job_Novice); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 21001, 1); end; OnTouch_: @@ -166,7 +168,9 @@ int_land,58,69,5 script Sailor#int_land 4W_SAILOR,{ } OnInit: - questinfo(21002, QTYPE_QUEST, 1, Job_Novice); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 21002, 1); end; } @@ -264,7 +268,9 @@ int_land,78,103,5 script Captain Carocc#int_land 4_M_REINDEER,{ close(); OnInit: - questinfo(21002, QTYPE_QUEST, 1, Job_Novice); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 21002, 1); end; } @@ -366,7 +372,9 @@ int_land,73,100,3 script Lumin#iz_int 4_M_NOV_RUMIN,{ end; } OnInit: - questinfo(7471, QTYPE_QUEST, 1, Job_Novice); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 7471, 1); end; } @@ -782,7 +790,9 @@ izlude,198,213,3 script Captain Carocc#iz 4_M_REINDEER,5,5,{ end; OnInit: - questinfo(7472, QTYPE_QUEST, 1, Job_Novice); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 7472, 1); //setquestLevel 7472 1 14 //SetQuestQuest 7472 7473 0 end; @@ -1103,7 +1113,9 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ } OnInit: - questinfo(7473, QTYPE_QUEST, 1, Job_Novice); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 7473, 1); //setquestLevel 7473 1 14 end; @@ -2581,7 +2593,9 @@ izlude,140,260,3 script Instructor Argos#iz 4_M_LIEMAN,{ } OnInit: - questinfo(15001, QTYPE_QUEST, 0, Job_Novice); + questinfo(QTYPE_QUEST); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 15001, 1); end; } @@ -2792,7 +2806,9 @@ iz_ac01,100,39,5 script Academy Receptionist#1 4_F_01,{ } OnInit: - questinfo(4269, QTYPE_QUEST, 0, Job_Novice); + questinfo(QTYPE_QUEST); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 4269, 1); end; } @@ -3669,7 +3685,8 @@ izlude,115,181,5 script Shop Helper#iz 4_F_KHELLISIA,{ } OnInit: - questinfo(1237, QTYPE_QUEST, 0); + questinfo(QTYPE_QUEST); + setquestinfo(QINFO_QUEST, 1237, 1); end; } @@ -3854,7 +3871,8 @@ iz_ac01,53,74,3 script Attribute Expert#ac 1_M_WIZARD,{ } OnInit: - questinfo(2299, QTYPE_NONE, 0); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_QUEST, 2299, 1); end; } @@ -4406,10 +4424,21 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ } OnInit: - questinfo(14154, QTYPE_QUEST, 1, Job_Novice); - questinfo(14155, QTYPE_QUEST, 1, Job_Novice); - questinfo(14156, QTYPE_QUEST, 1, Job_Novice); - questinfo(14157, QTYPE_QUEST, 1, Job_Novice); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 14154, 1); + + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 14155, 1); + + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 14156, 1); + + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 14157, 1); end; } @@ -4904,7 +4933,8 @@ iz_ac01,45,80,5 script Adept Adventurer#ac 4_M_JOB_BLACKSMITH,{ } OnInit: - questinfo(2298, QTYPE_QUEST, 0); + questinfo(QTYPE_QUEST); + setquestinfo(QINFO_QUEST, 2298, 1); end; } diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt index 124e3ed1f..1e691e33b 100644 --- a/npc/re/warps/cities/izlude.txt +++ b/npc/re/warps/cities/izlude.txt @@ -82,7 +82,9 @@ OnTouch: end; OnInit: - questinfo(21001, QTYPE_QUEST, 1, Job_Novice); + questinfo(QTYPE_QUEST, 1); + setquestinfo(QINFO_JOB, Job_Novice); + setquestinfo(QINFO_QUEST, 21001, 1); end; } |