diff options
141 files changed, 215 insertions, 174 deletions
diff --git a/client-data b/client-data -Subproject 1f160054f89428ce3ef9159661d9446e1cdc9a5 +Subproject 506c8c1593fa09b80c9735012df0d3e4064c8d3 diff --git a/tools b/tools -Subproject 87c48200ec920eee107c2861cca30cbcf058d90 +Subproject 2b168ab6b869de1dc257d8152da537d802dd7c3 diff --git a/world/map/news.d/48-v2015.05.04.txt b/world/map/news.d/48-v2015.05.04.txt new file mode 100644 index 00000000..4fb1744d --- /dev/null +++ b/world/map/news.d/48-v2015.05.04.txt @@ -0,0 +1,38 @@ +{title:Double Header} +{date:2015-05-04} + +This update includes bug fixes, quest logs for Candor, +and a new constable in Hurnscald. Characters can also now +use @pvp to toggle their PvP status on any map – at any time. + +Release Notes v15.4.20 +{ul} +{li} Spam warnings will now appear in General chat tab{/li} +{li} Players can now use @pvp to enter pvp mode which +allows to attack other players in pvp mode. Basically +it's pvp from any map with anyone (if they have it enabled) +at any time.{/li} +{li} The gm commands @killer and @killable have been removed + in favor of @charpvp{/li} +{li} GMs can now increase and decrease the rate at which + exp is obtained{/li} +{li} The chest in the Illia quest now displays the correct + item. (a bug previously made it always display bull helm){/li} +{li} Log Heads, Snails, Pinkies, Butterflies, + House Maggots and Squirrels are (a little) more balanced{/li} +{li} The fight club is now fixed{/li} +{li} The well in Nivalis has been revamped{/li} +{/ul} + +Release Notes v15.5.04 +{ul} +{li} Various updates to the dialog of, well, various npcs.{/li} +{li} Quest log for candor island quests{/li} +{li} New gm command @npc{/li} +{li} Sex can now be changed without being disconnected{/li} +{li} New constable in Hurnscald{/li} +{/ul} + +Read More: {link:http://ow.ly/Ms3eG} + +{author:TMW Development Team} diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt index 92c57e45..6fc46da5 100644 --- a/world/map/npc/001-1/_mobs.txt +++ b/world/map/npc/001-1/_mobs.txt @@ -8,7 +8,7 @@ 001-1,86,84,65,55|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033 -001-1,0,0,0|script|Mob001-1|-1 +001-1,0,0,0|script|Mob001-1|32767 { end; diff --git a/world/map/npc/001-2/_mobs.txt b/world/map/npc/001-2/_mobs.txt index 507c59c5..167e1f2e 100644 --- a/world/map/npc/001-2/_mobs.txt +++ b/world/map/npc/001-2/_mobs.txt @@ -3,7 +3,7 @@ -001-2,0,0,0|script|Mob001-2|-1 +001-2,0,0,0|script|Mob001-2|32767 { end; } diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt index 3064369a..1c76eac9 100644 --- a/world/map/npc/001-3/_mobs.txt +++ b/world/map/npc/001-3/_mobs.txt @@ -4,7 +4,7 @@ 001-3,0,0,0,0|monster|Maggot|1002,10,0ms,0ms,Mob001-3::On1002 -001-3,0,0,0|script|Mob001-3|-1 +001-3,0,0,0|script|Mob001-3|32767 { end; diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt index 96070290..19933fab 100644 --- a/world/map/npc/002-1/_mobs.txt +++ b/world/map/npc/002-1/_mobs.txt @@ -16,7 +16,7 @@ 002-1,73,105,20,21|monster|FireGoblin|1011,6,100000ms,30000ms,Mob002-1::On1011 -002-1,0,0,0|script|Mob002-1|-1 +002-1,0,0,0|script|Mob002-1|32767 { end; diff --git a/world/map/npc/002-2/_mobs.txt b/world/map/npc/002-2/_mobs.txt index c099a80f..aad2a871 100644 --- a/world/map/npc/002-2/_mobs.txt +++ b/world/map/npc/002-2/_mobs.txt @@ -3,7 +3,7 @@ -002-2,0,0,0|script|Mob002-2|-1 +002-2,0,0,0|script|Mob002-2|32767 { end; } diff --git a/world/map/npc/002-2/kylian.txt b/world/map/npc/002-2/kylian.txt index c5ed0baf..c546370d 100644 --- a/world/map/npc/002-2/kylian.txt +++ b/world/map/npc/002-2/kylian.txt @@ -39,7 +39,7 @@ // @KylianNTSightSeeing // @KylianNTCasino --|script|#businessmanNTconfig|-1 +-|script|#businessmanNTconfig|32767 { end; diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt index 3d0486b8..963b8e36 100644 --- a/world/map/npc/002-3/_mobs.txt +++ b/world/map/npc/002-3/_mobs.txt @@ -3,7 +3,7 @@ -002-3,0,0,0|script|Mob002-3|-1 +002-3,0,0,0|script|Mob002-3|32767 { end; } diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt index c497e831..0a461429 100644 --- a/world/map/npc/002-4/_mobs.txt +++ b/world/map/npc/002-4/_mobs.txt @@ -17,7 +17,7 @@ 002-4,63,100,2,5|monster|AngryScorpion|1057,3,100000ms,30000ms,Mob002-4::On1057 -002-4,0,0,0|script|Mob002-4|-1 +002-4,0,0,0|script|Mob002-4|32767 { end; diff --git a/world/map/npc/002-5/_mobs.txt b/world/map/npc/002-5/_mobs.txt index 535198fd..c6894850 100644 --- a/world/map/npc/002-5/_mobs.txt +++ b/world/map/npc/002-5/_mobs.txt @@ -20,7 +20,7 @@ 002-5,62,62,5,43|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-5::On1108 -002-5,0,0,0|script|Mob002-5|-1 +002-5,0,0,0|script|Mob002-5|32767 { end; diff --git a/world/map/npc/004-3/_mobs.txt b/world/map/npc/004-3/_mobs.txt index 5fb9ed43..dce2ec02 100644 --- a/world/map/npc/004-3/_mobs.txt +++ b/world/map/npc/004-3/_mobs.txt @@ -10,7 +10,7 @@ 004-3,71,63,7,8|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-3::On1121 -004-3,0,0,0|script|Mob004-3|-1 +004-3,0,0,0|script|Mob004-3|32767 { end; diff --git a/world/map/npc/004-4/_mobs.txt b/world/map/npc/004-4/_mobs.txt index 113c204f..525a7215 100644 --- a/world/map/npc/004-4/_mobs.txt +++ b/world/map/npc/004-4/_mobs.txt @@ -12,7 +12,7 @@ 004-4,34,88,10,4|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121 -004-4,0,0,0|script|Mob004-4|-1 +004-4,0,0,0|script|Mob004-4|32767 { end; diff --git a/world/map/npc/004-5/_mobs.txt b/world/map/npc/004-5/_mobs.txt index 808b2608..2d3acc7e 100644 --- a/world/map/npc/004-5/_mobs.txt +++ b/world/map/npc/004-5/_mobs.txt @@ -15,7 +15,7 @@ 004-5,81,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120 -004-5,0,0,0|script|Mob004-5|-1 +004-5,0,0,0|script|Mob004-5|32767 { end; diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt index 0cc8da62..63e58847 100644 --- a/world/map/npc/005-3/_mobs.txt +++ b/world/map/npc/005-3/_mobs.txt @@ -6,7 +6,7 @@ 005-3,58,57,62,57|monster|GiantMaggot|1006,20,100000ms,30000ms,Mob005-3::On1006 -005-3,0,0,0|script|Mob005-3|-1 +005-3,0,0,0|script|Mob005-3|32767 { end; diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt index d2a6f7f0..2288ec92 100644 --- a/world/map/npc/006-1/_mobs.txt +++ b/world/map/npc/006-1/_mobs.txt @@ -24,7 +24,7 @@ 006-1,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010 -006-1,0,0,0|script|Mob006-1|-1 +006-1,0,0,0|script|Mob006-1|32767 { end; diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt index ca317181..f2c454fd 100644 --- a/world/map/npc/006-1/miriam.txt +++ b/world/map/npc/006-1/miriam.txt @@ -209,7 +209,7 @@ L_offer: if (!(getskilllv(SKILL_POOL))) goto L_noskill; menu - "Yes, I look really good in this " +@torso$+ ".",L_TorsoNext; + "Yes, I look really good in this.",L_TorsoNext; L_TorsoNext: mes "[Miriam]"; diff --git a/world/map/npc/006-2/_mobs.txt b/world/map/npc/006-2/_mobs.txt index 25ccb409..13ee9057 100644 --- a/world/map/npc/006-2/_mobs.txt +++ b/world/map/npc/006-2/_mobs.txt @@ -3,7 +3,7 @@ -006-2,0,0,0|script|Mob006-2|-1 +006-2,0,0,0|script|Mob006-2|32767 { end; } diff --git a/world/map/npc/006-3/_mobs.txt b/world/map/npc/006-3/_mobs.txt index db817544..3fa25c29 100644 --- a/world/map/npc/006-3/_mobs.txt +++ b/world/map/npc/006-3/_mobs.txt @@ -29,7 +29,7 @@ 006-3,83,107,13,14|monster|YellowSlime|1007,6,90000ms,30000ms,Mob006-3::On1007 -006-3,0,0,0|script|Mob006-3|-1 +006-3,0,0,0|script|Mob006-3|32767 { end; diff --git a/world/map/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt index b1fedba0..846c9fc5 100644 --- a/world/map/npc/007-1/_mobs.txt +++ b/world/map/npc/007-1/_mobs.txt @@ -12,7 +12,7 @@ 007-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob007-1::On1055 -007-1,0,0,0|script|Mob007-1|-1 +007-1,0,0,0|script|Mob007-1|32767 { end; diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt index 6f5e65be..33a425e3 100644 --- a/world/map/npc/008-1/_mobs.txt +++ b/world/map/npc/008-1/_mobs.txt @@ -12,7 +12,7 @@ 008-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob008-1::On1055 -008-1,0,0,0|script|Mob008-1|-1 +008-1,0,0,0|script|Mob008-1|32767 { end; diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index 51c901a3..a9ba5963 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -135,7 +135,7 @@ L_End1: } -008-1,59,38,0|script|#AnnualEaster|-1 +008-1,59,38,0|script|#AnnualEaster|32767 { end; diff --git a/world/map/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt index 32014688..4c902627 100644 --- a/world/map/npc/009-1/_import.txt +++ b/world/map/npc/009-1/_import.txt @@ -3,6 +3,7 @@ map: 009-1 npc: npc/009-1/_mobs.txt npc: npc/009-1/_warps.txt +npc: npc/009-1/constable.txt npc: npc/009-1/dock.txt npc: npc/009-1/guide.txt npc: npc/009-1/jack.txt diff --git a/world/map/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt index bab67b1b..247a3797 100644 --- a/world/map/npc/009-1/_mobs.txt +++ b/world/map/npc/009-1/_mobs.txt @@ -8,7 +8,7 @@ 009-1,0,0,0,0|monster|Butterfly|1055,5,30ms,20ms,Mob009-1::On1055 -009-1,0,0,0|script|Mob009-1|-1 +009-1,0,0,0|script|Mob009-1|32767 { end; diff --git a/world/map/npc/009-1/constable.txt b/world/map/npc/009-1/constable.txt new file mode 100644 index 00000000..c82a8b21 --- /dev/null +++ b/world/map/npc/009-1/constable.txt @@ -0,0 +1,11 @@ +// + +009-1,52,33,0|script|Constable Bob|419 +{ + mes "[Constable Hank Atkins]"; + mes "\"Hello.\""; + mes "\"I've been getting complaints of lawlessness in Hurnscald recently, so I thought I'd come down here myself and explain the rules.\""; + mes "\"Please make sure that you follow them!\""; + callfunc "GameRules"; + close; +} diff --git a/world/map/npc/009-2/_mobs.txt b/world/map/npc/009-2/_mobs.txt index 22518d34..e0b8a1a0 100644 --- a/world/map/npc/009-2/_mobs.txt +++ b/world/map/npc/009-2/_mobs.txt @@ -3,7 +3,7 @@ -009-2,0,0,0|script|Mob009-2|-1 +009-2,0,0,0|script|Mob009-2|32767 { end; } diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt index 6f4be2bd..71726331 100644 --- a/world/map/npc/009-2/airlia.txt +++ b/world/map/npc/009-2/airlia.txt @@ -171,6 +171,7 @@ L_Fetch: mes "[Airlia]"; mes "\"Thank you for helping my father.\""; next; + mes "\"Have you collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "?\""; // Make sure to check if the player has a letter to deliver. // If the check is not made then there is a bug, where the player @@ -179,13 +180,13 @@ L_Fetch: if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER) menu - "You are welcome.", L_Close, - "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward; + "Yes.", L_Fetch_initial_reward, + "No.", L_Close; if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER) menu - "You are welcome.", L_Close, "I have another letter from your father.", L_later_rewards, - "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward; + "Yes.", L_Fetch_initial_reward, + "No.", L_Close; goto L_Close; L_Fetch_initial_reward: @@ -230,15 +231,16 @@ L_Rewarded: mes "[Airlia]"; mes "\"Thank you for your help.\""; next; + mes "\"Have you collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s?\""; if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER) menu - "You are welcome.", L_Close, - "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards; + "Yes.", L_Fetch_later_rewards, + "No.", L_Close; if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER) menu - "You are welcome.", L_Close, "I have another letter from your father.", L_later_rewards, - "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards; + "Yes.", L_Fetch_later_rewards, + "No.", L_Close; goto L_Close; L_Close: diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt index 74852403..ab403a12 100644 --- a/world/map/npc/009-3/_mobs.txt +++ b/world/map/npc/009-3/_mobs.txt @@ -7,7 +7,7 @@ 009-3,145,75,110,151|monster|CaveMaggot|1056,20,100000ms,30000ms,Mob009-3::On1056 -009-3,0,0,0|script|Mob009-3|-1 +009-3,0,0,0|script|Mob009-3|32767 { end; diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt index 64e2c4da..e81f350e 100644 --- a/world/map/npc/009-4/_mobs.txt +++ b/world/map/npc/009-4/_mobs.txt @@ -10,7 +10,7 @@ 009-4,38,116,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002 -009-4,0,0,0|script|Mob009-4|-1 +009-4,0,0,0|script|Mob009-4|32767 { end; diff --git a/world/map/npc/009-5/_mobs.txt b/world/map/npc/009-5/_mobs.txt index 7ba8106a..78d520be 100644 --- a/world/map/npc/009-5/_mobs.txt +++ b/world/map/npc/009-5/_mobs.txt @@ -3,7 +3,7 @@ -009-5,0,0,0|script|Mob009-5|-1 +009-5,0,0,0|script|Mob009-5|32767 { end; } diff --git a/world/map/npc/009-6/_mobs.txt b/world/map/npc/009-6/_mobs.txt index e0437642..adb1e44e 100644 --- a/world/map/npc/009-6/_mobs.txt +++ b/world/map/npc/009-6/_mobs.txt @@ -3,7 +3,7 @@ -009-6,0,0,0|script|Mob009-6|-1 +009-6,0,0,0|script|Mob009-6|32767 { end; } diff --git a/world/map/npc/009-7/_mobs.txt b/world/map/npc/009-7/_mobs.txt index deae9123..bb641d0c 100644 --- a/world/map/npc/009-7/_mobs.txt +++ b/world/map/npc/009-7/_mobs.txt @@ -3,7 +3,7 @@ -009-7,0,0,0|script|Mob009-7|-1 +009-7,0,0,0|script|Mob009-7|32767 { end; } diff --git a/world/map/npc/010-1/_mobs.txt b/world/map/npc/010-1/_mobs.txt index 2536403e..d73c842f 100644 --- a/world/map/npc/010-1/_mobs.txt +++ b/world/map/npc/010-1/_mobs.txt @@ -16,7 +16,7 @@ 010-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob010-1::On1055 -010-1,0,0,0|script|Mob010-1|-1 +010-1,0,0,0|script|Mob010-1|32767 { end; diff --git a/world/map/npc/010-2/_mobs.txt b/world/map/npc/010-2/_mobs.txt index 258716f7..3b258bd5 100644 --- a/world/map/npc/010-2/_mobs.txt +++ b/world/map/npc/010-2/_mobs.txt @@ -3,7 +3,7 @@ -010-2,0,0,0|script|Mob010-2|-1 +010-2,0,0,0|script|Mob010-2|32767 { end; } diff --git a/world/map/npc/010-2/band.txt b/world/map/npc/010-2/band.txt index 86fec363..cabc31bc 100644 --- a/world/map/npc/010-2/band.txt +++ b/world/map/npc/010-2/band.txt @@ -27,7 +27,7 @@ function|script|DimondBand L_Return: return; } --|script|#BandConfig|-1 +-|script|#BandConfig|32767 { end; diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt index bc35df56..3a0c0ce3 100644 --- a/world/map/npc/011-1/_mobs.txt +++ b/world/map/npc/011-1/_mobs.txt @@ -17,7 +17,7 @@ 011-1,92,44,35,28|monster|Maggot|1002,10,30ms,0ms,Mob011-1::On1002 -011-1,0,0,0|script|Mob011-1|-1 +011-1,0,0,0|script|Mob011-1|32767 { end; diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt index 8854cf53..4e4a504e 100644 --- a/world/map/npc/011-3/_mobs.txt +++ b/world/map/npc/011-3/_mobs.txt @@ -5,7 +5,7 @@ 011-3,0,0,0,0|monster|Silkworm|1035,3,60000ms,30000ms,Mob011-3::On1035 -011-3,0,0,0|script|Mob011-3|-1 +011-3,0,0,0|script|Mob011-3|32767 { end; diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt index 3e91f627..81da8edc 100644 --- a/world/map/npc/011-4/_mobs.txt +++ b/world/map/npc/011-4/_mobs.txt @@ -10,7 +10,7 @@ 011-4,0,0,0,0|monster|Bat|1017,20,180000ms,40000ms,Mob011-4::On1017 -011-4,0,0,0|script|Mob011-4|-1 +011-4,0,0,0|script|Mob011-4|32767 { end; diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt index f86fdd66..4ba7f2ee 100644 --- a/world/map/npc/011-6/_mobs.txt +++ b/world/map/npc/011-6/_mobs.txt @@ -50,7 +50,7 @@ 011-6,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms,Mob011-6::On1056 -011-6,0,0,0|script|Mob011-6|-1 +011-6,0,0,0|script|Mob011-6|32767 { end; diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt index c8f1303c..cdcc8730 100644 --- a/world/map/npc/012-1/_mobs.txt +++ b/world/map/npc/012-1/_mobs.txt @@ -14,7 +14,7 @@ 012-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob012-1::On1055 -012-1,0,0,0|script|Mob012-1|-1 +012-1,0,0,0|script|Mob012-1|32767 { end; diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt index 63eb2996..de4b8edf 100644 --- a/world/map/npc/012-1/injured-mouboo.txt +++ b/world/map/npc/012-1/injured-mouboo.txt @@ -97,6 +97,7 @@ L_pickup_alive: L_give: set @items_nr, 12; setarray @items$, "CactusDrink", "CactusPotion", "ChocolateBar", "Milk", "OrangeCupcake", "RedApple", "Beer", "BottleOfWater", "TinyHealingPotion", "SmallHealingPotion", "MediumHealingPotion", "LargeHealingPotion"; + setarray @itemnames$, "Cactus Drink", "Cactus Potion", "Chocolate Bar", "Milk", "Orange Cupcake", "Red Apple", "Beer", "Bottle of Water", "Tiny Healing Potion", "Small Healing Potion", "Medium Healing Potion", "Large Healing Potion"; setarray @itemeat, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0; setarray @menuItems$, "", "", "", "", "", "", "", "", "", "", "", "", ""; @@ -113,8 +114,7 @@ L_nloop: if (countitem(@k$) == 0) goto L_nloop_skip; - set @name$, getitemlink(@k$); - set @menuItems$[@ct], @name$; + set @menuItems$[@ct], @itemnames$[@n]; set @menuNames$[@ct], @k$; set @choice_eat[@ct], @itemeat[@n]; set @ct, @ct + 1; diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt index e1208d64..354fc289 100644 --- a/world/map/npc/012-3/_mobs.txt +++ b/world/map/npc/012-3/_mobs.txt @@ -19,7 +19,7 @@ 012-3,0,0,0,0|monster|CaveSnake|1021,75,0ms,0ms,Mob012-3::On1021 -012-3,0,0,0|script|Mob012-3|-1 +012-3,0,0,0|script|Mob012-3|32767 { end; diff --git a/world/map/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt index 0f61a3cd..e1a4a259 100644 --- a/world/map/npc/012-4/_mobs.txt +++ b/world/map/npc/012-4/_mobs.txt @@ -67,7 +67,7 @@ 012-4,91,180,23,10|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012 -012-4,0,0,0|script|Mob012-4|-1 +012-4,0,0,0|script|Mob012-4|32767 { end; diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt index e3492192..7d2efa88 100644 --- a/world/map/npc/013-1/_mobs.txt +++ b/world/map/npc/013-1/_mobs.txt @@ -18,7 +18,7 @@ 013-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob013-1::On1055 -013-1,0,0,0|script|Mob013-1|-1 +013-1,0,0,0|script|Mob013-1|32767 { end; diff --git a/world/map/npc/013-2/_mobs.txt b/world/map/npc/013-2/_mobs.txt index be64f4ab..82f242a0 100644 --- a/world/map/npc/013-2/_mobs.txt +++ b/world/map/npc/013-2/_mobs.txt @@ -3,7 +3,7 @@ -013-2,0,0,0|script|Mob013-2|-1 +013-2,0,0,0|script|Mob013-2|32767 { end; } diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt index b0f66b65..088e2c72 100644 --- a/world/map/npc/013-3/_mobs.txt +++ b/world/map/npc/013-3/_mobs.txt @@ -31,7 +31,7 @@ 013-3,67,46,2,1|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023 -013-3,0,0,0|script|Mob013-3|-1 +013-3,0,0,0|script|Mob013-3|32767 { end; diff --git a/world/map/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt index 751a04cf..862d1c19 100644 --- a/world/map/npc/014-1/_mobs.txt +++ b/world/map/npc/014-1/_mobs.txt @@ -19,7 +19,7 @@ 014-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob014-1::On1055 -014-1,0,0,0|script|Mob014-1|-1 +014-1,0,0,0|script|Mob014-1|32767 { end; diff --git a/world/map/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt index cc32d1da..ebadbf58 100644 --- a/world/map/npc/014-3/_mobs.txt +++ b/world/map/npc/014-3/_mobs.txt @@ -4,7 +4,7 @@ 014-3,0,0,0,0|monster|Bat|1017,50,0ms,0ms,Mob014-3::On1017 -014-3,0,0,0|script|Mob014-3|-1 +014-3,0,0,0|script|Mob014-3|32767 { end; diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt index 810a4bd8..cad191f2 100644 --- a/world/map/npc/015-1/_mobs.txt +++ b/world/map/npc/015-1/_mobs.txt @@ -13,7 +13,7 @@ 015-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob015-1::On1029 -015-1,0,0,0|script|Mob015-1|-1 +015-1,0,0,0|script|Mob015-1|32767 { end; diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt index 03f2627c..1b205735 100644 --- a/world/map/npc/015-3/_mobs.txt +++ b/world/map/npc/015-3/_mobs.txt @@ -7,7 +7,7 @@ 015-3,40,19,1,1|monster|Spider|1012,1,100000ms,30000ms,Mob015-3::On1012 -015-3,0,0,0|script|Mob015-3|-1 +015-3,0,0,0|script|Mob015-3|32767 { end; diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt index 8777b2a4..58b33a9d 100644 --- a/world/map/npc/016-1/_mobs.txt +++ b/world/map/npc/016-1/_mobs.txt @@ -13,7 +13,7 @@ 016-1,0,0,0,0|monster|Silkworm|1035,7,150000ms,7000ms,Mob016-1::On1035 -016-1,0,0,0|script|Mob016-1|-1 +016-1,0,0,0|script|Mob016-1|32767 { end; diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt index 79693ffa..fe1c40b4 100644 --- a/world/map/npc/017-1/_mobs.txt +++ b/world/map/npc/017-1/_mobs.txt @@ -21,7 +21,7 @@ 017-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob017-1::On1038 -017-1,0,0,0|script|Mob017-1|-1 +017-1,0,0,0|script|Mob017-1|32767 { end; diff --git a/world/map/npc/017-2/_mobs.txt b/world/map/npc/017-2/_mobs.txt index 6c094aff..7fbf694f 100644 --- a/world/map/npc/017-2/_mobs.txt +++ b/world/map/npc/017-2/_mobs.txt @@ -3,7 +3,7 @@ -017-2,0,0,0|script|Mob017-2|-1 +017-2,0,0,0|script|Mob017-2|32767 { end; } diff --git a/world/map/npc/017-3/_mobs.txt b/world/map/npc/017-3/_mobs.txt index 1dc64829..c498697b 100644 --- a/world/map/npc/017-3/_mobs.txt +++ b/world/map/npc/017-3/_mobs.txt @@ -3,7 +3,7 @@ -017-3,0,0,0|script|Mob017-3|-1 +017-3,0,0,0|script|Mob017-3|32767 { end; } diff --git a/world/map/npc/017-4/_mobs.txt b/world/map/npc/017-4/_mobs.txt index 12f048ec..920a1db5 100644 --- a/world/map/npc/017-4/_mobs.txt +++ b/world/map/npc/017-4/_mobs.txt @@ -3,7 +3,7 @@ -017-4,0,0,0|script|Mob017-4|-1 +017-4,0,0,0|script|Mob017-4|32767 { end; } diff --git a/world/map/npc/017-9/_mobs.txt b/world/map/npc/017-9/_mobs.txt index 13c93b7b..64e6dd7e 100644 --- a/world/map/npc/017-9/_mobs.txt +++ b/world/map/npc/017-9/_mobs.txt @@ -3,7 +3,7 @@ -017-9,0,0,0|script|Mob017-9|-1 +017-9,0,0,0|script|Mob017-9|32767 { end; } diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt index 7a5cee1e..942a6d09 100644 --- a/world/map/npc/018-1/_mobs.txt +++ b/world/map/npc/018-1/_mobs.txt @@ -30,7 +30,7 @@ 018-1,134,80,14,39|monster|Maggot|1002,15,30ms,0ms,Mob018-1::On1002 -018-1,0,0,0|script|Mob018-1|-1 +018-1,0,0,0|script|Mob018-1|32767 { end; diff --git a/world/map/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt index 8ff2d064..fb451a92 100644 --- a/world/map/npc/018-2/_mobs.txt +++ b/world/map/npc/018-2/_mobs.txt @@ -4,7 +4,7 @@ 018-2,114,21,4,3|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-2::On1007 -018-2,0,0,0|script|Mob018-2|-1 +018-2,0,0,0|script|Mob018-2|32767 { end; diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt index 7ad389b1..46457878 100644 --- a/world/map/npc/018-3/_mobs.txt +++ b/world/map/npc/018-3/_mobs.txt @@ -26,7 +26,7 @@ 018-3,99,99,17,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob018-3::On1056 -018-3,0,0,0|script|Mob018-3|-1 +018-3,0,0,0|script|Mob018-3|32767 { end; diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt index a21c8473..505d18df 100644 --- a/world/map/npc/019-1/_mobs.txt +++ b/world/map/npc/019-1/_mobs.txt @@ -7,7 +7,7 @@ 019-1,0,0,0,0|monster|Santaboo|1112,4,100000ms,30000ms,Mob019-1::On1112 -019-1,0,0,0|script|Mob019-1|-1 +019-1,0,0,0|script|Mob019-1|32767 { end; diff --git a/world/map/npc/019-3/_mobs.txt b/world/map/npc/019-3/_mobs.txt index b452a5a5..26a7771a 100644 --- a/world/map/npc/019-3/_mobs.txt +++ b/world/map/npc/019-3/_mobs.txt @@ -5,7 +5,7 @@ 019-3,0,4,0,0|monster|Bat|1017,50,100000ms,30000ms,Mob019-3::On1017 -019-3,0,0,0|script|Mob019-3|-1 +019-3,0,0,0|script|Mob019-3|32767 { end; diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt index f0b58665..43717e0d 100644 --- a/world/map/npc/019-4/_mobs.txt +++ b/world/map/npc/019-4/_mobs.txt @@ -7,7 +7,7 @@ 019-4,0,0,0,0|monster|BlueSlime|1091,7,45000ms,30000ms,Mob019-4::On1091 -019-4,0,0,0|script|Mob019-4|-1 +019-4,0,0,0|script|Mob019-4|32767 { end; diff --git a/world/map/npc/020-1/_mobs.txt b/world/map/npc/020-1/_mobs.txt index 3f534e8d..da1ffd27 100644 --- a/world/map/npc/020-1/_mobs.txt +++ b/world/map/npc/020-1/_mobs.txt @@ -4,7 +4,7 @@ 020-1,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob020-1::On1095 -020-1,0,0,0|script|Mob020-1|-1 +020-1,0,0,0|script|Mob020-1|32767 { end; diff --git a/world/map/npc/020-2/_mobs.txt b/world/map/npc/020-2/_mobs.txt index b0d2646d..62e1f438 100644 --- a/world/map/npc/020-2/_mobs.txt +++ b/world/map/npc/020-2/_mobs.txt @@ -3,7 +3,7 @@ -020-2,0,0,0|script|Mob020-2|-1 +020-2,0,0,0|script|Mob020-2|32767 { end; } diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt index 13ed6c8b..edb95973 100644 --- a/world/map/npc/020-3/_mobs.txt +++ b/world/map/npc/020-3/_mobs.txt @@ -7,7 +7,7 @@ 020-3,0,0,0,0|monster|Pinkie|1018,10,0ms,0ms,Mob020-3::On1018 -020-3,0,0,0|script|Mob020-3|-1 +020-3,0,0,0|script|Mob020-3|32767 { end; diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt index 78c24a7c..8d6c2591 100644 --- a/world/map/npc/021-3/_mobs.txt +++ b/world/map/npc/021-3/_mobs.txt @@ -13,7 +13,7 @@ 021-3,47,139,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056 -021-3,0,0,0|script|Mob021-3|-1 +021-3,0,0,0|script|Mob021-3|32767 { end; diff --git a/world/map/npc/025-1/_mobs.txt b/world/map/npc/025-1/_mobs.txt index cddb2696..2a2d27ac 100644 --- a/world/map/npc/025-1/_mobs.txt +++ b/world/map/npc/025-1/_mobs.txt @@ -13,7 +13,7 @@ 025-1,26,61,15,85|monster|Scorpion|1003,12,100000ms,50000ms,Mob025-1::On1003 -025-1,0,0,0|script|Mob025-1|-1 +025-1,0,0,0|script|Mob025-1|32767 { end; diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt index 4ab99039..5ccfdfc0 100644 --- a/world/map/npc/025-3/_mobs.txt +++ b/world/map/npc/025-3/_mobs.txt @@ -7,7 +7,7 @@ 025-3,69,153,13,1|monster|Skeleton|1043,1,0ms,30000ms,Mob025-3::On1043 -025-3,0,0,0|script|Mob025-3|-1 +025-3,0,0,0|script|Mob025-3|32767 { end; diff --git a/world/map/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt index 62318520..3ad731de 100644 --- a/world/map/npc/025-4/_mobs.txt +++ b/world/map/npc/025-4/_mobs.txt @@ -5,7 +5,7 @@ 025-4,94,24,20,21|monster|CaveMaggot|1056,5,0ms,100ms,Mob025-4::On1056 -025-4,0,0,0|script|Mob025-4|-1 +025-4,0,0,0|script|Mob025-4|32767 { end; diff --git a/world/map/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt index 34da2792..a99c4bab 100644 --- a/world/map/npc/026-1/_mobs.txt +++ b/world/map/npc/026-1/_mobs.txt @@ -14,7 +14,7 @@ 026-1,60,76,61,31|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034 -026-1,0,0,0|script|Mob026-1|-1 +026-1,0,0,0|script|Mob026-1|32767 { end; diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt index f72b338d..de1a4b6f 100644 --- a/world/map/npc/027-1/_mobs.txt +++ b/world/map/npc/027-1/_mobs.txt @@ -20,7 +20,7 @@ 027-1,99,90,34,16|monster|GrassSnake|1034,3,100000ms,50000ms,Mob027-1::On1034 -027-1,0,0,0|script|Mob027-1|-1 +027-1,0,0,0|script|Mob027-1|32767 { end; diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt index f87f19f9..ab76e3b0 100644 --- a/world/map/npc/027-2/_mobs.txt +++ b/world/map/npc/027-2/_mobs.txt @@ -13,7 +13,7 @@ 027-2,89,34,11,9|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078 -027-2,0,0,0|script|Mob027-2|-1 +027-2,0,0,0|script|Mob027-2|32767 { end; diff --git a/world/map/npc/027-3/_mobs.txt b/world/map/npc/027-3/_mobs.txt index 0d4599a7..4c7c8ff6 100644 --- a/world/map/npc/027-3/_mobs.txt +++ b/world/map/npc/027-3/_mobs.txt @@ -11,7 +11,7 @@ 027-3,98,84,60,14|monster|FireSkull|1023,2,60000ms,20000ms,Mob027-3::On1023 -027-3,0,0,0|script|Mob027-3|-1 +027-3,0,0,0|script|Mob027-3|32767 { end; diff --git a/world/map/npc/027-3/monsters.txt b/world/map/npc/027-3/monsters.txt index 6664d033..2e552eb2 100644 --- a/world/map/npc/027-3/monsters.txt +++ b/world/map/npc/027-3/monsters.txt @@ -6,7 +6,7 @@ 027-3,67,29,129,64|monster|Zombie|1036,3,140000ms,30000ms,specialMob027-3::On1036 027-3,101,65,128,93|monster|Fallen|1045,3,120000ms,30000ms,specialMob027-3::On1045 -027-3,0,0,0|script|specialMob027-3|-1 +027-3,0,0,0|script|specialMob027-3|32767 { end; diff --git a/world/map/npc/027-4/_mobs.txt b/world/map/npc/027-4/_mobs.txt index e5fd7229..cb65135e 100644 --- a/world/map/npc/027-4/_mobs.txt +++ b/world/map/npc/027-4/_mobs.txt @@ -8,7 +8,7 @@ 027-4,101,36,38,30|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044 -027-4,0,0,0|script|Mob027-4|-1 +027-4,0,0,0|script|Mob027-4|32767 { end; diff --git a/world/map/npc/027-4/monsters.txt b/world/map/npc/027-4/monsters.txt index 7c071bc5..ef810372 100644 --- a/world/map/npc/027-4/monsters.txt +++ b/world/map/npc/027-4/monsters.txt @@ -7,7 +7,7 @@ 027-4,61,37,38,30|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 027-4,101,36,38,30|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 -027-4,0,0,0|script|specialMob027-4|-1 +027-4,0,0,0|script|specialMob027-4|32767 { end; diff --git a/world/map/npc/027-5/_mobs.txt b/world/map/npc/027-5/_mobs.txt index 142d8ee9..e6958ba9 100644 --- a/world/map/npc/027-5/_mobs.txt +++ b/world/map/npc/027-5/_mobs.txt @@ -10,7 +10,7 @@ 027-5,69,80,99,36|monster|LadySkeleton|1044,8,60000ms,8000ms,Mob027-5::On1044 -027-5,0,0,0|script|Mob027-5|-1 +027-5,0,0,0|script|Mob027-5|32767 { end; diff --git a/world/map/npc/027-6/_mobs.txt b/world/map/npc/027-6/_mobs.txt index c5f45581..407a697e 100644 --- a/world/map/npc/027-6/_mobs.txt +++ b/world/map/npc/027-6/_mobs.txt @@ -3,7 +3,7 @@ -027-6,0,0,0|script|Mob027-6|-1 +027-6,0,0,0|script|Mob027-6|32767 { end; } diff --git a/world/map/npc/027-7/_mobs.txt b/world/map/npc/027-7/_mobs.txt index 482bf900..43867927 100644 --- a/world/map/npc/027-7/_mobs.txt +++ b/world/map/npc/027-7/_mobs.txt @@ -3,7 +3,7 @@ -027-7,0,0,0|script|Mob027-7|-1 +027-7,0,0,0|script|Mob027-7|32767 { end; } diff --git a/world/map/npc/027-8/_mobs.txt b/world/map/npc/027-8/_mobs.txt index 30810f3c..d38bf647 100644 --- a/world/map/npc/027-8/_mobs.txt +++ b/world/map/npc/027-8/_mobs.txt @@ -3,7 +3,7 @@ -027-8,0,0,0|script|Mob027-8|-1 +027-8,0,0,0|script|Mob027-8|32767 { end; } diff --git a/world/map/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt index 76a2715f..fc1aa291 100644 --- a/world/map/npc/028-1/_mobs.txt +++ b/world/map/npc/028-1/_mobs.txt @@ -15,7 +15,7 @@ 028-1,60,45,1,1|monster|Fallen|1045,1,700000ms,300000ms,Mob028-1::On1045 -028-1,0,0,0|script|Mob028-1|-1 +028-1,0,0,0|script|Mob028-1|32767 { end; diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt index ce323fad..fd5fe855 100644 --- a/world/map/npc/028-3/_mobs.txt +++ b/world/map/npc/028-3/_mobs.txt @@ -7,7 +7,7 @@ 028-3,50,49,61,60|monster|Bat|1017,10,60000ms,10000ms,Mob028-3::On1017 -028-3,0,0,0|script|Mob028-3|-1 +028-3,0,0,0|script|Mob028-3|32767 { end; diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt index 55bc216b..bad7d55a 100644 --- a/world/map/npc/029-1/_mobs.txt +++ b/world/map/npc/029-1/_mobs.txt @@ -9,7 +9,7 @@ 029-1,76,42,52,25|monster|ManaBug|1131,3,30ms,0ms,Mob029-1::On1131 -029-1,0,0,0|script|Mob029-1|-1 +029-1,0,0,0|script|Mob029-1|32767 { end; diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt index 8d35da8b..eef3eb64 100644 --- a/world/map/npc/029-1/hasan.txt +++ b/world/map/npc/029-1/hasan.txt @@ -182,6 +182,8 @@ OnScorpionDeath: goto L_Clean; set QL_BEGIN, 13; message strcharinfo(0), "You saved Hasan."; + set @mobID, 1003; + callfunc "MobPoints"; goto L_Clean; L_TimeOut: diff --git a/world/map/npc/029-1/hideandseek.txt b/world/map/npc/029-1/hideandseek.txt index a8cc5fa1..e0ed487f 100644 --- a/world/map/npc/029-1/hideandseek.txt +++ b/world/map/npc/029-1/hideandseek.txt @@ -7,7 +7,7 @@ // Bit 7: unused // Author: Jenalya --|script|#hideandseekNTconfig|-1 +-|script|#hideandseekNTconfig|32767 { end; diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt index 0aa37749..4cde049b 100644 --- a/world/map/npc/029-1/liana.txt +++ b/world/map/npc/029-1/liana.txt @@ -8,7 +8,7 @@ L_Talk: mes "[Liana]"; mes "\"Hurnscald is a large city. I'm sure glad I live in Candor because I know where everything's at.\""; - if (@tutorial == 10) goto L_Hasan; + if (QL_BEGIN == 10) goto L_Hasan; goto L_Close; L_Hasan: @@ -31,8 +31,7 @@ L_Next: mes "\"If Lieutenant Dausen hadn't have come along that moment, Hasan would have died that day.\""; mes "\"However, the scorpions poison caused a bad fever and once Hasan had recovered from that, he was even more malicious than before.\""; mes "She sighs."; - set @tutorial_tmp, 11; - callfunc "SetTutorialMask"; + set QL_BEGIN, 11; goto L_Close; L_Close: diff --git a/world/map/npc/029-1/tutorial.txt b/world/map/npc/029-1/tutorial.txt index 76124ef6..e6f31c4a 100644 --- a/world/map/npc/029-1/tutorial.txt +++ b/world/map/npc/029-1/tutorial.txt @@ -1,7 +1,7 @@ // This file is part of the Tutorial // Author: Jenalya // if you enter the tutorial area from outside, it is set to be already done --|script|#TutorialConfig|-1 +-|script|#TutorialConfig|32767 { end; diff --git a/world/map/npc/029-1/valon.txt b/world/map/npc/029-1/valon.txt index f4034ec9..e7a276c8 100644 --- a/world/map/npc/029-1/valon.txt +++ b/world/map/npc/029-1/valon.txt @@ -1,6 +1,6 @@ // This file is part of the Tutorial // Author: Jenalya, Wushin --|script|#ValonConfig|-1 +-|script|#ValonConfig|32767 { end; diff --git a/world/map/npc/029-2/_mobs.txt b/world/map/npc/029-2/_mobs.txt index d6535efd..02d3fbd9 100644 --- a/world/map/npc/029-2/_mobs.txt +++ b/world/map/npc/029-2/_mobs.txt @@ -4,7 +4,7 @@ 029-2,33,57,24,7|monster|HouseMaggot|1050,7,100000ms,30000ms,Mob029-2::On1050 -029-2,0,0,0|script|Mob029-2|-1 +029-2,0,0,0|script|Mob029-2|32767 { end; diff --git a/world/map/npc/029-2/barrels_config.txt b/world/map/npc/029-2/barrels_config.txt index 1d356a08..b2e340a6 100644 --- a/world/map/npc/029-2/barrels_config.txt +++ b/world/map/npc/029-2/barrels_config.txt @@ -1,7 +1,7 @@ // Barrels // Author: Wushin 029-2,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath --|script|#BarrelConfig|-1 +-|script|#BarrelConfig|32767 { end; diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt index 085542ce..3f7d3e1e 100644 --- a/world/map/npc/029-2/morgan.txt +++ b/world/map/npc/029-2/morgan.txt @@ -26,7 +26,6 @@ OnInit: 029-2,101,57,0|script|Morgan#_M|355 { callfunc "PCtoNPCRange"; - callfunc "MorganState"; if (Int >= 5) goto L_Learn; goto L_NotMagic; @@ -98,6 +97,9 @@ L_CastOnce: mes "\"Each time you attack the wand will convert a bit of you mana into a magic bolt.\""; mes "\"After so many attacks, you will need to recast the invocation to stay attuned to the wand.\""; mes "\"(Logging out will also cancel any spell effects currently active in-game.).\""; + next; + mes "\"I've taught you all I can for now. You should visit the Mana Seed north west of Hurnscald.\""; + set QL_MORGAN, 4; goto L_Close; L_LearningDone: diff --git a/world/map/npc/029-3/_mobs.txt b/world/map/npc/029-3/_mobs.txt index 61f8c33f..9a83bf7f 100644 --- a/world/map/npc/029-3/_mobs.txt +++ b/world/map/npc/029-3/_mobs.txt @@ -3,7 +3,7 @@ -029-3,0,0,0|script|Mob029-3|-1 +029-3,0,0,0|script|Mob029-3|32767 { end; } diff --git a/world/map/npc/030-2/_mobs.txt b/world/map/npc/030-2/_mobs.txt index 4e45ffc1..664e8111 100644 --- a/world/map/npc/030-2/_mobs.txt +++ b/world/map/npc/030-2/_mobs.txt @@ -3,7 +3,7 @@ -030-2,0,0,0|script|Mob030-2|-1 +030-2,0,0,0|script|Mob030-2|32767 { end; } diff --git a/world/map/npc/030-3/_mobs.txt b/world/map/npc/030-3/_mobs.txt index 2831fc8d..9d4b3b43 100644 --- a/world/map/npc/030-3/_mobs.txt +++ b/world/map/npc/030-3/_mobs.txt @@ -3,7 +3,7 @@ -030-3,0,0,0|script|Mob030-3|-1 +030-3,0,0,0|script|Mob030-3|32767 { end; } diff --git a/world/map/npc/030-4/_mobs.txt b/world/map/npc/030-4/_mobs.txt index f9ab4f5e..97ff93a8 100644 --- a/world/map/npc/030-4/_mobs.txt +++ b/world/map/npc/030-4/_mobs.txt @@ -3,7 +3,7 @@ -030-4,0,0,0|script|Mob030-4|-1 +030-4,0,0,0|script|Mob030-4|32767 { end; } diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt index c57e5ea5..9a198c21 100644 --- a/world/map/npc/030-4/mana_battery.txt +++ b/world/map/npc/030-4/mana_battery.txt @@ -438,7 +438,7 @@ S_ClearVariables: return; } -030-4,0,0,0|script|#XmasChamberCooler|-1 +030-4,0,0,0|script|#XmasChamberCooler|32767 { end; OnCommandCoolDown: diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt index 26374da6..d5a747fb 100644 --- a/world/map/npc/031-1/_mobs.txt +++ b/world/map/npc/031-1/_mobs.txt @@ -7,7 +7,7 @@ 031-1,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob031-1::On1095 -031-1,0,0,0|script|Mob031-1|-1 +031-1,0,0,0|script|Mob031-1|32767 { end; diff --git a/world/map/npc/031-2/_mobs.txt b/world/map/npc/031-2/_mobs.txt index 61d16cc9..ab4d5c66 100644 --- a/world/map/npc/031-2/_mobs.txt +++ b/world/map/npc/031-2/_mobs.txt @@ -3,7 +3,7 @@ -031-2,0,0,0|script|Mob031-2|-1 +031-2,0,0,0|script|Mob031-2|32767 { end; } diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt index d22f769f..ccfb1199 100644 --- a/world/map/npc/031-3/_mobs.txt +++ b/world/map/npc/031-3/_mobs.txt @@ -92,7 +92,7 @@ 031-3,52,285,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091 -031-3,0,0,0|script|Mob031-3|-1 +031-3,0,0,0|script|Mob031-3|32767 { end; diff --git a/world/map/npc/031-4/_mobs.txt b/world/map/npc/031-4/_mobs.txt index 45fe61d8..cc2f2d21 100644 --- a/world/map/npc/031-4/_mobs.txt +++ b/world/map/npc/031-4/_mobs.txt @@ -3,7 +3,7 @@ -031-4,0,0,0|script|Mob031-4|-1 +031-4,0,0,0|script|Mob031-4|32767 { end; } diff --git a/world/map/npc/032-3/_mobs.txt b/world/map/npc/032-3/_mobs.txt index b1a0c1d4..2e336d50 100644 --- a/world/map/npc/032-3/_mobs.txt +++ b/world/map/npc/032-3/_mobs.txt @@ -13,7 +13,7 @@ 032-3,0,0,0,0|monster|Bat|1017,25,30000ms,100000ms,Mob032-3::On1017 -032-3,0,0,0|script|Mob032-3|-1 +032-3,0,0,0|script|Mob032-3|32767 { end; diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt index 6f86b16a..afbd35ed 100644 --- a/world/map/npc/033-1/_mobs.txt +++ b/world/map/npc/033-1/_mobs.txt @@ -7,7 +7,7 @@ 033-1,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob033-1::On1095 -033-1,0,0,0|script|Mob033-1|-1 +033-1,0,0,0|script|Mob033-1|32767 { end; diff --git a/world/map/npc/033-1/barbarianinit.txt b/world/map/npc/033-1/barbarianinit.txt index bf044bab..2523ebae 100644 --- a/world/map/npc/033-1/barbarianinit.txt +++ b/world/map/npc/033-1/barbarianinit.txt @@ -1,4 +1,4 @@ --|script|#barbarian033_1init|-1 +-|script|#barbarian033_1init|32767 { end; diff --git a/world/map/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt index 0b2cc9b5..e02e496b 100644 --- a/world/map/npc/034-1/_mobs.txt +++ b/world/map/npc/034-1/_mobs.txt @@ -9,7 +9,7 @@ 034-1,1,1,0,0|monster|IceGoblin|1058,25,100000ms,30000ms,Mob034-1::On1058 -034-1,0,0,0|script|Mob034-1|-1 +034-1,0,0,0|script|Mob034-1|32767 { end; diff --git a/world/map/npc/034-2/_mobs.txt b/world/map/npc/034-2/_mobs.txt index c7fe5fe1..709fcb08 100644 --- a/world/map/npc/034-2/_mobs.txt +++ b/world/map/npc/034-2/_mobs.txt @@ -3,7 +3,7 @@ -034-2,0,0,0|script|Mob034-2|-1 +034-2,0,0,0|script|Mob034-2|32767 { end; } diff --git a/world/map/npc/035-2/_mobs.txt b/world/map/npc/035-2/_mobs.txt index 7f718921..899a8d04 100644 --- a/world/map/npc/035-2/_mobs.txt +++ b/world/map/npc/035-2/_mobs.txt @@ -3,7 +3,7 @@ -035-2,0,0,0|script|Mob035-2|-1 +035-2,0,0,0|script|Mob035-2|32767 { end; } diff --git a/world/map/npc/036-2/_mobs.txt b/world/map/npc/036-2/_mobs.txt index 3d4e9883..0cebfbc8 100644 --- a/world/map/npc/036-2/_mobs.txt +++ b/world/map/npc/036-2/_mobs.txt @@ -3,7 +3,7 @@ -036-2,0,0,0|script|Mob036-2|-1 +036-2,0,0,0|script|Mob036-2|32767 { end; } diff --git a/world/map/npc/043-3/_mobs.txt b/world/map/npc/043-3/_mobs.txt index 44c6c10f..085615a4 100644 --- a/world/map/npc/043-3/_mobs.txt +++ b/world/map/npc/043-3/_mobs.txt @@ -12,7 +12,7 @@ 043-3,94,44,40,18|monster|GreenSlime|1005,5,30000ms,15000ms,Mob043-3::On1005 -043-3,0,0,0|script|Mob043-3|-1 +043-3,0,0,0|script|Mob043-3|32767 { end; diff --git a/world/map/npc/043-4/_mobs.txt b/world/map/npc/043-4/_mobs.txt index 1ebb5b99..a06642d0 100644 --- a/world/map/npc/043-4/_mobs.txt +++ b/world/map/npc/043-4/_mobs.txt @@ -25,7 +25,7 @@ 043-4,133,123,30,23|monster|Troll|1054,3,100000ms,50000ms,Mob043-4::On1054 -043-4,0,0,0|script|Mob043-4|-1 +043-4,0,0,0|script|Mob043-4|32767 { end; diff --git a/world/map/npc/045-1/_mobs.txt b/world/map/npc/045-1/_mobs.txt index 7502a8c3..37357556 100644 --- a/world/map/npc/045-1/_mobs.txt +++ b/world/map/npc/045-1/_mobs.txt @@ -18,7 +18,7 @@ 045-1,104,149,79,10|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058 -045-1,0,0,0|script|Mob045-1|-1 +045-1,0,0,0|script|Mob045-1|32767 { end; diff --git a/world/map/npc/046-1/_mobs.txt b/world/map/npc/046-1/_mobs.txt index 90bc7a5f..d5551ecd 100644 --- a/world/map/npc/046-1/_mobs.txt +++ b/world/map/npc/046-1/_mobs.txt @@ -14,7 +14,7 @@ 046-1,145,67,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090 -046-1,0,0,0|script|Mob046-1|-1 +046-1,0,0,0|script|Mob046-1|32767 { end; diff --git a/world/map/npc/046-3/_mobs.txt b/world/map/npc/046-3/_mobs.txt index 5d82dc0e..95c498ed 100644 --- a/world/map/npc/046-3/_mobs.txt +++ b/world/map/npc/046-3/_mobs.txt @@ -18,7 +18,7 @@ 046-3,113,48,12,8|monster|Yeti|1072,2,100000ms,30000ms,Mob046-3::On1072 -046-3,0,0,0|script|Mob046-3|-1 +046-3,0,0,0|script|Mob046-3|32767 { end; diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt index fd2ca939..a502dcdf 100644 --- a/world/map/npc/047-1/_mobs.txt +++ b/world/map/npc/047-1/_mobs.txt @@ -25,7 +25,7 @@ 047-1,132,70,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091 -047-1,0,0,0|script|Mob047-1|-1 +047-1,0,0,0|script|Mob047-1|32767 { end; diff --git a/world/map/npc/047-3/_mobs.txt b/world/map/npc/047-3/_mobs.txt index 3ceb7884..adf84729 100644 --- a/world/map/npc/047-3/_mobs.txt +++ b/world/map/npc/047-3/_mobs.txt @@ -24,7 +24,7 @@ 047-3,121,172,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093 -047-3,0,0,0|script|Mob047-3|-1 +047-3,0,0,0|script|Mob047-3|32767 { end; diff --git a/world/map/npc/048-2/_mobs.txt b/world/map/npc/048-2/_mobs.txt index 0c85dbac..87b5b1d4 100644 --- a/world/map/npc/048-2/_mobs.txt +++ b/world/map/npc/048-2/_mobs.txt @@ -3,7 +3,7 @@ -048-2,0,0,0|script|Mob048-2|-1 +048-2,0,0,0|script|Mob048-2|32767 { end; } diff --git a/world/map/npc/048-2/bluesageConfig.txt b/world/map/npc/048-2/bluesageConfig.txt index 0aeda5fc..bab552f8 100644 --- a/world/map/npc/048-2/bluesageConfig.txt +++ b/world/map/npc/048-2/bluesageConfig.txt @@ -51,7 +51,7 @@ // Bit 0: started the subquest // Bit 1 - 7: each spawn point is unique and saved with a flag --|script|#bluesageconfig|-1 +-|script|#bluesageconfig|32767 { end; diff --git a/world/map/npc/051-1/_mobs.txt b/world/map/npc/051-1/_mobs.txt index 8e092790..752c527c 100644 --- a/world/map/npc/051-1/_mobs.txt +++ b/world/map/npc/051-1/_mobs.txt @@ -5,7 +5,7 @@ 051-1,42,35,41,22|monster|SpikyMushroom|1019,10,100000ms,30000ms,Mob051-1::On1019 -051-1,0,0,0|script|Mob051-1|-1 +051-1,0,0,0|script|Mob051-1|32767 { end; diff --git a/world/map/npc/051-1/desertmonsters.txt b/world/map/npc/051-1/desertmonsters.txt index 310566ce..a3497055 100644 --- a/world/map/npc/051-1/desertmonsters.txt +++ b/world/map/npc/051-1/desertmonsters.txt @@ -1,7 +1,7 @@ 051-1,134,36,67,49|monster|SoulSnake|1096,12,100000ms,30000ms,IlliaDMobs051-1::On1096 // The soul snakes release a Sealed Soul at random, once the soul collecting is started -051-1,0,0,0|script|IlliaDMobs051-1|-1 +051-1,0,0,0|script|IlliaDMobs051-1|32767 { end; diff --git a/world/map/npc/051-1/forestmonsters.txt b/world/map/npc/051-1/forestmonsters.txt index 4942cf2b..4d646ed3 100644 --- a/world/map/npc/051-1/forestmonsters.txt +++ b/world/map/npc/051-1/forestmonsters.txt @@ -1,6 +1,6 @@ 051-1,52,32,10,8|monster|GreenSlime|1005,20,100000ms,30000ms,IlliaFMobs051-1::On1005 -051-1,0,0,0|script|IlliaFMobs051-1|-1 +051-1,0,0,0|script|IlliaFMobs051-1|32767 { end; diff --git a/world/map/npc/051-3/_mobs.txt b/world/map/npc/051-3/_mobs.txt index 0887b1de..711bf39c 100644 --- a/world/map/npc/051-3/_mobs.txt +++ b/world/map/npc/051-3/_mobs.txt @@ -19,7 +19,7 @@ 051-3,60,94,18,5|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098 -051-3,0,0,0|script|Mob051-3|-1 +051-3,0,0,0|script|Mob051-3|32767 { end; diff --git a/world/map/npc/051-3/jailslimes.txt b/world/map/npc/051-3/jailslimes.txt index d153097a..8544fb1a 100644 --- a/world/map/npc/051-3/jailslimes.txt +++ b/world/map/npc/051-3/jailslimes.txt @@ -4,7 +4,7 @@ 051-3,63,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 051-3,70,111,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 -051-3,0,0,0|script|IlliaCMobs051-3|-1 +051-3,0,0,0|script|IlliaCMobs051-3|32767 { end; diff --git a/world/map/npc/052-1/_mobs.txt b/world/map/npc/052-1/_mobs.txt index 684c78fc..c386d5d1 100644 --- a/world/map/npc/052-1/_mobs.txt +++ b/world/map/npc/052-1/_mobs.txt @@ -4,7 +4,7 @@ 052-1,55,29,43,39|monster|AzulSlime|1100,18,100000ms,20000ms,Mob052-1::On1100 -052-1,0,0,0|script|Mob052-1|-1 +052-1,0,0,0|script|Mob052-1|32767 { end; diff --git a/world/map/npc/052-2/_mobs.txt b/world/map/npc/052-2/_mobs.txt index 916b6761..1fb96829 100644 --- a/world/map/npc/052-2/_mobs.txt +++ b/world/map/npc/052-2/_mobs.txt @@ -3,7 +3,7 @@ -052-2,0,0,0|script|Mob052-2|-1 +052-2,0,0,0|script|Mob052-2|32767 { end; } diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt index a1226612..35741d32 100644 --- a/world/map/npc/055-1/_mobs.txt +++ b/world/map/npc/055-1/_mobs.txt @@ -20,7 +20,7 @@ 055-1,0,0,0,0|monster|SpikyMushroom|1019,7,10000ms,60000ms,Mob055-1::On1019 -055-1,0,0,0|script|Mob055-1|-1 +055-1,0,0,0|script|Mob055-1|32767 { end; diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt index 528546bd..96931e04 100644 --- a/world/map/npc/055-1/pumpkins.txt +++ b/world/map/npc/055-1/pumpkins.txt @@ -4,7 +4,7 @@ 055-1,132,24,6,4|monster|Pumpkin|1063,4,10000ms,5000ms,PumpkinMob055-1::On1063 -055-1,0,0,0|script|PumpkinMob055-1|-1 +055-1,0,0,0|script|PumpkinMob055-1|32767 { end; diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt index 071d0347..bc14b844 100644 --- a/world/map/npc/055-3/_mobs.txt +++ b/world/map/npc/055-3/_mobs.txt @@ -11,7 +11,7 @@ 055-3,52,78,36,23|monster|BlackScorpion|1009,3,50000ms,100000ms,Mob055-3::On1009 -055-3,0,0,0|script|Mob055-3|-1 +055-3,0,0,0|script|Mob055-3|32767 { end; diff --git a/world/map/npc/056-2/_mobs.txt b/world/map/npc/056-2/_mobs.txt index b4690913..267e0d8a 100644 --- a/world/map/npc/056-2/_mobs.txt +++ b/world/map/npc/056-2/_mobs.txt @@ -3,7 +3,7 @@ -056-2,0,0,0|script|Mob056-2|-1 +056-2,0,0,0|script|Mob056-2|32767 { end; } diff --git a/world/map/npc/057-1/_mobs.txt b/world/map/npc/057-1/_mobs.txt index 48bdaa2b..5988ce83 100644 --- a/world/map/npc/057-1/_mobs.txt +++ b/world/map/npc/057-1/_mobs.txt @@ -21,7 +21,7 @@ 057-1,27,46,14,52|monster|Squirrel|1038,6,10000ms,50000ms,Mob057-1::On1038 -057-1,0,0,0|script|Mob057-1|-1 +057-1,0,0,0|script|Mob057-1|32767 { end; diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt index 53912f86..852b0025 100644 --- a/world/map/npc/annuals/fathertime.txt +++ b/world/map/npc/annuals/fathertime.txt @@ -1,6 +1,6 @@ // Annual Timer // One timer to check to enable all holiday events -017-9,26,28,0|script|#HolidayConfig|-1 +017-9,26,28,0|script|#HolidayConfig|32767 { end; diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt index 8e9169e8..34ffb875 100644 --- a/world/map/npc/annuals/halloween/config.txt +++ b/world/map/npc/annuals/halloween/config.txt @@ -81,7 +81,7 @@ // BIT 30: NPC #1 // BIT 31: NPC #0 --|script|#HalloweenConfig|-1 +-|script|#HalloweenConfig|32767 { end; diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt index b7a6de82..90eab504 100644 --- a/world/map/npc/annuals/xmas/config.txt +++ b/world/map/npc/annuals/xmas/config.txt @@ -38,7 +38,7 @@ // 30: Helper Bit // 31: Side Choosen: Naughty vs. Nice --|script|#XmasConfig|-1 +-|script|#XmasConfig|32767 { end; diff --git a/world/map/npc/botcheck/_mobs.txt b/world/map/npc/botcheck/_mobs.txt index a7151fe7..91d023cd 100644 --- a/world/map/npc/botcheck/_mobs.txt +++ b/world/map/npc/botcheck/_mobs.txt @@ -3,7 +3,7 @@ -botcheck,0,0,0|script|Mobbotcheck|-1 +botcheck,0,0,0|script|Mobbotcheck|32767 { end; } diff --git a/world/map/npc/functions/DyeConfig.txt b/world/map/npc/functions/DyeConfig.txt index 0072dd26..e2d9640e 100644 --- a/world/map/npc/functions/DyeConfig.txt +++ b/world/map/npc/functions/DyeConfig.txt @@ -1,4 +1,4 @@ -009-2,32,105,0|script|#DyeChecker|-1 +009-2,32,105,0|script|#DyeChecker|32767 { end; OnInit: diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt index d74289f1..bcb54777 100755 --- a/world/map/npc/functions/debug.txt +++ b/world/map/npc/functions/debug.txt @@ -943,7 +943,7 @@ OnInit: end; } -009-1,52,33,0|script|Debug#2|154 +009-1,45,33,0|script|Debug#2|154 { set @debug_npc, 1; callfunc "Debug"; diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt index aad92b14..3737bb18 100644 --- a/world/map/npc/functions/ferry.txt +++ b/world/map/npc/functions/ferry.txt @@ -1,6 +1,6 @@ // The ferry system -017-9,27,28,0|script|#FerryConfig|-1 +017-9,27,28,0|script|#FerryConfig|32767 { end; diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index 9ce44a38..92194086 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -3,7 +3,7 @@ // // Author: meko --|script|#GlobalHandler|-1 +-|script|#GlobalHandler|32767 { end; diff --git a/world/map/npc/functions/gm_island.txt b/world/map/npc/functions/gm_island.txt index 5efe105e..94c745a7 100644 --- a/world/map/npc/functions/gm_island.txt +++ b/world/map/npc/functions/gm_island.txt @@ -1,5 +1,5 @@ // Add Localized Warp in town centers and Message to GM Island --|script|#GmConfig|-1 +-|script|#GmConfig|32767 { end; diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt index 88a9ed9d..aec700d0 100644 --- a/world/map/npc/functions/travelers.txt +++ b/world/map/npc/functions/travelers.txt @@ -6,7 +6,7 @@ // Costs Zeny // Contains all warp points to find -017-9,27,28,0|script|#TravelConfig|-1 +017-9,27,28,0|script|#TravelConfig|32767 { end; @@ -43,26 +43,6 @@ OnInit: end; } -function|script|TravelerTut -{ - //Explain Travelers - if(@npcname$ == "") set @npcname$, strnpcinfo(1); - mes "["+@npcname$+"]"; - mes "\"We travelers are found all over the world. Once you have found another traveler, we can create a link and send you between us.\""; - next; - if (TravelFound & $@tut_bit) - goto L_Return; - goto L_SetBit; - -L_SetBit: - set TravelFound, TravelFound | $@tut_bit; - goto L_Return; - -L_Return: - set @npcname$, ""; - return; -} - function|script|Traveler { if(@npcname$ == "") set @npcname$, strnpcinfo(1); @@ -86,12 +66,20 @@ L_BitTravelSet: goto L_Start; L_TravelTut: - callfunc "TravelerTut"; + mes "["+@npcname$+"]"; + mes "\"We travelers are found all over the world. Once you have found a traveler at a certain location, you can be sent back there instantly by another traveler.\""; + next; + if (TravelFound & $@tut_bit) + goto L_Main; + goto L_SetBit; + +L_SetBit: + set TravelFound, TravelFound | $@tut_bit; goto L_Main; L_SetTravelBit: mes "["+@npcname$+"]"; - mes "\"Uplink Set. You can now return to this spot for a fee.\""; + mes "\"Uplink set. You can now return to this spot for a fee.\""; next; set TravelFound, TravelFound | @NpcTravelBit; goto L_BitTravelSet; @@ -227,25 +215,25 @@ L_TravelCandor: L_TravelNo: mes "["+@npcname$+"]"; - mes "\"Perhaps some day you will have the courage to help us.\""; + mes "\"Perhaps you will have the courage to help us some day.\""; close2; goto L_Clearvars; L_NoMoney: mes "["+@npcname$+"]"; - mes "\"Sorry, but you don't have enough money. Maybe next time.\""; + mes "\"I'm sorry, but you don't have enough money. Maybe next time.\""; close2; goto L_Clearvars; L_NoFound: mes "["+@npcname$+"]"; - mes "\"Sorry, but you haven't visited a traveler yet at that location. You should talk to a traveler there so you can quickly travel there in the future.\""; + mes "\"Sorry, but you haven't visited a traveler yet at that location. You should find and talk to a traveler there so you can quickly return to that location in the future.\""; close2; goto L_Clearvars; L_AlreadyThere: mes "["+@npcname$+"]"; - mes "\"Umm, you are already here. Are you sure you know where you are going?\""; + mes "\"Uh... You're already here. Are you sure you know where you are going?\""; close2; goto L_Clearvars; diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt index 43190a85..5a339049 100644 --- a/world/map/npc/items/check_wand.txt +++ b/world/map/npc/items/check_wand.txt @@ -48,8 +48,7 @@ L_Loop: L_SetWand: set @Wand, $@WandsPwr[@wand_loop]; set @WandID, $@WandsAnim[@wand_loop]; - callfunc "MorganState"; - if (@morgan == 2) + if (QL_MORGAN == 2) goto L_SetCastOnce; goto L_Return; @@ -60,8 +59,7 @@ L_LoopAgain: goto L_Loop; L_SetCastOnce: - set @morgan_tmp, 3; - callfunc "SetMorganMask"; + set QL_MORGAN, 3; goto L_Return; L_Return: diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt index 1d269d3a..70480acb 100644 --- a/world/map/npc/items/unequipcb.txt +++ b/world/map/npc/items/unequipcb.txt @@ -2,7 +2,7 @@ // on any map because of the -1 at the end. // Note: the client (I think) has a display bug if this is called // during the intial connection's equip hook -017-9,0,0,0|script|UnequipCB|-1 +017-9,0,0,0|script|UnequipCB|32767 { end; |