From 072711d5c99fb2ff41b0ce0995194d05b316ae59 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 10 Oct 2021 14:33:56 -0300 Subject: Mirror Lake IDs changed --- npc/009-8/celestia.txt | 6 +++--- npc/013-2/notes.txt | 4 ++-- npc/013-2/wizard.txt | 6 +++--- npc/017-4/waric.txt | 2 +- npc/029-2/morgan.txt | 2 +- npc/031-2/angelaHouse.txt | 12 ++++++------ npc/048-2/sageNikolai.txt | 6 +++--- npc/functions/vault.txt | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/npc/009-8/celestia.txt b/npc/009-8/celestia.txt index 53e739b5..81014cdb 100644 --- a/npc/009-8/celestia.txt +++ b/npc/009-8/celestia.txt @@ -43,7 +43,7 @@ L_MainMenu: menu // else we just show a boring menu "Party! Of course I came out for the party!", L_CameForParty, "I'm sorry, life is much too serious for tea.", L_SrsBsns, - rif(get_nibble(##03_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, + rif(get_nibble(##01_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, "(Walk away)", L_InstaClose; L_EasyQuestMenu: @@ -51,7 +51,7 @@ L_EasyQuestMenu: "Party! Of course I came out for the party!", L_CameForParty, "I'm sorry, life is much too serious for tea.", L_SrsBsns, "Is there anything that I can do to help?", L_OfferHelp, // <= this will start the first quest - rif(get_nibble(##03_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, + rif(get_nibble(##01_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, "(Walk away)", L_InstaClose; L_AdvQuestMenu: @@ -59,7 +59,7 @@ L_AdvQuestMenu: "Party! Of course I came out for the party!", L_CameForParty, "I'm sorry, life is much too serious for tea.", L_SrsBsns, "I heard you were looking for help from experienced adventurers...", L_Scared, // <= this will start the adv quest - rif(get_nibble(##03_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, + rif(get_nibble(##01_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, "(Walk away)", L_InstaClose; L_CameForParty: diff --git a/npc/013-2/notes.txt b/npc/013-2/notes.txt index 06f64719..86acb008 100644 --- a/npc/013-2/notes.txt +++ b/npc/013-2/notes.txt @@ -13,11 +13,11 @@ 013-2,38,20,0 script Saying#wiz NPC400,{ mes "The early bird catcheth the worm."; if (!getvaultid()) close; // Close this mirror lake - if (get_nibble(##03_TMWQUEST, 0) < 2) close; // Not yet authorized + if (get_nibble(##01_TMWQUEST, 0) < 2) close; // Not yet authorized mesc l("Should we recite this backward to travel to a different world? If yes, thinking on what?"); select l("Leave it be."), - rif(get_nibble(##03_TMWQUEST, 0) >= 2, l("Think on Mouboos and Cindy problems")); + rif(get_nibble(##01_TMWQUEST, 0) >= 2, l("Think on Mouboos and Cindy problems")); mes ""; switch (@menu) { case 2: MirrorLakeSendTo(MLP_MOUBOOTAUR, 0); break; diff --git a/npc/013-2/wizard.txt b/npc/013-2/wizard.txt index 5bef35a4..88d7626c 100644 --- a/npc/013-2/wizard.txt +++ b/npc/013-2/wizard.txt @@ -24,7 +24,7 @@ L_Start: menu "Thanks, that's very kind of you!", L_Thanks, "Can you teach me magic?", L_TeachRude, - rif(get_nibble(##03_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, + rif(get_nibble(##01_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, "Oh, shut up!", L_ShutUp; L_TeachRude: @@ -138,7 +138,7 @@ L_Agree: goto L_close; L_VaultQuest: - .@q = get_nibble(##03_TMWQUEST, 0); + .@q = get_nibble(##01_TMWQUEST, 0); mes ""; mesc l("%s raises an eyebrow at you.", strnpcinfo(1)); if (.@q == 1) { @@ -177,7 +177,7 @@ L_VaultQuest: mesn; mesq l("Oh yes, there are worlds like this one where you can find even Yetis involved in politics. Really impressing."); next; - set_nibble(##03_TMWQUEST, 0, 2); + set_nibble(##01_TMWQUEST, 0, 2); .@q = 2; } if (.@q == 2) { diff --git a/npc/017-4/waric.txt b/npc/017-4/waric.txt index d1529aee..c8bca4a7 100644 --- a/npc/017-4/waric.txt +++ b/npc/017-4/waric.txt @@ -319,7 +319,7 @@ L_MoreMagic: next; menu "Can you tell me the invocations for the spells you taught me again?", L_Next8, - rif(get_nibble(##03_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, + rif(get_nibble(##01_TMWQUEST, 0), l("Actually, have you ever heard of Yeti's kidnapping little girls?")), L_VaultQuest, "Thanks, master. I will come back later", L_close; L_VaultQuest: diff --git a/npc/029-2/morgan.txt b/npc/029-2/morgan.txt index 1b76a690..8c176319 100644 --- a/npc/029-2/morgan.txt +++ b/npc/029-2/morgan.txt @@ -125,7 +125,7 @@ L_LearningDone: mesc l("To cast a spell open the skill window, select the spell you wish to use, and press the %s button.", b(l("Use"))); mesq l("I've taught you all I can for now. You should search for the Mana Seed, I've heard there was one north west of Hurnscald."); learnskill SKILL_CONFRINGO; - if (get_nibble(##03_TMWQUEST, 0) == 1) { + if (get_nibble(##01_TMWQUEST, 0) == 1) { mes ""; select l("Gotcha."), diff --git a/npc/031-2/angelaHouse.txt b/npc/031-2/angelaHouse.txt index 695e0e77..c60c48a4 100644 --- a/npc/031-2/angelaHouse.txt +++ b/npc/031-2/angelaHouse.txt @@ -88,7 +88,7 @@ L_close: close; L_Hello: - if (getvaultid() && get_nibble(##03_TMWQUEST, 0) <= 3) goto L_VaultQuest; + if (getvaultid() && get_nibble(##01_TMWQUEST, 0) <= 3) goto L_VaultQuest; closeclientdialog; close; @@ -108,15 +108,15 @@ L_VaultQuest: next; select l("I'll be back later."), - rif(get_nibble(##03_TMWQUEST, 0) == 0, l("Sure, I'll ask them.")), - rif(get_nibble(##03_TMWQUEST, 0) == 3, l("[Tell her the truth]")), - rif(get_nibble(##03_TMWQUEST, 0) == 3, l("[Make up an excuse]")); + rif(get_nibble(##01_TMWQUEST, 0) == 0, l("Sure, I'll ask them.")), + rif(get_nibble(##01_TMWQUEST, 0) == 3, l("[Tell her the truth]")), + rif(get_nibble(##01_TMWQUEST, 0) == 3, l("[Make up an excuse]")); mes ""; switch (@menu) { case 2: mesn; mesq l("Wonderful! Please be careful out there."); - set_nibble(##03_TMWQUEST, 0, 1); + set_nibble(##01_TMWQUEST, 0, 1); break; case 3: mesc l("%s faints.", strnpcinfo(1)); @@ -128,7 +128,7 @@ L_VaultQuest: next; mesn; mesq l("I'm afraid I don't have anything of value to reward you with, but some %s which my husband was saving for a quest or other. You can have them. Cindy is more important than a quest.", getitemlink(TreasureKey)); - set_nibble(##03_TMWQUEST, 0, 4); + set_nibble(##01_TMWQUEST, 0, 4); getitem TreasureKey, rand2(15, 25); break; } diff --git a/npc/048-2/sageNikolai.txt b/npc/048-2/sageNikolai.txt index 1013db10..533d1875 100644 --- a/npc/048-2/sageNikolai.txt +++ b/npc/048-2/sageNikolai.txt @@ -271,8 +271,8 @@ L_Full_Inv: L_Done: mesn; mesq l("Thanks for all of your help."); - if ((get_nibble(##03_TMWQUEST, 0) == 2) && - (##01_MLWORLD & MLP_TMW_YETIKING) && + if ((get_nibble(##01_TMWQUEST, 0) == 2) && + (##02_MLWORLD & MLP_TMW_YETIKING) && getvaultid()) goto L_VaultQuest; goto L_close; @@ -342,7 +342,7 @@ L_VaultQuest: if (@menu == 3) .@it = WoodenStaff; inventoryplace .@it, 1; getitem .@it, 1; - set_nibble(##03_TMWQUEST, 0, 3); + set_nibble(##01_TMWQUEST, 0, 3); getvaultexp(50); mesn; mesq l("Here, take this %s. Tell Angela just that I've heard about it and I'll investigate, and she has nothing to worry about.", getitemlink(.@it)); diff --git a/npc/functions/vault.txt b/npc/functions/vault.txt index b02d113b..4f45c871 100644 --- a/npc/functions/vault.txt +++ b/npc/functions/vault.txt @@ -85,9 +85,9 @@ function script vaultOnLogout { .@api$=json_encode("UID", ##VAULT, "GID", getcharid(3), "VAR1N", "TMWQUEST", - "VAR1V", ##03_TMWQUEST, + "VAR1V", ##01_TMWQUEST, "VAR2N", "TMWGLOBAL", - "VAR2V", ##03_TMWGLOBAL, + "VAR2V", ##01_TMWGLOBAL, "VEXP", ##VAULT_EXP, "GOTO", ##VAULT_GOTO, "MLTO", ##VAULT_MLTO); -- cgit v1.2.3-60-g2f50