summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------client-data0
m---------tools0
-rw-r--r--world/map/news.d/48-v2015.05.04.txt38
-rw-r--r--world/map/npc/009-1/_import.txt1
-rw-r--r--world/map/npc/009-1/constable.txt11
-rw-r--r--world/map/npc/029-1/liana.txt5
-rw-r--r--world/map/npc/029-2/morgan.txt4
-rwxr-xr-xworld/map/npc/functions/debug.txt2
-rw-r--r--world/map/npc/functions/travelers.txt40
-rw-r--r--world/map/npc/items/check_wand.txt6
10 files changed, 72 insertions, 35 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/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/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/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-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/functions/debug.txt b/world/map/npc/functions/debug.txt
index 5affb8f0..7885c821 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -936,7 +936,7 @@ OnInit:
end;
}
-009-1,52,33,0|script|Debug#2|154
+009-1,45,33,0|script|Debug#2|154
{
callfunc "Debug";
end;
diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt
index 7f6b6786..aec700d0 100644
--- a/world/map/npc/functions/travelers.txt
+++ b/world/map/npc/functions/travelers.txt
@@ -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:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 20:49:18 +0000