From 37c4899e82166059e55796f8da9a3e94a6cd4642 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 19 Aug 2011 17:04:17 +0200 Subject: removing some commented out debug npcs --- world/map/npc/027-2/testnpcs.txt | 95 +--------------------------------------- world/map/npc/042-1/_import.txt | 3 +- world/map/npc/042-1/malik.txt | 23 ---------- 3 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 world/map/npc/042-1/malik.txt (limited to 'world/map/npc') diff --git a/world/map/npc/027-2/testnpcs.txt b/world/map/npc/027-2/testnpcs.txt index 69878744..f2fe952a 100644 --- a/world/map/npc/027-2/testnpcs.txt +++ b/world/map/npc/027-2/testnpcs.txt @@ -1,5 +1,4 @@ -//contains debug scripts -//To enable: sed 's_^// __' -i npc/027-2/alacrius.txt +//several NPCs in the Reid's Inn 027-2.gat,80,34,0 script Lovers 303,{ mes "You see a man and a woman holding each other very tight."; @@ -12,98 +11,6 @@ close; } -// 027-2.gat,110,30,0 script Debug 305,{ -// set @Graveyard_Inn_Woman_MASK, NIBBLE_0_MASK; -// set @Graveyard_Inn_Woman_SHIFT, NIBBLE_0_SHIFT; - -// set @woman, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Woman_MASK) >> @Graveyard_Inn_Woman_SHIFT); - -// set @Graveyard_Inn_Lover_MASK, NIBBLE_1_MASK; -// set @Graveyard_Inn_Lover_SHIFT, NIBBLE_1_SHIFT; - -// set @Lover, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Lover_MASK) >> @Graveyard_Inn_Lover_SHIFT); - -// set @Graveyard_Inn_Child_MASK, NIBBLE_2_MASK; -// set @Graveyard_Inn_Child_SHIFT, NIBBLE_2_SHIFT; - -// set @Child, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Child_MASK) >> @Graveyard_Inn_Child_SHIFT); - -// set @Graveyard_Inn_Husband_MASK, NIBBLE_3_MASK; -// set @Graveyard_Inn_Husband_SHIFT, NIBBLE_3_SHIFT; - -// set @Husband, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Husband_MASK) >> @Graveyard_Inn_Husband_SHIFT); - -// set @Graveyard_Inn_Golb_MASK, NIBBLE_4_MASK; -// set @Graveyard_Inn_Golb_SHIFT, NIBBLE_4_SHIFT; - -// set @Golb, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Golb_MASK) >> @Graveyard_Inn_Golb_SHIFT); - -// mes "debug for the lovetriangle quest"; -// menu -// "reset all",-, -// "reset reid " + @woman,L_Reid, -// "reset lover " + @Lover,L_Lover, -// "reset child " + @Child,L_Child, -// "reset husband " + @Husband,L_Husband, -// "reset golbanez " + @Golb,L_Golb, -// "leave", L_Close; - -// set QUEST_Graveyard_Inn, 0; -// close; -// L_Reid: -// set @woman, 0; -// callsub S_Update_Mask_Woman; -// close; -// L_Lover: -// set @Lover, 0; -// callsub S_Update_Mask_Lover; -// close; -// L_Child: -// set @Child, 0; -// callsub S_Update_Mask_Child; -// close; -// L_Husband: -// set @Husband, 0; -// callsub S_Update_Mask_Husband; -// close; -// L_Golb: -// set @Golb, 0; -// callsub S_Update_Mask_Golb; -// close; -// L_Close: -// close; - -// S_Update_Mask_Golb: -// set QUEST_Graveyard_Inn, -// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Golb_MASK)) -// | (@Golb << @Graveyard_Inn_Golb_SHIFT); -// return; - -// S_Update_Mask_Husband: -// set QUEST_Graveyard_Inn, -// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Husband_MASK)) -// | (@Husband << @Graveyard_Inn_Husband_SHIFT); -// return; - -// S_Update_Mask_Child: -// set QUEST_Graveyard_Inn, -// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Child_MASK)) -// | (@Child << @Graveyard_Inn_Child_SHIFT); -// return; - -// S_Update_Mask_Lover: -// set QUEST_Graveyard_Inn, -// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Lover_MASK)) -// | (@Lover << @Graveyard_Inn_Lover_SHIFT); -// return; - -// S_Update_Mask_Woman: -// set QUEST_Graveyard_Inn, -// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Woman_MASK)) -// | (@woman << @Graveyard_Inn_Woman_SHIFT); -// return; -// } - 027-2.gat,75,29,0 script Archibald 306,{ //the broken grammar is intentional mes "[Archibald]"; diff --git a/world/map/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt index 844b13b9..c843ceef 100644 --- a/world/map/npc/042-1/_import.txt +++ b/world/map/npc/042-1/_import.txt @@ -1,10 +1,9 @@ -// Map 042-1: +// Map 042-1: // This file is generated automatically. All manually changes will be removed when running the Converter. map: 042-1.gat npc: npc/042-1/_mobs.txt npc: npc/042-1/_warps.txt npc: npc/042-1/hasan.txt npc: npc/042-1/kaan.txt -npc: npc/042-1/malik.txt npc: npc/042-1/npcs.txt npc: npc/042-1/valon.txt diff --git a/world/map/npc/042-1/malik.txt b/world/map/npc/042-1/malik.txt deleted file mode 100644 index 7ebfe289..00000000 --- a/world/map/npc/042-1/malik.txt +++ /dev/null @@ -1,23 +0,0 @@ -//To enable: sed 's_^// __' -i npc/042-1/malik.txt - -// 042-1.gat,105,60,0 script Malik 162,{ - -// menu -// "Reset",-, -// "Test Scorpion Fight", L_Scorp, -// "close",L_Close; -// set hasan, 0; -// set kaan, 0; -// set sorfina, 0; -// set tanisha, 0; -// set maggot, 0; -// set FLAGS, FLAGS & ~FLAG_TUTORIAL_DONE; -// L_Close: -// close; - -// L_Scorp: -// set sorfina, 4; -// set kaan, 4; -// set hasan, 3; -// close; -// } -- cgit v1.2.3-60-g2f50