From 3cc6985ebc8b16be6b5ce3fdafa16a6272428a45 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 23 Jul 2021 20:41:39 -0300 Subject: Fix any remaining broken warps and some more translatable strings. Close serverdata#32 --- npc/011-3/hermit.txt | 32 +++++++++++++++++--------------- npc/012-4/_warps.txt | 2 +- npc/013-2/notes.txt | 32 ++++++++++++++++++-------------- npc/015-3/barrier.txt | 24 +++++++++++------------- npc/099-1/_warps.txt | 30 +++++++++++++++--------------- npc/099-2/_warps.txt | 6 +++--- npc/099-6/_warps.txt | 6 +++--- 7 files changed, 68 insertions(+), 64 deletions(-) diff --git a/npc/011-3/hermit.txt b/npc/011-3/hermit.txt index 8ea9017b..718d3302 100644 --- a/npc/011-3/hermit.txt +++ b/npc/011-3/hermit.txt @@ -1,46 +1,48 @@ 011-3,45,33,0 script Arkim NPC116,{ - mes "[Arkim the Hermit]"; - mes "\"Do you want to go back outside?\""; + mesn l("Arkim the Hermit"); + mesq l("Do you want to go back outside?"); if (@knowhermitstory == 1) goto L_Short_Menu; menu - "Yes, please!", L_Sure, - "Not yet.", L_close, - "Actually... Why do you live here?", L_Interested; + l("Yes, please!"), L_Sure, + l("Not yet."), L_close, + l("Actually... Why do you live here?"), L_Interested; L_Short_Menu: menu - "Yes, please!", L_Sure, - "Not yet.", L_close, - "What was that deal you were offering?", L_Quest; + l("Yes, please!"), L_Sure, + l("Not yet."), L_close, + l("What was that deal you were offering?"), L_Quest; L_Sure: - warp "011-1", 60, 95; + warp "011-1", 58, 93; + closeclientdialog; close; L_Interested: - mes "[Arkim the Hermit]"; + mesn l("Arkim the Hermit"); mes "\"Oh my, never really thought about it!\""; next; - mes "[Arkim the Hermit]"; + mesn l("Arkim the Hermit"); mes "\"I guess mostly I enjoy experimenting with the bats here.\""; menu "I see...", L_close, "What type of experimenting?", L_Experiment; L_Experiment: - mes "[Arkim the Hermit]"; + mesn l("Arkim the Hermit"); mes "\"Never really thought about it either...\""; next; mes "You watch as the hermit's old, lazy eyes open wide, and the old man comes alive with energy."; next; - mes "[Arkim the Hermit]"; + mesn l("Arkim the Hermit"); mes "\"I GUESS I REALLY LIKE CUTTING THEM UP TO SEE HOW THEY WORK!! HAHAHA!\""; menu "YOU'RE CRAZY!", L_close, "Right... me too! Can I help?", L_Quest; L_close: + closeclientdialog; close; L_Quest: @@ -58,7 +60,7 @@ L_Quest: next; - mes "[Arkim the Hermit]"; - mes "\"And remember: never lend your toothbrush to a slime!\""; + mesn l("Arkim the Hermit"); + mesq l("And remember: never lend your toothbrush to a slime!"); close; } diff --git a/npc/012-4/_warps.txt b/npc/012-4/_warps.txt index c5d2fed3..408e5b25 100644 --- a/npc/012-4/_warps.txt +++ b/npc/012-4/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 012-4: Terranite Cave warps -012-4,193,58,0 warp #012-4_193_58 0,0,012-3,448,62 +012-4,193,58,0 warp #012-4_193_58 0,0,012-3,458,72 012-4,363,26,0 warp #012-4_363_26 0,0,012-4,474,187 012-4,474,188,0 warp #012-4_474_188 0,0,012-4,363,27 diff --git a/npc/013-2/notes.txt b/npc/013-2/notes.txt index 5fba597b..0692cb6e 100644 --- a/npc/013-2/notes.txt +++ b/npc/013-2/notes.txt @@ -42,9 +42,9 @@ next; mes "You think: \"Huh?\""; next; - mes "The spell fulfills its inevitable purpose..."; + mes l("The spell fulfills its inevitable purpose..."); next; - @dest = rand(BaseLevel); + @dest = rand2(BaseLevel); if (@dest < 10) goto L_PlaceOne; if ((@dest >= 10) && (@dest <= 50)) @@ -65,16 +65,17 @@ L_PlaceThree: L_close: @dest = 0; + closeclientdialog; close; } 013-2,27,24,0 script Spell#wiz2 NPC400,{ mes "You read: \"You must not fear, for it is the mind-killer. That and sharp pointy things.\""; next; - mes "You feel the floor disappear below your feet..."; + mes l("You feel the floor disappear below your feet..."); next; callfunc "MiriamCheat"; - @dest = rand(BaseLevel); + @dest = rand2(BaseLevel); if (@dest < 10) goto L_PlaceOne; if ((@dest >= 10) && (@dest <= 50)) @@ -101,9 +102,9 @@ L_close: 013-2,25,27,0 script Spell#wiz3 NPC400,{ mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\""; next; - mes "You feel yourself getting lighter..."; + mesq l("You feel yourself getting lighter..."); next; - @dest = rand(BaseLevel); + @dest = rand2(BaseLevel); if (@dest < 10) goto L_FriendlyPlace; if ((@dest >= 10) && (@dest <= 50)) @@ -124,15 +125,16 @@ L_Cave: L_close: @dest = 0; + closeclientdialog; close; } 013-2,27,27,0 script Spell#wiz4 NPC400,{ mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\""; next; - mes "The world around you slowly dissolves..."; + mes l("The world around you slowly dissolves..."); next; - @dest = rand(BaseLevel); + @dest = rand2(BaseLevel); if (@dest < 10) goto L_PlaceOne; if ((@dest >= 10) && (@dest <= 50)) @@ -144,7 +146,7 @@ L_PlaceOne: goto L_close; L_PlaceTwo: - warp "001-2",30,29; + warp "001-2",104,40; goto L_close; L_PlaceThree: @@ -153,15 +155,16 @@ L_PlaceThree: L_close: @dest = 0; + closeclientdialog; close; } 013-2,26,28,0 script Spell#wiz5 NPC400,{ mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\""; next; - mes "For a moment everything turns black..."; + mes l("For a moment everything turns black..."); next; - @dest = rand(BaseLevel); + @dest = rand2(BaseLevel); if (@dest < 10) goto L_PlaceOne; if ((@dest >= 10) && (@dest <= 50)) @@ -173,7 +176,7 @@ L_PlaceOne: goto L_close; L_PlaceTwo: - warp "013-3",134,54; + warp "013-3",122,91; goto L_close; L_PlaceThree: @@ -182,6 +185,7 @@ L_PlaceThree: L_close: @dest = 0; + closeclientdialog; close; } @@ -197,8 +201,8 @@ L_close: 013-2,28,29,0 script Spell#wiz7 NPC400,{ mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\""; next; - mes "You suddenly feel naked; you ARE naked!"; + mes l("You suddenly feel naked; you ARE naked!"); next; - nude; + nude(); close; } diff --git a/npc/015-3/barrier.txt b/npc/015-3/barrier.txt index 320025f6..542e945c 100644 --- a/npc/015-3/barrier.txt +++ b/npc/015-3/barrier.txt @@ -1,7 +1,7 @@ 015-3,31,42,0 script #CatCaveBarrier NPC45,1,1,{ - @Hiss = ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); - if (getequipid(equip_head) != 1217 + .@Hiss = ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); + if (getequipid(equip_head) != CatEars && (getequipid(equip_head) > 0 || getequipid(equip_shield) > 0 || getequipid(equip_hand1) > 0 @@ -14,25 +14,23 @@ || getequipid(equip_legs) > 0)) goto L_Not_Naked; - if (@Hiss != 2) + if (.@Hiss != 2) mes "\"Hissss...\""; - @Hiss = 2; + .@Hiss = 2; callsub S_Update_Hiss; - goto L_close; + close; L_Not_Naked: warp "015-1", 60, 32; - @Hiss = 1; + .@Hiss = 1; callsub S_Update_Hiss; - mes "\"GRAAUWL! Hissss...\""; - mes "Scared of what you hear, you flee back outside."; - goto L_close; - -L_close: - @Hiss = 0; + mesn "???"; + mesq l("GRAAUWL! Hissss..."); + mes ""; + mesc l("Scared of what you hear, you flee back outside."); close; S_Update_Hiss: - Katze = (Katze & ~(NIBBLE_1_MASK)) | (@Hiss << NIBBLE_1_SHIFT); + Katze = (Katze & ~(NIBBLE_1_MASK)) | (.@Hiss << NIBBLE_1_SHIFT); return; } diff --git a/npc/099-1/_warps.txt b/npc/099-1/_warps.txt index d2c87956..7e630a9f 100644 --- a/npc/099-1/_warps.txt +++ b/npc/099-1/_warps.txt @@ -1,25 +1,25 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 099-1: Keshlam's Adventurer's Guild warps -099-1,49,30,0 warp #099-1_49_30 0,0,099-2,45,27 +099-1,49,30,0 warp #099-1_49_30 0,0,099-2,45,37 099-1,97,30,0 warp #099-1_97_30 0,0,099-2,79,36 099-1,125,22,0 warp #099-1_125_22 0,0,099-2,110,36 099-1,111,150,0 warp #099-1_111_150 0,0,099-2,141,36 099-1,40,129,0 warp #099-1_40_129 0,0,099-2,45,64 099-1,117,99,0 warp #099-1_117_99 0,0,099-2,79,64 099-1,139,131,0 warp #099-1_139_131 0,0,099-3,72,26 -099-1,132,140,0 warp #099-1_132_140 0,0,099-2,111,64 +099-1,132,140,0 warp #099-1_132_140 0,0,099-2,110,64 099-1,84,128,0 warp #099-1_84_128 0,0,099-2,141,64 099-1,84,86,0 warp #099-1_84_86 0,0,099-2,45,90 099-1,62,65,0 warp #099-1_62_65 0,0,099-2,79,90 -099-1,112,58,0 warp #099-1_112_58 0,0,099-2,111,90 +099-1,112,58,0 warp #099-1_112_58 0,0,099-2,110,90 099-1,35,91,0 warp #099-1_35_91 0,0,099-2,141,90 099-1,62,139,0 warp #099-1_62_139 0,0,099-2,45,116 -099-1,133,75,0 warp #099-1_133_75 0,0,099-2,80,116 -099-1,151,95,0 warp #099-1_151_95 0,0,099-2,111,116 +099-1,133,75,0 warp #099-1_133_75 0,0,099-2,79,116 +099-1,151,95,0 warp #099-1_151_95 0,0,099-2,110,116 099-1,92,72,0 warp #099-1_92_72 0,0,099-2,141,116 -099-1,67,106,0 warp #099-1_67_106 0,0,099-2,46,147 -099-1,122,38,0 warp #099-1_122_38 0,0,099-2,80,147 -099-1,140,58,0 warp #099-1_140_58 0,0,099-2,112,147 +099-1,67,106,0 warp #099-1_67_106 0,0,099-2,45,147 +099-1,122,38,0 warp #099-1_122_38 0,0,099-2,79,147 +099-1,140,58,0 warp #099-1_140_58 0,0,099-2,110,147 099-1,117,119,0 warp #099-1_117_119 0,0,099-2,141,147 099-1,68,30,0 warp #099-1_68_30 0,0,099-3,49,78 099-1,96,39,0 warp #099-1_96_39 0,0,099-3,55,78 @@ -37,29 +37,29 @@ 099-1,148,58,0 warp #099-1_148_58 0,0,099-1,55,45 099-1,41,30,0 warp #099-1_41_30 0,0,099-6,141,147 099-1,59,30,0 warp #099-1_59_30 0,0,099-1,55,45 -099-1,78,30,0 warp #099-1_78_30 0,0,099-6,112,147 +099-1,78,30,0 warp #099-1_78_30 0,0,099-6,110,147 099-1,87,30,0 warp #099-1_87_30 0,0,099-1,55,45 099-1,105,30,0 warp #099-1_105_30 0,0,099-6,79,36 099-1,117,22,0 warp #099-1_117_22 0,0,099-1,55,45 -099-1,117,45,0 warp #099-1_117_45 0,0,099-6,46,147 +099-1,117,45,0 warp #099-1_117_45 0,0,099-6,45,147 099-1,124,45,0 warp #099-1_124_45 0,0,099-6,110,36 099-1,128,38,0 warp #099-1_128_38 0,0,099-6,141,116 099-1,119,58,0 warp #099-1_119_58 0,0,099-1,55,45 -099-1,102,58,0 warp #099-1_102_58 0,0,099-6,111,116 +099-1,102,58,0 warp #099-1_102_58 0,0,099-6,110,116 099-1,102,39,0 warp #099-1_102_39 0,0,099-1,55,45 -099-1,89,39,0 warp #099-1_89_39 0,0,099-6,80,147 -099-1,115,75,0 warp #099-1_115_75 0,0,099-6,80,116 +099-1,89,39,0 warp #099-1_89_39 0,0,099-6,79,147 +099-1,115,75,0 warp #099-1_115_75 0,0,099-6,79,116 099-1,98,72,0 warp #099-1_98_72 0,0,099-6,45,37 099-1,86,72,0 warp #099-1_86_72 0,0,099-6,45,116 099-1,125,75,0 warp #099-1_125_75 0,0,099-1,55,45 099-1,70,65,0 warp #099-1_70_65 0,0,099-1,55,45 099-1,54,65,0 warp #099-1_54_65 0,0,099-6,141,90 -099-1,47,65,0 warp #099-1_47_65 0,0,099-6,111,90 +099-1,47,65,0 warp #099-1_47_65 0,0,099-6,110,90 099-1,45,94,0 warp #099-1_45_94 0,0,099-6,79,90 099-1,60,118,0 warp #099-1_60_118 0,0,099-6,45,90 099-1,49,129,0 warp #099-1_49_129 0,0,099-1,55,45 099-1,49,150,0 warp #099-1_49_150 0,0,099-6,141,63 -099-1,78,143,0 warp #099-1_78_143 0,0,099-6,111,64 +099-1,78,143,0 warp #099-1_78_143 0,0,099-6,110,64 099-1,104,131,0 warp #099-1_104_131 0,0,099-6,79,64 099-1,145,140,0 warp #099-1_145_140 0,0,099-1,55,45 099-1,103,119,0 warp #099-1_103_119 0,0,099-6,45,64 diff --git a/npc/099-2/_warps.txt b/npc/099-2/_warps.txt index d6630c33..3d89bcfa 100644 --- a/npc/099-2/_warps.txt +++ b/npc/099-2/_warps.txt @@ -4,15 +4,15 @@ 099-2,79,37,0 warp #099-2_79_37 0,0,099-1,97,32 099-2,110,37,0 warp #099-2_110_37 0,0,099-1,125,24 099-2,141,37,0 warp #099-2_141_37 0,0,099-1,111,152 -099-2,45,65,0 warp #099-2_45_65 0,0,099-1,40,131 +099-2,45,65,0 warp #099-2_45_65 0,0,099-1,40,130 099-2,79,65,0 warp #099-2_79_65 0,0,099-1,117,101 099-2,111,65,0 warp #099-2_111_65 0,0,099-1,132,142 099-2,141,64,0 warp #099-2_141_64 0,0,099-1,84,130 -099-2,45,91,0 warp #099-2_45_91 0,0,099-1,84,88 +099-2,45,91,0 warp #099-2_45_91 0,0,099-1,84,87 099-2,79,91,0 warp #099-2_79_91 0,0,099-1,62,67 099-2,111,91,0 warp #099-2_111_91 0,0,099-1,112,60 099-2,141,91,0 warp #099-2_141_91 0,0,099-1,35,93 -099-2,45,117,0 warp #099-2_45_117 0,0,099-1,69,145 +099-2,45,117,0 warp #099-2_45_117 0,0,099-1,62,140 099-2,80,117,0 warp #099-2_80_117 0,0,099-1,133,77 099-2,111,117,0 warp #099-2_111_117 0,0,099-1,151,94 099-2,141,117,0 warp #099-2_141_117 0,0,099-1,92,74 diff --git a/npc/099-6/_warps.txt b/npc/099-6/_warps.txt index 066fcd62..ae398bb5 100644 --- a/npc/099-6/_warps.txt +++ b/npc/099-6/_warps.txt @@ -4,15 +4,15 @@ 099-6,79,37,0 warp #099-6_79_37 0,0,099-1,97,32 099-6,110,37,0 warp #099-6_110_37 0,0,099-1,125,24 099-6,141,37,0 warp #099-6_141_37 0,0,099-1,111,152 -099-6,45,65,0 warp #099-6_45_65 0,0,099-1,40,131 +099-6,45,65,0 warp #099-6_45_65 0,0,099-1,40,130 099-6,79,65,0 warp #099-6_79_65 0,0,099-1,117,101 099-6,111,65,0 warp #099-6_111_65 0,0,099-1,132,142 099-6,141,64,0 warp #099-6_141_64 0,0,099-1,84,130 -099-6,45,91,0 warp #099-6_45_91 0,0,099-1,84,88 +099-6,45,91,0 warp #099-6_45_91 0,0,099-1,84,87 099-6,79,91,0 warp #099-6_79_91 0,0,099-1,62,67 099-6,111,91,0 warp #099-6_111_91 0,0,099-1,112,60 099-6,141,91,0 warp #099-6_141_91 0,0,099-1,54,67 -099-6,45,117,0 warp #099-6_45_117 0,0,099-1,69,145 +099-6,45,117,0 warp #099-6_45_117 0,0,099-1,62,140 099-6,80,117,0 warp #099-6_80_117 0,0,099-1,133,77 099-6,111,117,0 warp #099-6_111_117 0,0,099-1,151,94 099-6,141,117,0 warp #099-6_141_117 0,0,099-1,92,74 -- cgit v1.2.3-60-g2f50