From b4c99db7d5a500770383e24ef2fd1f956b19da74 Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 29 Dec 2015 02:16:49 +0100 Subject: Replaced leftover -1 view IDs with FAKE_NPC Signed-off-by: Haru --- doc/sample/npc_dynamic_shop.txt | 2 +- doc/sample/npc_test_duplicate.txt | 2 +- doc/script_commands.txt | 16 +- doc/whisper_sys.txt | 4 +- npc/battleground/flavius/flavius01.txt | 4 +- npc/battleground/flavius/flavius02.txt | 4 +- npc/battleground/tierra/tierra01.txt | 22 +- npc/battleground/tierra/tierra02.txt | 22 +- npc/cities/jawaii.txt | 2 +- npc/cities/lighthalzen.txt | 2 +- npc/cities/splendide.txt | 2 +- npc/cities/umbala.txt | 4 +- npc/custom/bgqueue/flavius.txt | 4 +- npc/custom/quests/hunting_missions.txt | 2 +- npc/custom/quests/quest_shop.txt | 10 +- npc/events/StPatrick_2008.txt | 2 +- npc/events/gdevent_aru.txt | 2 +- npc/events/gdevent_sch.txt | 2 +- npc/instances/NydhoggsNest.txt | 54 +- npc/instances/SealedShrine.txt | 8 +- npc/jobs/2-1/assassin.txt | 184 +-- npc/jobs/2-1/hunter.txt | 768 ++++----- npc/jobs/2-1/priest.txt | 18 +- npc/jobs/2-1/wizard.txt | 6 +- npc/jobs/2-2/crusader.txt | 10 +- npc/jobs/2-2/dancer.txt | 18 +- npc/jobs/2-2/monk.txt | 80 +- npc/jobs/2-2/rogue.txt | 40 +- npc/jobs/2-2e/SoulLinker.txt | 2 +- npc/other/arena/arena_aco.txt | 40 +- npc/other/arena/arena_party.txt | 28 +- npc/other/monster_race.txt | 336 ++-- npc/other/msg_boards.txt | 2 +- npc/other/turbo_track.txt | 2556 +++++++++++++++--------------- npc/pre-re/jobs/1-1/swordman.txt | 356 ++--- npc/quests/eye_of_hellion.txt | 2 +- npc/quests/kiel_hyre_quest.txt | 18 +- npc/quests/okolnir.txt | 380 ++--- npc/quests/quests_13_1.txt | 18 +- npc/quests/quests_13_2.txt | 94 +- npc/quests/quests_airship.txt | 2 +- npc/quests/quests_amatsu.txt | 4 +- npc/quests/quests_ayothaya.txt | 32 +- npc/quests/quests_ein.txt | 2 +- npc/quests/quests_juperos.txt | 28 +- npc/quests/quests_lighthalzen.txt | 52 +- npc/quests/quests_louyang.txt | 10 +- npc/quests/quests_morocc.txt | 10 +- npc/quests/quests_moscovia.txt | 22 +- npc/quests/quests_nameless.txt | 32 +- npc/quests/quests_prontera.txt | 12 +- npc/quests/quests_rachel.txt | 36 +- npc/quests/quests_umbala.txt | 4 +- npc/quests/quests_veins.txt | 28 +- npc/quests/seals/god_weapon_creation.txt | 12 +- npc/quests/skills/assassin_skills.txt | 10 +- npc/quests/skills/rogue_skills.txt | 2 +- npc/quests/the_sign_quest.txt | 24 +- npc/re/instances/MalangdoCulvert.txt | 6 +- npc/re/instances/WolfchevLaboratory.txt | 12 +- npc/re/jobs/3-1/warlock.txt | 2 +- npc/re/quests/quests_malangdo.txt | 46 +- npc/re/quests/quests_malaya.txt | 20 +- npc/woe-fe/aldeg_cas01.txt | 6 +- npc/woe-fe/aldeg_cas02.txt | 6 +- npc/woe-fe/aldeg_cas03.txt | 6 +- npc/woe-fe/aldeg_cas04.txt | 6 +- npc/woe-fe/aldeg_cas05.txt | 6 +- npc/woe-fe/gefg_cas01.txt | 6 +- npc/woe-fe/gefg_cas02.txt | 6 +- npc/woe-fe/gefg_cas03.txt | 6 +- npc/woe-fe/gefg_cas04.txt | 6 +- npc/woe-fe/gefg_cas05.txt | 6 +- npc/woe-fe/payg_cas01.txt | 6 +- npc/woe-fe/payg_cas02.txt | 6 +- npc/woe-fe/payg_cas03.txt | 6 +- npc/woe-fe/payg_cas04.txt | 6 +- npc/woe-fe/payg_cas05.txt | 6 +- npc/woe-fe/prtg_cas01.txt | 6 +- npc/woe-fe/prtg_cas02.txt | 6 +- npc/woe-fe/prtg_cas03.txt | 6 +- npc/woe-fe/prtg_cas04.txt | 6 +- npc/woe-fe/prtg_cas05.txt | 6 +- npc/woe-fe/trs_rp.txt | 40 +- npc/woe-se/arug_cas01.txt | 18 +- npc/woe-se/arug_cas02.txt | 18 +- npc/woe-se/arug_cas03.txt | 18 +- npc/woe-se/arug_cas04.txt | 18 +- npc/woe-se/arug_cas05.txt | 18 +- npc/woe-se/schg_cas01.txt | 18 +- npc/woe-se/schg_cas02.txt | 18 +- npc/woe-se/schg_cas03.txt | 18 +- npc/woe-se/schg_cas04.txt | 18 +- npc/woe-se/schg_cas05.txt | 18 +- src/map/npc.c | 2 +- 95 files changed, 2938 insertions(+), 2938 deletions(-) diff --git a/doc/sample/npc_dynamic_shop.txt b/doc/sample/npc_dynamic_shop.txt index 1e4ac77e4..9b1315ba7 100644 --- a/doc/sample/npc_dynamic_shop.txt +++ b/doc/sample/npc_dynamic_shop.txt @@ -9,7 +9,7 @@ //============================================================ // Dummy shop to insert items into: -- shop dyn_shop1 -1,501:50. +- shop dyn_shop1 FAKE_NPC,501:50. prontera,181,200,4 script Dynamic Shop 2_F_MAGICMASTER,{ callshop "dyn_shop1",0; diff --git a/doc/sample/npc_test_duplicate.txt b/doc/sample/npc_test_duplicate.txt index 55d64bc7b..4e07e38c4 100644 --- a/doc/sample/npc_test_duplicate.txt +++ b/doc/sample/npc_test_duplicate.txt @@ -12,7 +12,7 @@ //= 'OnInit' loads the main npc last, for some reason. (check with debugmes) //============================================================ -- script Test Script -1,1,1,{ +- script Test Script FAKE_NPC,1,1,{ mes "Hi."; mes "My coords are "+ .map$ +", "+ .x +"/" +.y ; close; diff --git a/doc/script_commands.txt b/doc/script_commands.txt index c6ee8fc76..e5663f7bf 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -249,7 +249,7 @@ OnTouch events with a 2,2 range and with an 'end' after the header to avoid bugs (for more info on why see npc_click@map/npc.c). It is possible to use a job sprite as well, but you must first define it as a monster sprite in 'mob_avail.txt', a full description on how to do this is not in the scope of this manual. -A '-1' sprite will make the NPC invisible (and unclickable). +A 'FAKE_NPC' sprite will make the NPC invisible (and unclickable). A 'HIDDEN_NPC' sprite will make an NPC which does not have a sprite, but is still clickable, which is useful if you want to make a clickable object of the 3D terrain. @@ -271,7 +271,7 @@ optional parameter. ** Define a 'floating' NPC object. --%TAB%script%TAB%%TAB%-1,{} +-%TAB%script%TAB%%TAB%FAKE_NPC,{} This will define an NPC object not triggerable by normal means. This would normally mean it's pointless since it can't do anything, but there are @@ -303,7 +303,7 @@ items here. The layout used to define sale items still count, and ** Define a trader NPC ,,,%TAB%trader%TAB%%TAB%,{} --%TAB%trader%TAB%%TAB%-1,{} +-%TAB%trader%TAB%%TAB%FAKE_NPC,{} All the standards that are valid to script objects are also valid for trader objects (see ** Define an NPC object for more information). @@ -1922,7 +1922,7 @@ Example: dothat; } - - script test -1,{ + - script test FAKE_NPC,{ .@try = is_function("try"); // 1 .@not = is_function("not"); // 0 } @@ -6694,7 +6694,7 @@ and source flags are ignored. *callshop "",