From ba5ca9e100564cecb4a1fb1edabca1c042c10204 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 4 Nov 2013 16:30:43 +0100 Subject: Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Changed a few leftover NPC IDs to constants - Note: we're still missing support for mob sprite constants, so the NPCs using mob sprites are still not converted. Signed-off-by: Haru --- npc/quests/first_class/tu_acolyte.txt | 2 +- npc/quests/quests_ein.txt | 4 ++-- npc/quests/quests_juperos.txt | 2 +- npc/quests/quests_moscovia.txt | 2 +- npc/quests/thana_quest.txt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'npc/quests') diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt index fde13dbae..c788462bd 100644 --- a/npc/quests/first_class/tu_acolyte.txt +++ b/npc/quests/first_class/tu_acolyte.txt @@ -1778,7 +1778,7 @@ prt_monk,223,123,3 script Eavesdrop#tu HIDDEN_NPC,{ } } -sec_in02,17,156,3 script 1st Job Quest Reset 726,{ +sec_in02,17,156,3 script 1st Job Quest Reset 4_F_JOB_BLACKSMITH,{ callfunc "F_GM_NPC"; mes "[1st Job Quest]"; mes "Which would you like to reset?"; diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index 243c47fc7..51d7e5869 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -4073,7 +4073,7 @@ ein_in01,67,242,3 script Zelmeto 4_M_REPAIR,{ } } -ein_in01,49,232,3 script 2nd Control Panel#ins 111,{ +ein_in01,49,232,3 script 2nd Control Panel#ins HIDDEN_NPC,{ if ((EinFactory == 1) || (EinFactory == 2)) { changequest 8017,8018; set EinFactory,2; @@ -4088,7 +4088,7 @@ ein_in01,49,232,3 script 2nd Control Panel#ins 111,{ end; } -ein_in01,108,217,3 script 3rd Pressure Governor#1 111,{ +ein_in01,108,217,3 script 3rd Pressure Governor#1 HIDDEN_NPC,{ if ((EinFactory == 3) || (EinFactory == 4)) { changequest 8019,8020; set EinFactory,4; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index b46c8a82c..3c51ead24 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -4904,7 +4904,7 @@ OnTimer26000: donpcevent "GuardEnd#ufe::OnDisable"; } -jupe_ele,41,33,0 script 4F Enter#ufe 45,4,4,{ +jupe_ele,41,33,0 script 4F Enter#ufe WARPNPC,4,4,{ OnInit: disablenpc "4F Enter#ufe"; end; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 6f00c6e7c..d868926b6 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -9298,7 +9298,7 @@ moc_pryd04,126,120,0 script Soldier#rus26 4_M_RUSMAN1,{ //---------------------------------------------------------------------------- // Marozka's Dungeon (Golden Thread) //---------------------------------------------------------------------------- -mosk_dun01,45,250,3 script 1#rus27 45,3,3,{ +mosk_dun01,45,250,3 script 1#rus27 WARPNPC,3,3,{ end; OnTouch: warp "mosk_que",49,22; diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index bb70a4166..8aebaae31 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -868,7 +868,7 @@ L_Request: return; } -tha_t02,227,163,0 script 3rdf_warp#tt 45,1,1,{ +tha_t02,227,163,0 script 3rdf_warp#tt WARPNPC,1,1,{ end; OnInit: disablenpc "3rdf_warp#tt"; @@ -2310,4 +2310,4 @@ OnTouch: } mes "A mysterious power is blocking my path."; close; -} \ No newline at end of file +} -- cgit v1.2.3-60-g2f50