summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/021-1/banu.txt2
-rw-r--r--world/map/npc/021-1/eurni.txt2
-rw-r--r--world/map/npc/021-1/gate_guards.txt14
-rw-r--r--world/map/npc/021-1/hideandseek.txt16
-rw-r--r--world/map/npc/021-1/imec.txt2
-rw-r--r--world/map/npc/021-1/inac.txt2
-rw-r--r--world/map/npc/021-1/npcs.txt6
-rw-r--r--world/map/npc/021-1/pauline.txt12
-rw-r--r--world/map/npc/021-1/sewer_east.txt2
-rw-r--r--world/map/npc/021-1/sewer_north.txt2
-rw-r--r--world/map/npc/021-1/sewer_west.txt2
-rw-r--r--world/map/npc/021-1/weellos.txt2
-rw-r--r--world/map/npc/021-2/barber.txt2
-rw-r--r--world/map/npc/021-2/government_building.txt6
-rw-r--r--world/map/npc/021-2/heathin.txt2
-rw-r--r--world/map/npc/021-2/jhedia.txt2
-rw-r--r--world/map/npc/021-2/kps.txt10
-rw-r--r--world/map/npc/021-2/kylian.txt14
-rw-r--r--world/map/npc/021-2/manakins.txt14
-rw-r--r--world/map/npc/021-2/rebecca.txt2
-rw-r--r--world/map/npc/021-2/yanis.txt2
21 files changed, 57 insertions, 61 deletions
diff --git a/world/map/npc/021-1/banu.txt b/world/map/npc/021-1/banu.txt
index e614fcae..db3830dc 100644
--- a/world/map/npc/021-1/banu.txt
+++ b/world/map/npc/021-1/banu.txt
@@ -3,7 +3,7 @@
// Using bit 10 and 11 of QUEST_NorthTulimshar (second half of nibble 2)
// author: Jenalya
-021-1.gat,102,54,0|script|Banu|154,
+021-1.gat,102,54,0|script|Banu|154
{
set @state, ((QUEST_NorthTulimshar & TWOBIT_5_MASK) >> TWOBIT_5_SHIFT);
set @EXP, 30;
diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
index ca514740..e24d774c 100644
--- a/world/map/npc/021-1/eurni.txt
+++ b/world/map/npc/021-1/eurni.txt
@@ -1,6 +1,6 @@
//
-021-1.gat,141,113,0|script|Eurni|136,
+021-1.gat,141,113,0|script|Eurni|136
{
set @halloween_npc_id, $@halloween_npc_eurni;
callfunc "TrickOrTreat";
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
index b26b5ec3..752718e8 100644
--- a/world/map/npc/021-1/gate_guards.txt
+++ b/world/map/npc/021-1/gate_guards.txt
@@ -1,14 +1,14 @@
// Various guards at gates
// Guards by the gates to the port
-021-1.gat,70,23,0|script|Guard#port1|104,
+021-1.gat,70,23,0|script|Guard#port1|104
{
mes "[Guard]";
mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
close;
}
-021-1.gat,110,23,0|script|Guard#port2|104,
+021-1.gat,110,23,0|script|Guard#port2|104
{
mes "[Guard]";
mes "\"You wouldn't believe the refuse that comes in from the docks.\"";
@@ -16,7 +16,7 @@
}
// Guard near the magic school
-021-1.gat,46,65,0|script|Guard#school|104,
+021-1.gat,46,65,0|script|Guard#school|104
{
mes "[Guard]";
mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
@@ -24,20 +24,20 @@
}
// Guards by the gates to East Tulimshar
-021-1.gat,146,23,0|script|Guard#east1|104,
+021-1.gat,146,23,0|script|Guard#east1|104
{
mes "[Guard]";
mes "\"I make sure less desirables don't enter the Noble District.\"";
close;
}
-021-1.gat,156,42,0|script|Guard#east2|104,
+021-1.gat,156,42,0|script|Guard#east2|104
{
mes "[Guard]";
mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
close;
}
-021-1.gat,156,95,0|script|Guard#east3|104,
+021-1.gat,156,95,0|script|Guard#east3|104
{
mes "[Guard]";
mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\"";
@@ -45,7 +45,7 @@
}
// Near the bazaar, outside the government building
-021-1.gat,55,136,0|script|Guard#govt_out|123,
+021-1.gat,55,136,0|script|Guard#govt_out|123
{
mes "[Guard]";
mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt
index 4768eef1..621f8468 100644
--- a/world/map/npc/021-1/hideandseek.txt
+++ b/world/map/npc/021-1/hideandseek.txt
@@ -7,7 +7,7 @@
// Bit 7: unused
// Author: Jenalya
--|script|#hideandseekNTconfig|-1,
+-|script|#hideandseekNTconfig|-1
{
end;
@@ -21,7 +21,7 @@ OnInit:
set $@hideandseekNT_ended, (1 << 6);
end;
}
-021-1.gat,89,66,0|script|AyashaDebug|258,
+021-1.gat,89,66,0|script|AyashaDebug|258
{
mes "[Ayasha Debug]";
menu
@@ -60,7 +60,7 @@ OnInit:
disablenpc "AyashaDebug";
end;
}
-021-1.gat,87,66,0|script|Ayasha|258,
+021-1.gat,87,66,0|script|Ayasha|258
{
set @child_number, 0;
callfunc "XmasList";
@@ -129,7 +129,7 @@ L_Close:
close;
}
-022-1.gat,112,23,0|script|Latif|262,
+022-1.gat,112,23,0|script|Latif|262
{
set @child_number, 1;
callfunc "XmasList";
@@ -191,7 +191,7 @@ L_Close:
close;
}
-001-1.gat,39,33,0|script|Charda|260,
+001-1.gat,39,33,0|script|Charda|260
{
set @child_number, 2;
callfunc "XmasList";
@@ -245,7 +245,7 @@ L_Close:
close;
}
-021-1.gat,78,87,0|script|Faris|259,
+021-1.gat,78,87,0|script|Faris|259
{
set @child_number, 3;
callfunc "XmasList";
@@ -297,7 +297,7 @@ L_Close:
close;
}
-022-1.gat,28,34,0|script|Rasin|263,
+022-1.gat,28,34,0|script|Rasin|263
{
set @child_number, 4;
callfunc "XmasList";
@@ -338,7 +338,7 @@ L_Close:
close;
}
-068-1.gat,94,84,0|script|Ghada|265,
+068-1.gat,94,84,0|script|Ghada|265
{
set @child_number, 5;
callfunc "XmasList";
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
index 07965951..1c280253 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/021-1/imec.txt
@@ -2,7 +2,7 @@
// after finishing this, daily quest with scorpion stingers
// Using bit 8 and 9 of QUEST_NorthTulimshar (first half of nibble 2)
// author: Jenalya
-021-1.gat,120,31,0|script|Imec|162,
+021-1.gat,120,31,0|script|Imec|162
{
set @state, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
set @money, 500;
diff --git a/world/map/npc/021-1/inac.txt b/world/map/npc/021-1/inac.txt
index 5903e34b..b2ed01bd 100644
--- a/world/map/npc/021-1/inac.txt
+++ b/world/map/npc/021-1/inac.txt
@@ -1,6 +1,6 @@
//
-021-1.gat,53,103,0|script|Inac|156,
+021-1.gat,53,103,0|script|Inac|156
{
set @halloween_npc_id, $@halloween_npc_inac;
callfunc "TrickOrTreat";
diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt
index b4b87108..50d18a6a 100644
--- a/world/map/npc/021-1/npcs.txt
+++ b/world/map/npc/021-1/npcs.txt
@@ -1,6 +1,6 @@
// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-021-1.gat,77,42,0|script|Jeric|214,
+021-1.gat,77,42,0|script|Jeric|214
{
set @npcname$, "Jeric";
@@ -12,7 +12,7 @@
close;
}
-021-1.gat,76,67,0|script|Silvia|207,
+021-1.gat,76,67,0|script|Silvia|207
{
set @npcname$, "Silvia";
@@ -26,7 +26,7 @@
close;
}
-021-1.gat,51,123,0|script|Michel|215,
+021-1.gat,51,123,0|script|Michel|215
{
set @npcname$, "Michel";
diff --git a/world/map/npc/021-1/pauline.txt b/world/map/npc/021-1/pauline.txt
index d28370c4..c2884c19 100644
--- a/world/map/npc/021-1/pauline.txt
+++ b/world/map/npc/021-1/pauline.txt
@@ -12,7 +12,7 @@
// @pauline_ingredient2$ Second ingredient input.
// @pauline_REWARD amount of XP gained for telling her ingredients for each spell.
-021-1.gat,55,66,0|script|Pauline|208,
+021-1.gat,55,66,0|script|Pauline|208
{
//Bitmasking
@@ -268,13 +268,11 @@ L_Close:
//Bitmasks
S_Update_Mask:
- set QUEST_MAGIC2,
- (QUEST_MAGIC2 & ~(@Pauline_MASK))
- | (@pauline_state << @Pauline_SHIFT);
+ set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Pauline_MASK)) | (@pauline_state << @Pauline_SHIFT);
return;
}
-021-1.gat,53,66,0|script|PaulineDebug|208,
+021-1.gat,53,66,0|script|PaulineDebug|208
{
//load Bitmasks;
set @Pauline_MASK, NIBBLE_4_MASK;
@@ -299,9 +297,7 @@ L_Close:
close;
S_Update_Mask:
- set QUEST_MAGIC2,
- (QUEST_MAGIC2 & ~(@Pauline_MASK))
- | (@pauline_state << @Pauline_SHIFT);
+ set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Pauline_MASK)) | (@pauline_state << @Pauline_SHIFT);
return;
OnInit:
diff --git a/world/map/npc/021-1/sewer_east.txt b/world/map/npc/021-1/sewer_east.txt
index 5dae481e..4a0b22d8 100644
--- a/world/map/npc/021-1/sewer_east.txt
+++ b/world/map/npc/021-1/sewer_east.txt
@@ -1,6 +1,6 @@
// The Sewer Grate
-021-1.gat,145,136,0|script|#tulimsharsewer2|45,0,0,
+021-1.gat,145,136,0|script|#tulimsharsewer2|45,0,0
{
mes "Descend into the sewers?";
next;
diff --git a/world/map/npc/021-1/sewer_north.txt b/world/map/npc/021-1/sewer_north.txt
index 572dbb5b..9c4ed277 100644
--- a/world/map/npc/021-1/sewer_north.txt
+++ b/world/map/npc/021-1/sewer_north.txt
@@ -1,6 +1,6 @@
// The Sewer Grate
-021-1.gat,124,41,0|script|#tulimsharsewer1|45,0,0,
+021-1.gat,124,41,0|script|#tulimsharsewer1|45,0,0
{
mes "Descend into the sewers?";
next;
diff --git a/world/map/npc/021-1/sewer_west.txt b/world/map/npc/021-1/sewer_west.txt
index fcb3aa25..b629c342 100644
--- a/world/map/npc/021-1/sewer_west.txt
+++ b/world/map/npc/021-1/sewer_west.txt
@@ -1,6 +1,6 @@
// The Sewer Grate
-021-1.gat,52,104,0|script|#tulimsharsewer3|45,0,0,
+021-1.gat,52,104,0|script|#tulimsharsewer3|45,0,0
{
mes "Descend into the sewers?";
next;
diff --git a/world/map/npc/021-1/weellos.txt b/world/map/npc/021-1/weellos.txt
index 2607b0fc..9f34e6a5 100644
--- a/world/map/npc/021-1/weellos.txt
+++ b/world/map/npc/021-1/weellos.txt
@@ -1,7 +1,7 @@
// A historian
// takes part in quest given by 021-2/kylian.txt
-021-1.gat,130,125,0|script|Weellos|103,
+021-1.gat,130,125,0|script|Weellos|103
{
set @halloween_npc_id, $@halloween_npc_weellos;
callfunc "TrickOrTreat";
diff --git a/world/map/npc/021-2/barber.txt b/world/map/npc/021-2/barber.txt
index a4075a36..d057786d 100644
--- a/world/map/npc/021-2/barber.txt
+++ b/world/map/npc/021-2/barber.txt
@@ -1,5 +1,5 @@
// A barber (later we can make it so certain styles need to come from him, for a price)
-021-2.gat,72,101,0|script|Issay|156,
+021-2.gat,72,101,0|script|Issay|156
{
mes "[Issay the Barber]";
mes "\"Do you need a change of style?\"";
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index 9aea5916..441b77a0 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
@@ -1,7 +1,7 @@
// The government builing in the south west
// A clerk
-021-2.gat,27,17,0|script|Estard|107,
+021-2.gat,27,17,0|script|Estard|107
{
mes "[Estard]";
mes "\"Hello what can I do for you?\"";
@@ -135,7 +135,7 @@ S_give_rings:
return;
}
-021-2.gat,36,17,0|script|Tathin|107,
+021-2.gat,36,17,0|script|Tathin|107
{
mes "[Tathin]";
mes "\"Hello what Can I do for you?\"";
@@ -172,7 +172,7 @@ L_Close:
}
// Guard
-021-2.gat,20,19,0|script|Guard#govt_in|123,1,1,
+021-2.gat,20,19,0|script|Guard#govt_in|123,1,1
{
mes "[Guard]";
mes "\"You can't come back here.\"";
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index 5f9f26c7..022c91ab 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -1,6 +1,6 @@
//Items for NPC are incomplete. Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
-021-2.gat,70,129,0|script|Heathin|147,
+021-2.gat,70,129,0|script|Heathin|147
{
set @TARROW_REQ_TERRA_ORE, 1;
set @TARROW_REQ_COAL, 5;
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index baf8ee2e..cc2f9165 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
@@ -1,6 +1,6 @@
// Ingot maker takes iron ore, gives ingots for future crafting purposes.
-021-2.gat,70,124,0|script|Jhedia|160,
+021-2.gat,70,124,0|script|Jhedia|160
{
set @Cost_Per_Ingot, 1000;
set @Iron_Ore_Per, 5;
diff --git a/world/map/npc/021-2/kps.txt b/world/map/npc/021-2/kps.txt
index ccfd1d8d..fb6ce235 100644
--- a/world/map/npc/021-2/kps.txt
+++ b/world/map/npc/021-2/kps.txt
@@ -4,7 +4,7 @@
// reuse the 4 bits
// To Mark 4 Different NPCs.
// setarray $@kps_npc_bits, $@knowYanisNT, $@knowLatoyNT, $@knowWeellosNT, $@knowCasinoNT;
-021-2.gat,27,124,0|script|KPS Manager|191,
+021-2.gat,27,124,0|script|KPS Manager|191
{
set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT);
@@ -84,7 +84,7 @@ L_RandJob:
goto L_JobInfo;
L_JobInfo:
- mes "\"We have a delivery for : " + $@random_quests$[@rand_quest] + "\"";
+ mes "\"We have a delivery for:* " + $@random_quests$[@rand_quest] + "\"";
menu
"Take It.", L_StartRun,
"Anything Else?", L_RandJob,
@@ -99,7 +99,7 @@ L_StartRun:
goto L_Close;
L_RunStarted:
- mes "Deliver this package to : " + $@random_quests$[@run] + "\"";
+ mes "Deliver this package to:* " + $@random_quests$[@run] + "\"";
goto L_Close;
L_RunComplete:
@@ -152,12 +152,12 @@ L_NoPackages:
L_Close:
close;
}
-function|script|SetKylianRun|,
+function|script|SetKylianRun
{
set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_8_MASK)) | (@run << TWOBIT_8_SHIFT);
return;
}
-function|script|SetKylianRunCnt|,
+function|script|SetKylianRunCnt
{
set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_9_MASK)) | (@run_cnt << TWOBIT_9_SHIFT);
return;
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt
index 5109314d..5a162242 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/021-2/kylian.txt
@@ -39,7 +39,7 @@
// @KylianNTSightSeeing
// @KylianNTCasino
--|script|#businessmanNTconfig|-1,
+-|script|#businessmanNTconfig|-1
{
end;
@@ -57,14 +57,14 @@ OnInit:
set $@delivery_exp_mod, 10;
end;
}
-021-2.gat,25,67,0|script|#KylianOut|32767,1,1,
+021-2.gat,25,67,0|script|#KylianOut|32767,1,1
{
set @KylianNTLicense, 0;
set @KylianNTSightSeeing, 0;
set @KylianNTCasino, 0;
end;
}
-021-2.gat,89,55,0|script|Kylian|193,
+021-2.gat,89,55,0|script|Kylian|193
{
set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
@@ -353,12 +353,12 @@ L_Close:
// those are used to check if the player logged out in the meanwhile
close;
}
-function|script|SetKylianQuest|,
+function|script|SetKylianQuest
{
set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_5_MASK)) | (@state << NIBBLE_5_SHIFT);
return;
}
-function|script|KylianDebug|,
+function|script|KylianDebug
{
set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
callfunc "ClearVarTMW_Quest";
@@ -404,7 +404,7 @@ L_MoreWorkTimer:
L_Close:
close;
}
-021-2.gat,87,55,0|script|KylianDebug#1|193,
+021-2.gat,87,55,0|script|KylianDebug#1|193
{
callfunc "KylianDebug";
end;
@@ -413,7 +413,7 @@ OnInit:
disablenpc "KylianDebug#1";
end;
}
-021-2.gat,29,124,0|script|KylianDebug#2|193,
+021-2.gat,29,124,0|script|KylianDebug#2|193
{
callfunc "KylianDebug";
end;
diff --git a/world/map/npc/021-2/manakins.txt b/world/map/npc/021-2/manakins.txt
index 2df6f6dc..85f757a5 100644
--- a/world/map/npc/021-2/manakins.txt
+++ b/world/map/npc/021-2/manakins.txt
@@ -1,19 +1,19 @@
// Display Manakins.
// Forge
-021-2.gat,76,131,0|script|Terranite Armor#Female|401,
+021-2.gat,76,131,0|script|Terranite Armor#Female|401
{
mes "Terranite Armor complete set, made to order, inquire with Heathin";
close;
}
-021-2.gat,81,131,0|script|Terranite Armor#Male|402,
+021-2.gat,81,131,0|script|Terranite Armor#Male|402
{
mes "Terranite Armor complete set, made to order, inquire with Heathin";
close;
}
-021-2.gat,81,136,0|script|Terranite|403,
+021-2.gat,81,136,0|script|Terranite|403
{
mes "Ahhh! A Terranite! Wait it appears to just be a display model.";
close;
@@ -21,25 +21,25 @@
// Museum
-021-2.gat,71,161,0|script|Talponian#Female|404,
+021-2.gat,71,161,0|script|Talponian#Female|404
{
mes "A Female Talponian.";
close;
}
-021-2.gat,77,161,0|script|Talponian#Male|405,
+021-2.gat,77,161,0|script|Talponian#Male|405
{
mes "A Male Talponian.";
close;
}
-021-2.gat,83,161,0|script|Gispaan#Female|406,
+021-2.gat,83,161,0|script|Gispaan#Female|406
{
mes "A Female Gispaan.";
close;
}
-021-2.gat,89,161,0|script|Gispaan#Male|407,
+021-2.gat,89,161,0|script|Gispaan#Male|407
{
mes "A Male Gispaan.";
close;
diff --git a/world/map/npc/021-2/rebecca.txt b/world/map/npc/021-2/rebecca.txt
index 90ad16e9..37df8d65 100644
--- a/world/map/npc/021-2/rebecca.txt
+++ b/world/map/npc/021-2/rebecca.txt
@@ -1,6 +1,6 @@
//
-021-2.gat,26,54,0|script|Rebecca|118,
+021-2.gat,26,54,0|script|Rebecca|118
{
set @npcname$, "Rebecca the Inn Keeper";
set @cost, 100;
diff --git a/world/map/npc/021-2/yanis.txt b/world/map/npc/021-2/yanis.txt
index 86c40fad..0cc28962 100644
--- a/world/map/npc/021-2/yanis.txt
+++ b/world/map/npc/021-2/yanis.txt
@@ -1,7 +1,7 @@
// Government official taking care about shop licenses
// involved in quest given by 021-1/imec.txt and 021-2/kylian.txt
-021-2.gat,33,17,0|script|Yanis|107,
+021-2.gat,33,17,0|script|Yanis|107
{
set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowYanisNT;
set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-11 00:05:31 +0000