diff options
| author | Wushin <pasekei@gmail.com> | 2014-11-07 08:42:44 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-11-07 08:42:44 -0600 |
| commit | 63c2f12d64ab327d60fc41bfa37fd12b5f7e7649 (patch) | |
| tree | fd9087fa7497649a1f4defc4cf8e9b1c241fe0b0 | |
| parent | 95c0fa59d5ab80b96500a89aa9d28fe87e544dc6 (diff) | |
| parent | 4cc9ace3c293a6592bcca06db2a558e01308372a (diff) | |
| download | serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.gz serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.bz2 serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.xz serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.zip | |
Merge pull request #206 from wushin/AST-FIX
AST script fix
543 files changed, 2214 insertions, 2228 deletions
diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt index 85573370..3b2cd620 100644 --- a/world/map/npc/001-1/_mobs.txt +++ b/world/map/npc/001-1/_mobs.txt @@ -1,29 +1,29 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // South Tulimshar mobs -001-1.gat,45,86,2,1|monster|Scorpion|1003,1,30000,30000,Mob001-1::On1003 -001-1.gat,43,85,2,1|monster|Scorpion|1003,1,60000,30000,Mob001-1::On1003 -001-1.gat,45,87,1,1|monster|Scorpion|1003,1,90000,30000,Mob001-1::On1003 -001-1.gat,45,85,1,1|monster|Scorpion|1003,1,180000,30000,Mob001-1::On1003 -001-1.gat,42,86,1,1|monster|Scorpion|1003,1,270000,30000,Mob001-1::On1003 -001-1.gat,43,87,2,1|monster|Scorpion|1003,1,360000,30000,Mob001-1::On1003 -001-1.gat,83,28,11,12|monster|Maggot|1002,5,100000,30000,Mob001-1::On1002 -001-1.gat,115,26,13,9|monster|Maggot|1002,3,100000,30000,Mob001-1::On1002 -001-1.gat,124,53,15,13|monster|Maggot|1002,10,100000,30000,Mob001-1::On1002 -001-1.gat,120,64,15,13|monster|Maggot|1002,11,100000,30000,Mob001-1::On1002 -001-1.gat,53,23,26,4|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002 -001-1.gat,68,67,9,10|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002 -001-1.gat,99,81,24,4|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002 -001-1.gat,139,65,12,23|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002 -001-1.gat,113,47,8,11|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002 -001-1.gat,132,38,11,12|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002 -001-1.gat,77,49,17,13|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002 -001-1.gat,21,74,6,18|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002 -001-1.gat,122,59,17,22|monster|GiantMaggot|1006,1,100000,30000,Mob001-1::On1006 -001-1.gat,137,25,15,7|monster|FireGoblin|1011,1,61000,60000,Mob001-1::On1011 +001-1.gat,45,86,2,1|monster|Scorpion|1003,1,30000ms,30000ms,Mob001-1::On1003 +001-1.gat,43,85,2,1|monster|Scorpion|1003,1,60000ms,30000ms,Mob001-1::On1003 +001-1.gat,45,87,1,1|monster|Scorpion|1003,1,90000ms,30000ms,Mob001-1::On1003 +001-1.gat,45,85,1,1|monster|Scorpion|1003,1,180000ms,30000ms,Mob001-1::On1003 +001-1.gat,42,86,1,1|monster|Scorpion|1003,1,270000ms,30000ms,Mob001-1::On1003 +001-1.gat,43,87,2,1|monster|Scorpion|1003,1,360000ms,30000ms,Mob001-1::On1003 +001-1.gat,83,28,11,12|monster|Maggot|1002,5,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,115,26,13,9|monster|Maggot|1002,3,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,124,53,15,13|monster|Maggot|1002,10,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,120,64,15,13|monster|Maggot|1002,11,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,53,23,26,4|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,68,67,9,10|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,99,81,24,4|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,139,65,12,23|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,113,47,8,11|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,132,38,11,12|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,77,49,17,13|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,21,74,6,18|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002 +001-1.gat,122,59,17,22|monster|GiantMaggot|1006,1,100000ms,30000ms,Mob001-1::On1006 +001-1.gat,137,25,15,7|monster|FireGoblin|1011,1,61000ms,60000ms,Mob001-1::On1011 -001-1.gat,0,0,0|script|Mob001-1|-1, +001-1.gat,0,0,0|script|Mob001-1|-1 { end; diff --git a/world/map/npc/001-1/banker.txt b/world/map/npc/001-1/banker.txt index ddd1d4e3..cd5e84df 100644 --- a/world/map/npc/001-1/banker.txt +++ b/world/map/npc/001-1/banker.txt @@ -1,6 +1,6 @@ // -001-1.gat,58,50,0|script|Tybalt|107, +001-1.gat,58,50,0|script|Tybalt|107 { callfunc "ClearVariables"; set @npcname$, "Tybalt"; diff --git a/world/map/npc/001-1/barber.txt b/world/map/npc/001-1/barber.txt index 53d60778..f1e0262a 100644 --- a/world/map/npc/001-1/barber.txt +++ b/world/map/npc/001-1/barber.txt @@ -1,6 +1,6 @@ // -001-1.gat,52,36,0|script|Nicolas|100, +001-1.gat,52,36,0|script|Nicolas|100 { mes "[Nicolas the Barber]"; mes "\"Do you need a barber?\""; diff --git a/world/map/npc/001-1/bard.txt b/world/map/npc/001-1/bard.txt index d4c3b8f7..6b0d7d77 100644 --- a/world/map/npc/001-1/bard.txt +++ b/world/map/npc/001-1/bard.txt @@ -1,6 +1,6 @@ // -001-1.gat,40,73,0|script|Bard|152, +001-1.gat,40,73,0|script|Bard|152 { setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"", "\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"", diff --git a/world/map/npc/001-1/bernard.txt b/world/map/npc/001-1/bernard.txt index a5783e1f..9084f020 100644 --- a/world/map/npc/001-1/bernard.txt +++ b/world/map/npc/001-1/bernard.txt @@ -1,6 +1,6 @@ // Variables used: nibble 0 of QUEST_SouthTulimshar -001-1.gat,35,43,0|script|Bernard|117, +001-1.gat,35,43,0|script|Bernard|117 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt index baed6f2e..f6fd399c 100644 --- a/world/map/npc/001-1/bleacher.txt +++ b/world/map/npc/001-1/bleacher.txt @@ -1,6 +1,6 @@ // -001-1.gat,29,50,0|script|Candide|156, +001-1.gat,29,50,0|script|Candide|156 { mes "[Candide]"; mes "\"I've figured out how that volcanic ash bleaches cloth."; diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt index 15ead65e..7213370c 100644 --- a/world/map/npc/001-1/children.txt +++ b/world/map/npc/001-1/children.txt @@ -1,6 +1,6 @@ // Aisha -001-1.gat,95,29,0|script|Aisha|108, +001-1.gat,95,29,0|script|Aisha|108 { set @TEMP,rand(10); if(@TEMP == 1) goto L_1; diff --git a/world/map/npc/001-1/constable.txt b/world/map/npc/001-1/constable.txt index e5de9b92..0b167873 100644 --- a/world/map/npc/001-1/constable.txt +++ b/world/map/npc/001-1/constable.txt @@ -1,6 +1,6 @@ // -001-1.gat,37,35,0|script|Constable Perry Graf|150, +001-1.gat,37,35,0|script|Constable Perry Graf|150 { // set @npcname$, "Constable Perry Graf"; set @canSkip, 1; diff --git a/world/map/npc/001-1/dock.txt b/world/map/npc/001-1/dock.txt index f0cb0a77..4677097d 100644 --- a/world/map/npc/001-1/dock.txt +++ b/world/map/npc/001-1/dock.txt @@ -1,6 +1,6 @@ // Ferry Sign // Author: Wushin -001-1.gat,48,71,0|script|Ferry Schedule#1|396, +001-1.gat,48,71,0|script|Ferry Schedule#1|396 { callfunc "FerryManifest"; end; diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt index 94631d2f..ce330f8a 100644 --- a/world/map/npc/001-1/elanore.txt +++ b/world/map/npc/001-1/elanore.txt @@ -1,6 +1,6 @@ // -function|script|ElanoreFix|, +function|script|ElanoreFix { set @Q_MASK, NIBBLE_1_MASK; set @Q_SHIFT, NIBBLE_1_SHIFT; @@ -17,7 +17,7 @@ function|script|ElanoreFix|, return; } -001-1.gat,58,68,0|script|Elanore#_M|108, +001-1.gat,58,68,0|script|Elanore#_M|108 { set @has_magic, getskilllv(SKILL_MAGIC); @@ -614,8 +614,6 @@ L_Close: close; S_update_var: - set QUEST_MAGIC2, - (QUEST_MAGIC2 & ~(@Q_MASK) - | (@Q_status << @Q_SHIFT)); + set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT)); return; } diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt index 2cb68e35..3bc2e141 100644 --- a/world/map/npc/001-1/entertainer.txt +++ b/world/map/npc/001-1/entertainer.txt @@ -1,6 +1,6 @@ // Emote NPC allows for players to learn the emote skill -001-1.gat,30,43,0|script|Entertainer|165, +001-1.gat,30,43,0|script|Entertainer|165 { mes "[Entertainer]"; mes "\"Yes how can I help you?\""; diff --git a/world/map/npc/001-1/gossip.txt b/world/map/npc/001-1/gossip.txt index d535e22a..28d4455d 100644 --- a/world/map/npc/001-1/gossip.txt +++ b/world/map/npc/001-1/gossip.txt @@ -1,6 +1,6 @@ // NPC to provide hints on progression of linear quest chain in Tulimshar -001-1.gat,49,31,0|script|Gladys|154, +001-1.gat,49,31,0|script|Gladys|154 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt index 9be261d0..c481e098 100644 --- a/world/map/npc/001-1/guards.txt +++ b/world/map/npc/001-1/guards.txt @@ -1,6 +1,6 @@ // -001-1.gat,48,79,0|script|Ekinu|104, +001-1.gat,48,79,0|script|Ekinu|104 { mes "[Ekinu the Town Guard]"; mes "\"What a disaster... I can't believe that we managed to rebuild the town so quickly.\""; @@ -75,7 +75,7 @@ L_Close: close; } -001-1.gat,40,79,0|script|Ryan|104, +001-1.gat,40,79,0|script|Ryan|104 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/001-1/guide.txt b/world/map/npc/001-1/guide.txt index 07dd6bc3..69a0231d 100644 --- a/world/map/npc/001-1/guide.txt +++ b/world/map/npc/001-1/guide.txt @@ -1,6 +1,6 @@ // -001-1.gat,32,27,0|script|Ian|102, +001-1.gat,32,27,0|script|Ian|102 { // This line is only relevant for players, who started before the timestamp was introduced. // Set the graduation cap flag at the right position. diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt index fb851b77..af1b1487 100644 --- a/world/map/npc/001-1/luca.txt +++ b/world/map/npc/001-1/luca.txt @@ -1,6 +1,6 @@ // -001-1.gat,108,55,0|script|Luca|102, +001-1.gat,108,55,0|script|Luca|102 { set @EXP_BRAWLING, 2000; diff --git a/world/map/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt index ea51d12e..c778038d 100644 --- a/world/map/npc/001-1/merchant.txt +++ b/world/map/npc/001-1/merchant.txt @@ -1,3 +1,3 @@ // -001-1.gat,38,50,0|shop|Neko|101,CactusDrink :-1,CactusPotion :-1,Beer :-1,ChickenLeg :-2 +001-1.gat,38,50,0|shop|Neko|101,CactusDrink:*1,CactusPotion:*1,Beer:*1,ChickenLeg:*2 diff --git a/world/map/npc/001-1/mikhail.txt b/world/map/npc/001-1/mikhail.txt index 9f61dd6c..bc8406fc 100644 --- a/world/map/npc/001-1/mikhail.txt +++ b/world/map/npc/001-1/mikhail.txt @@ -1,6 +1,6 @@ // Variables used: nibble 0 of QUEST_SouthTulimshar -001-1.gat,54,43,0|script|Mikhail|120, +001-1.gat,54,43,0|script|Mikhail|120 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt index a46dfc28..6efa1bcb 100644 --- a/world/map/npc/001-1/monster_guide.txt +++ b/world/map/npc/001-1/monster_guide.txt @@ -1,6 +1,6 @@ // -001-1.gat,49,51,0|script|Aidan|102, +001-1.gat,49,51,0|script|Aidan|102 { if (MPQUEST == 0) goto L_Register; diff --git a/world/map/npc/001-1/npcs.txt b/world/map/npc/001-1/npcs.txt index 9fa58b97..5d59ddd6 100644 --- a/world/map/npc/001-1/npcs.txt +++ b/world/map/npc/001-1/npcs.txt @@ -1,6 +1,6 @@ // Talk NPCs to help make trek interesting around the Bazaar. -001-1.gat,46,26,0|script|Yalina|209, +001-1.gat,46,26,0|script|Yalina|209 { set @npcname$, "Yalina"; @@ -14,7 +14,7 @@ close; } -001-1.gat,84,72,0|script|Cyndala|210, +001-1.gat,84,72,0|script|Cyndala|210 { set @npcname$, "Cyndala"; diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt index 1ae6b168..995704b1 100644 --- a/world/map/npc/001-1/rewards_master.txt +++ b/world/map/npc/001-1/rewards_master.txt @@ -1,6 +1,6 @@ // -001-1.gat,50,51,0|script|Ishi|106, +001-1.gat,50,51,0|script|Ishi|106 { if (MPQUEST == 0) goto L_Register; if (tvis == 0) set tvis, 1; diff --git a/world/map/npc/001-1/sandra.txt b/world/map/npc/001-1/sandra.txt index ae394a3e..13ae156b 100644 --- a/world/map/npc/001-1/sandra.txt +++ b/world/map/npc/001-1/sandra.txt @@ -1,6 +1,6 @@ // Variables used: nibble 3 of QUEST_SouthTulimshar -001-1.gat,110,71,0|script|Sandra|114, +001-1.gat,110,71,0|script|Sandra|114 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt index b218ac4b..a355684a 100644 --- a/world/map/npc/001-1/sarah.txt +++ b/world/map/npc/001-1/sarah.txt @@ -1,6 +1,6 @@ // Variables used: nibble 1 of QUEST_SouthTulimshar -001-1.gat,137,78,0|script|Sarah|106, +001-1.gat,137,78,0|script|Sarah|106 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/001-1/soul-menhir.txt b/world/map/npc/001-1/soul-menhir.txt index be22cb89..792f256e 100644 --- a/world/map/npc/001-1/soul-menhir.txt +++ b/world/map/npc/001-1/soul-menhir.txt @@ -1,6 +1,6 @@ // -001-1.gat,38,69,0|script|Soul Menhir#tulimshar|345, +001-1.gat,38,69,0|script|Soul Menhir#tulimshar|345 { callfunc "ClearVariables"; set @map$, "001-1.gat"; diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt index 493ab3fa..c4c9fd12 100644 --- a/world/map/npc/001-1/trader.txt +++ b/world/map/npc/001-1/trader.txt @@ -3,7 +3,7 @@ // Updated by: TheKandiman // Reviewed by: Wombat -001-1.gat,57,31,0|script|Trader|115, +001-1.gat,57,31,0|script|Trader|115 { set @Ironprice, 1000; set @Sulphurprice, 1200; diff --git a/world/map/npc/001-1/traveler.txt b/world/map/npc/001-1/traveler.txt index 554e9c5f..e91da7c0 100644 --- a/world/map/npc/001-1/traveler.txt +++ b/world/map/npc/001-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -001-1.gat,39,67,0|script|Nina the Traveler|103, +001-1.gat,39,67,0|script|Nina the Traveler|103 { set @NpcName$, "Nina"; set @NpcTravelBit, $@tulimshar_bit; diff --git a/world/map/npc/001-1/vincent.txt b/world/map/npc/001-1/vincent.txt index 7f46ac44..9f342d94 100644 --- a/world/map/npc/001-1/vincent.txt +++ b/world/map/npc/001-1/vincent.txt @@ -1,6 +1,6 @@ // Variables used: nibble 2 of QUEST_SouthTulimshar -001-1.gat,135,42,0|script|Vincent|113, +001-1.gat,135,42,0|script|Vincent|113 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/001-2/_mobs.txt b/world/map/npc/001-2/_mobs.txt index a6625718..138a7f55 100644 --- a/world/map/npc/001-2/_mobs.txt +++ b/world/map/npc/001-2/_mobs.txt @@ -3,7 +3,7 @@ -001-2.gat,0,0,0|script|Mob001-2|-1, +001-2.gat,0,0,0|script|Mob001-2|-1 { end; } diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt index 7648190b..2dea74a3 100644 --- a/world/map/npc/001-2/casino.txt +++ b/world/map/npc/001-2/casino.txt @@ -1,7 +1,7 @@ // Casino // takes part in quest given by 021-2/kylian.txt -001-2.gat,32,72,0|script|#CasinoEntrance|32767,1,1, +001-2.gat,32,72,0|script|#CasinoEntrance|32767,1,1 { set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowCasinoNT; set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); @@ -15,34 +15,34 @@ L_End: end; } -001-2.gat,39,32,0|script|Valdo|117, +001-2.gat,39,32,0|script|Valdo|117 { mes "[Valdo the Worker]"; mes "\"Please let me work. I'm really in a hurry!\""; close; } -001-2.gat,37,65,0|script|Slots#1|400, +001-2.gat,37,65,0|script|Slots#1|400 { callfunc "SlotMachine"; close; } -001-2.gat,39,65,0|script|Slots#2|400, +001-2.gat,39,65,0|script|Slots#2|400 { callfunc "SlotMachine"; close; } -001-2.gat,41,65,0|script|Slots#3|400, +001-2.gat,41,65,0|script|Slots#3|400 { callfunc "SlotMachine"; close; } -001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins :-1 +001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins:*1 -001-2.gat,28,63,0|script|BlackJack|107, +001-2.gat,28,63,0|script|BlackJack|107 { mes "[Croupier]"; mes "\"Would you like to play Black Jack?"; @@ -117,7 +117,7 @@ L_Close: close; } -001-2.gat,22,69,0|script|Roulette|107, +001-2.gat,22,69,0|script|Roulette|107 { mes "[Croupier]"; mes "\"Good evening monsieur..."; diff --git a/world/map/npc/001-2/dedication.txt b/world/map/npc/001-2/dedication.txt index 8533b28e..03268df0 100644 --- a/world/map/npc/001-2/dedication.txt +++ b/world/map/npc/001-2/dedication.txt @@ -1,6 +1,6 @@ // Dedication to Irene Christina -001-2.gat,76,68,0|script|#IreneDedication|400, +001-2.gat,76,68,0|script|#IreneDedication|400 { mes "~ Irene Christina ~"; mes "The song in this house is dedicated to Irene."; diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt index de442ab6..c67bd44f 100644 --- a/world/map/npc/001-2/omar.txt +++ b/world/map/npc/001-2/omar.txt @@ -1,5 +1,5 @@ // -function|script|KadiyaSubquestConsts|, +function|script|KadiyaSubquestConsts { set @Q_kadiya_status, (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; @@ -21,7 +21,7 @@ function|script|KadiyaSubquestConsts|, return; } -001-2.gat,70,60,0|script|Omar|162, +001-2.gat,70,60,0|script|Omar|162 { callfunc "ElanoreFix"; callfunc "KadiyaSubquestConsts"; @@ -178,7 +178,7 @@ S_update_var: return; } -001-2.gat,76,59,0|script|Kadiya|174, +001-2.gat,76,59,0|script|Kadiya|174 { set @child_number, 7; callfunc "XmasList"; diff --git a/world/map/npc/001-2/phaet.txt b/world/map/npc/001-2/phaet.txt index 5711047e..aa0c9848 100644 --- a/world/map/npc/001-2/phaet.txt +++ b/world/map/npc/001-2/phaet.txt @@ -1,6 +1,6 @@ // -001-2.gat,132,25,0|script|Phaet|125,0,0, +001-2.gat,132,25,0|script|Phaet|125,0,0 { mes "[Phaet the Royal Guard]"; mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\""; diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt index 00db7c93..46707cf3 100644 --- a/world/map/npc/001-2/shops.txt +++ b/world/map/npc/001-2/shops.txt @@ -1,3 +1,3 @@ // Bartender -001-2.gat,21,27,0|shop|Bartender#Casino|112,Beer :-1,Cake :-1,CherryCake :-1 +001-2.gat,21,27,0|shop|Bartender#Casino|112,Beer:*1,Cake:*1,CherryCake:*1 diff --git a/world/map/npc/001-2/troupe_leader.txt b/world/map/npc/001-2/troupe_leader.txt index 996e14e7..64eef7b2 100644 --- a/world/map/npc/001-2/troupe_leader.txt +++ b/world/map/npc/001-2/troupe_leader.txt @@ -1,6 +1,6 @@ // -001-2.gat,34,23,0|script|Troupe Leader|165, +001-2.gat,34,23,0|script|Troupe Leader|165 { callfunc "ClearVariables"; diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt index 2a3b53cf..f9f7fc81 100644 --- a/world/map/npc/001-3/_mobs.txt +++ b/world/map/npc/001-3/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Arena mobs -001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob001-3::On1002 +001-3.gat,0,0,0,0|monster|Maggot|1002,10,0ms,0ms,Mob001-3::On1002 -001-3.gat,0,0,0|script|Mob001-3|-1, +001-3.gat,0,0,0|script|Mob001-3|-1 { end; diff --git a/world/map/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt index 0c79d3a2..c02a9a17 100644 --- a/world/map/npc/001-3/guards.txt +++ b/world/map/npc/001-3/guards.txt @@ -1,4 +1,4 @@ -001-3.gat,77,37,0|script|Phaet#arena|125, +001-3.gat,77,37,0|script|Phaet#arena|125 { mes "[Phaet the Royal Guard]"; mes "\"Do you want to go back?\""; @@ -25,7 +25,7 @@ L_FightClub: close; } -001-3.gat,69,37,0|script|Aradin|126, +001-3.gat,69,37,0|script|Aradin|126 { mes "[Aradin the Royal Guard]"; mes "\"Don't touch me..."; diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt index 56ddb9f6..e795040e 100644 --- a/world/map/npc/002-1/_mobs.txt +++ b/world/map/npc/002-1/_mobs.txt @@ -1,23 +1,23 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Sandstorm Desert mobs -002-1.gat,0,0,0,0|monster|Maggot|1002,20,1000,500,Mob002-1::On1002 -002-1.gat,95,97,16,9|monster|Maggot|1002,10,100000,30000,Mob002-1::On1002 -002-1.gat,94,35,11,4|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002 -002-1.gat,68,59,7,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002 -002-1.gat,57,86,15,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002 -002-1.gat,27,85,7,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002 -002-1.gat,44,35,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002 -002-1.gat,38,29,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002 -002-1.gat,62,91,24,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002 -002-1.gat,60,73,38,40|monster|FireGoblin|1011,15,100000,30000,Mob002-1::On1011 -002-1.gat,82,24,34,15|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003 -002-1.gat,32,35,34,33|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003 -002-1.gat,26,73,20,24|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003 -002-1.gat,95,75,15,17|monster|BlackScorpion|1009,1,100000,1800000,Mob002-1::On1009 +002-1.gat,0,0,0,0|monster|Maggot|1002,20,1000ms,500ms,Mob002-1::On1002 +002-1.gat,95,97,16,9|monster|Maggot|1002,10,100000ms,30000ms,Mob002-1::On1002 +002-1.gat,94,35,11,4|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002 +002-1.gat,68,59,7,6|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002 +002-1.gat,57,86,15,8|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002 +002-1.gat,27,85,7,8|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002 +002-1.gat,44,35,3,2|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002 +002-1.gat,38,29,3,2|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002 +002-1.gat,62,91,24,6|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002 +002-1.gat,60,73,38,40|monster|FireGoblin|1011,15,100000ms,30000ms,Mob002-1::On1011 +002-1.gat,82,24,34,15|monster|Scorpion|1003,8,100000ms,30000ms,Mob002-1::On1003 +002-1.gat,32,35,34,33|monster|Scorpion|1003,8,100000ms,30000ms,Mob002-1::On1003 +002-1.gat,26,73,20,24|monster|Scorpion|1003,8,100000ms,30000ms,Mob002-1::On1003 +002-1.gat,95,75,15,17|monster|BlackScorpion|1009,1,100000ms,1800000ms,Mob002-1::On1009 -002-1.gat,0,0,0|script|Mob002-1|-1, +002-1.gat,0,0,0|script|Mob002-1|-1 { end; diff --git a/world/map/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt index 6cfbbdab..f8a6cf66 100644 --- a/world/map/npc/002-1/lieutenant_dausen.txt +++ b/world/map/npc/002-1/lieutenant_dausen.txt @@ -1,7 +1,7 @@ // Lieutenant in charge of monitoring the monster threat surrounding the city. // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-1.gat,54,27,0|script|Lieutenant Dausen|122, +002-1.gat,54,27,0|script|Lieutenant Dausen|122 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-1/nickos.txt b/world/map/npc/002-1/nickos.txt index c610e210..39c1cc66 100644 --- a/world/map/npc/002-1/nickos.txt +++ b/world/map/npc/002-1/nickos.txt @@ -1,7 +1,7 @@ // Sandstorm mine guard // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-1.gat,28,94,0|script|Nickos|123, +002-1.gat,28,94,0|script|Nickos|123 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-1/nomads.txt b/world/map/npc/002-1/nomads.txt index c701efbe..456bc2b6 100644 --- a/world/map/npc/002-1/nomads.txt +++ b/world/map/npc/002-1/nomads.txt @@ -1,6 +1,6 @@ // -002-1.gat,92,100,0|script|Samuel|132, +002-1.gat,92,100,0|script|Samuel|132 { mes "[Samuel the Nomad]"; mes "\"This is really a nice place.\""; @@ -8,7 +8,7 @@ close; } -002-1.gat,102,100,0|script|Elijah|128, +002-1.gat,102,100,0|script|Elijah|128 { mes "[Elijah the Nomad]"; mes "\"It's nice to find a respite like this...\""; diff --git a/world/map/npc/002-1/stewen.txt b/world/map/npc/002-1/stewen.txt index 074fc93c..727c0ee3 100644 --- a/world/map/npc/002-1/stewen.txt +++ b/world/map/npc/002-1/stewen.txt @@ -1,7 +1,7 @@ // East sandstorm guard // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-1.gat,106,76,0|script|Stewen|123, +002-1.gat,106,76,0|script|Stewen|123 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-2/_mobs.txt b/world/map/npc/002-2/_mobs.txt index 91350716..0cdda50c 100644 --- a/world/map/npc/002-2/_mobs.txt +++ b/world/map/npc/002-2/_mobs.txt @@ -3,7 +3,7 @@ -002-2.gat,0,0,0|script|Mob002-2|-1, +002-2.gat,0,0,0|script|Mob002-2|-1 { end; } diff --git a/world/map/npc/002-2/traveler.txt b/world/map/npc/002-2/traveler.txt index 281dcd05..945bc82e 100644 --- a/world/map/npc/002-2/traveler.txt +++ b/world/map/npc/002-2/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -002-2.gat,25,28,0|script|Jena the Traveler|103, +002-2.gat,25,28,0|script|Jena the Traveler|103 { set @NpcName$, "Jena"; set @NpcTravelBit, $@tul_mine_bit; diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt index 7d7ac034..c47e0765 100644 --- a/world/map/npc/002-3/_mobs.txt +++ b/world/map/npc/002-3/_mobs.txt @@ -3,7 +3,7 @@ -002-3.gat,0,0,0|script|Mob002-3|-1, +002-3.gat,0,0,0|script|Mob002-3|-1 { end; } diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt index 3eb2f426..905eec7d 100644 --- a/world/map/npc/002-3/merchant.txt +++ b/world/map/npc/002-3/merchant.txt @@ -1,3 +1,3 @@ // -002-3.gat,60,47,0|shop|Ishyah|109,MinersHat :-1,MinerGloves :-1,ShortBow :-1,Arrow :-1,LeatherShield :-1 +002-3.gat,60,47,0|shop|Ishyah|109,MinersHat:*1,MinerGloves:*1,ShortBow:*1,Arrow:*1,LeatherShield:*1 diff --git a/world/map/npc/002-3/mining_camp_barrier.txt b/world/map/npc/002-3/mining_camp_barrier.txt index 2ff0b35e..a1ae29ed 100644 --- a/world/map/npc/002-3/mining_camp_barrier.txt +++ b/world/map/npc/002-3/mining_camp_barrier.txt @@ -1,6 +1,6 @@ //Sandstorm mine barrier -002-3.gat,82,32,0|script|#Sandstorm_Mine_Barrier|45,0,0, +002-3.gat,82,32,0|script|#Sandstorm_Mine_Barrier|45,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-3/nathan.txt b/world/map/npc/002-3/nathan.txt index 3d847e31..45817d2a 100644 --- a/world/map/npc/002-3/nathan.txt +++ b/world/map/npc/002-3/nathan.txt @@ -1,6 +1,6 @@ // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-3.gat,42,45,6|script|Nathan|109, +002-3.gat,42,45,6|script|Nathan|109 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt index 869e499a..77c9dc63 100644 --- a/world/map/npc/002-4/_mobs.txt +++ b/world/map/npc/002-4/_mobs.txt @@ -1,23 +1,23 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Desert Mines mobs -002-4.gat,39,37,15,11|monster|CaveMaggot|1056,5,100000,30000,Mob002-4::On1056 -002-4.gat,91,41,17,20|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-4::On1108 -002-4.gat,71,35,25,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056 -002-4.gat,69,100,8,5|monster|AngryFireGoblin|1108,2,100000,30000,Mob002-4::On1108 -002-4.gat,68,57,26,24|monster|AngryScorpion|1057,5,100000,30000,Mob002-4::On1057 -002-4.gat,49,58,4,15|monster|AngryScorpion|1057,5,100000,30000,Mob002-4::On1057 -002-4.gat,38,76,15,22|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057 -002-4.gat,58,78,6,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056 -002-4.gat,89,68,11,32|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057 -002-4.gat,84,93,19,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056 -002-4.gat,72,77,21,14|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-4::On1108 -002-4.gat,67,91,11,12|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057 -002-4.gat,58,95,6,13|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056 -002-4.gat,63,100,2,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-4::On1057 +002-4.gat,39,37,15,11|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob002-4::On1056 +002-4.gat,91,41,17,20|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-4::On1108 +002-4.gat,71,35,25,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056 +002-4.gat,69,100,8,5|monster|AngryFireGoblin|1108,2,100000ms,30000ms,Mob002-4::On1108 +002-4.gat,68,57,26,24|monster|AngryScorpion|1057,5,100000ms,30000ms,Mob002-4::On1057 +002-4.gat,49,58,4,15|monster|AngryScorpion|1057,5,100000ms,30000ms,Mob002-4::On1057 +002-4.gat,38,76,15,22|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057 +002-4.gat,58,78,6,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056 +002-4.gat,89,68,11,32|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057 +002-4.gat,84,93,19,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056 +002-4.gat,72,77,21,14|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-4::On1108 +002-4.gat,67,91,11,12|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057 +002-4.gat,58,95,6,13|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056 +002-4.gat,63,100,2,5|monster|AngryScorpion|1057,3,100000ms,30000ms,Mob002-4::On1057 -002-4.gat,0,0,0|script|Mob002-4|-1, +002-4.gat,0,0,0|script|Mob002-4|-1 { end; diff --git a/world/map/npc/002-4/mine_triggerone.txt b/world/map/npc/002-4/mine_triggerone.txt index 4dcf7996..2df6c84c 100644 --- a/world/map/npc/002-4/mine_triggerone.txt +++ b/world/map/npc/002-4/mine_triggerone.txt @@ -1,7 +1,7 @@ //Sandstorm mine trigger 1 Trigger 002-4 35,43 (127) // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-4.gat,30,47,0|script|Button#mine-1|400,0,0, +002-4.gat,30,47,0|script|Button#mine-1|400,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/mine_triggerthree.txt b/world/map/npc/002-4/mine_triggerthree.txt index dfbb717b..925c01b6 100644 --- a/world/map/npc/002-4/mine_triggerthree.txt +++ b/world/map/npc/002-4/mine_triggerthree.txt @@ -1,7 +1,7 @@ //Sandstorm mine trigger 3 Trigger 002-4 98,42 (127) // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-4.gat,91,99,0|script|Button#mine-3|400,0,0, +002-4.gat,91,99,0|script|Button#mine-3|400,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/mine_triggertwo.txt b/world/map/npc/002-4/mine_triggertwo.txt index 67bd1194..4858bd42 100644 --- a/world/map/npc/002-4/mine_triggertwo.txt +++ b/world/map/npc/002-4/mine_triggertwo.txt @@ -3,7 +3,7 @@ // - nibble 4 and 5 of QUEST_SouthTulimshar // - in FLAGS, FLAG_OPENED_UNDERGROUND -002-4.gat,100,37,0|script|Button#mine-2|400,0,0, +002-4.gat,100,37,0|script|Button#mine-2|400,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/naem.txt b/world/map/npc/002-4/naem.txt index d8afcfcc..08bf0056 100644 --- a/world/map/npc/002-4/naem.txt +++ b/world/map/npc/002-4/naem.txt @@ -2,7 +2,7 @@ // - nibble 4 and 5 of QUEST_SouthTulimshar // - in FLAGS, bits FLAG_GOT_NAEM_GLOVES and FLAG_OPENED_UNDERGROUND -002-4.gat,91,96,6|script|Naem|109, +002-4.gat,91,96,6|script|Naem|109 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/underground_palace_barrier.txt b/world/map/npc/002-4/underground_palace_barrier.txt index 78336b8b..c0946963 100644 --- a/world/map/npc/002-4/underground_palace_barrier.txt +++ b/world/map/npc/002-4/underground_palace_barrier.txt @@ -1,6 +1,6 @@ //underground palace barrier -002-4.gat,68,98,0|script|#UGP_Barrier|45,0,0, +002-4.gat,68,98,0|script|#UGP_Barrier|45,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-5/_mobs.txt b/world/map/npc/002-5/_mobs.txt index 018bebc3..65d87107 100644 --- a/world/map/npc/002-5/_mobs.txt +++ b/world/map/npc/002-5/_mobs.txt @@ -1,26 +1,26 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Deep Desert Mines mobs -002-5.gat,37,89,12,7|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-5::On1108 -002-5.gat,33,76,3,11|monster|CaveMaggot|1056,3,100000,30000,Mob002-5::On1056 -002-5.gat,40,68,7,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-5::On1057 -002-5.gat,40,38,18,5|monster|Archant|1060,3,100000,30000,Mob002-5::On1060 -002-5.gat,56,97,2,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060 -002-5.gat,68,100,12,2|monster|YellowSlime|1007,4,100000,30000,Mob002-5::On1007 -002-5.gat,91,80,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060 -002-5.gat,89,94,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060 -002-5.gat,74,78,1,5|monster|Archant|1060,2,100000,30000,Mob002-5::On1060 -002-5.gat,94,72,2,4|monster|Archant|1060,1,100000,30000,Mob002-5::On1060 -002-5.gat,90,61,6,2|monster|YellowSlime|1007,1,100000,30000,Mob002-5::On1007 -002-5.gat,74,35,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060 -002-5.gat,84,33,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060 -002-5.gat,84,46,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060 -002-5.gat,99,38,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060 -002-5.gat,93,38,8,2|monster|YellowSlime|1007,2,100000,30000,Mob002-5::On1007 -002-5.gat,62,62,5,43|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-5::On1108 - - -002-5.gat,0,0,0|script|Mob002-5|-1, +002-5.gat,37,89,12,7|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-5::On1108 +002-5.gat,33,76,3,11|monster|CaveMaggot|1056,3,100000ms,30000ms,Mob002-5::On1056 +002-5.gat,40,68,7,5|monster|AngryScorpion|1057,3,100000ms,30000ms,Mob002-5::On1057 +002-5.gat,40,38,18,5|monster|Archant|1060,3,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,56,97,2,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,68,100,12,2|monster|YellowSlime|1007,4,100000ms,30000ms,Mob002-5::On1007 +002-5.gat,91,80,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,89,94,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,74,78,1,5|monster|Archant|1060,2,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,94,72,2,4|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,90,61,6,2|monster|YellowSlime|1007,1,100000ms,30000ms,Mob002-5::On1007 +002-5.gat,74,35,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,84,33,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,84,46,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,99,38,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060 +002-5.gat,93,38,8,2|monster|YellowSlime|1007,2,100000ms,30000ms,Mob002-5::On1007 +002-5.gat,62,62,5,43|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-5::On1108 + + +002-5.gat,0,0,0|script|Mob002-5|-1 { end; diff --git a/world/map/npc/002-5/chest.txt b/world/map/npc/002-5/chest.txt index f3818bf6..785247d5 100644 --- a/world/map/npc/002-5/chest.txt +++ b/world/map/npc/002-5/chest.txt @@ -1,6 +1,6 @@ // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-5.gat,93,37,0|script|Supply Chest|378, +002-5.gat,93,37,0|script|Supply Chest|378 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-5/sema.txt b/world/map/npc/002-5/sema.txt index 5519bcae..25b4fc29 100644 --- a/world/map/npc/002-5/sema.txt +++ b/world/map/npc/002-5/sema.txt @@ -1,6 +1,6 @@ // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-5.gat,43,91,6|script|Sema|340, +002-5.gat,43,91,6|script|Sema|340 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt index 74bb6d5e..a2ea4b4c 100644 --- a/world/map/npc/003-1/_mobs.txt +++ b/world/map/npc/003-1/_mobs.txt @@ -1,15 +1,15 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Beach mobs -003-1.gat,158,68,28,96|monster|GiantMaggot|1006,10,100000,30000,Mob003-1::On1006 -003-1.gat,0,0,0,0|monster|SeaSlime|1033,15,100000,30000,Mob003-1::On1033 -003-1.gat,120,31,22,22|monster|SeaSlime|1033,5,100000,30000,Mob003-1::On1033 -003-1.gat,119,68,105,101|monster|GreenSlime|1005,35,100000,30000,Mob003-1::On1005 -003-1.gat,134,69,76,71|monster|RedScorpion|1004,20,100000,30000,Mob003-1::On1004 -003-1.gat,35,25,10,3|monster|MountainSnake|1026,1,700000,600000,Mob003-1::On1026 +003-1.gat,158,68,28,96|monster|GiantMaggot|1006,10,100000ms,30000ms,Mob003-1::On1006 +003-1.gat,0,0,0,0|monster|SeaSlime|1033,15,100000ms,30000ms,Mob003-1::On1033 +003-1.gat,120,31,22,22|monster|SeaSlime|1033,5,100000ms,30000ms,Mob003-1::On1033 +003-1.gat,119,68,105,101|monster|GreenSlime|1005,35,100000ms,30000ms,Mob003-1::On1005 +003-1.gat,134,69,76,71|monster|RedScorpion|1004,20,100000ms,30000ms,Mob003-1::On1004 +003-1.gat,35,25,10,3|monster|MountainSnake|1026,1,700000ms,600000ms,Mob003-1::On1026 -003-1.gat,0,0,0|script|Mob003-1|-1, +003-1.gat,0,0,0|script|Mob003-1|-1 { end; diff --git a/world/map/npc/003-1/stranger.txt b/world/map/npc/003-1/stranger.txt index 7166ee49..65f7abd9 100644 --- a/world/map/npc/003-1/stranger.txt +++ b/world/map/npc/003-1/stranger.txt @@ -1,4 +1,4 @@ -003-1.gat,35,25,0|script|Stranger|192, +003-1.gat,35,25,0|script|Stranger|192 { set @IRONINGOT, 5; set @PINKANTENNA, 21; diff --git a/world/map/npc/003-2/_mobs.txt b/world/map/npc/003-2/_mobs.txt index e4b0befc..7a08ce43 100644 --- a/world/map/npc/003-2/_mobs.txt +++ b/world/map/npc/003-2/_mobs.txt @@ -3,7 +3,7 @@ -003-2.gat,0,0,0|script|Mob003-2|-1, +003-2.gat,0,0,0|script|Mob003-2|-1 { end; } diff --git a/world/map/npc/004-1/_mobs.txt b/world/map/npc/004-1/_mobs.txt index c2a2c3e5..4802574a 100644 --- a/world/map/npc/004-1/_mobs.txt +++ b/world/map/npc/004-1/_mobs.txt @@ -1,16 +1,16 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Beach mobs -004-1.gat,39,57,8,29|monster|SeaSlime|1033,5,100000,30000,Mob004-1::On1033 -004-1.gat,33,83,9,40|monster|SeaSlime|1033,11,100000,30000,Mob004-1::On1033 -004-1.gat,28,103,11,14|monster|SeaSlime|1033,7,100000,30000,Mob004-1::On1033 -004-1.gat,71,104,27,20|monster|GiantMaggot|1006,5,100000,30000,Mob004-1::On1006 -004-1.gat,76,68,21,49|monster|RedScorpion|1004,13,100000,30000,Mob004-1::On1004 -004-1.gat,68,25,19,10|monster|GiantMaggot|1006,2,100000,30000,Mob004-1::On1006 -004-1.gat,93,27,2,3|monster|BlackScorpion|1009,1,120000,60000,Mob004-1::On1009 +004-1.gat,39,57,8,29|monster|SeaSlime|1033,5,100000ms,30000ms,Mob004-1::On1033 +004-1.gat,33,83,9,40|monster|SeaSlime|1033,11,100000ms,30000ms,Mob004-1::On1033 +004-1.gat,28,103,11,14|monster|SeaSlime|1033,7,100000ms,30000ms,Mob004-1::On1033 +004-1.gat,71,104,27,20|monster|GiantMaggot|1006,5,100000ms,30000ms,Mob004-1::On1006 +004-1.gat,76,68,21,49|monster|RedScorpion|1004,13,100000ms,30000ms,Mob004-1::On1004 +004-1.gat,68,25,19,10|monster|GiantMaggot|1006,2,100000ms,30000ms,Mob004-1::On1006 +004-1.gat,93,27,2,3|monster|BlackScorpion|1009,1,120000ms,60000ms,Mob004-1::On1009 -004-1.gat,0,0,0|script|Mob004-1|-1, +004-1.gat,0,0,0|script|Mob004-1|-1 { end; diff --git a/world/map/npc/004-2/_mobs.txt b/world/map/npc/004-2/_mobs.txt index 36144a55..8d94f675 100644 --- a/world/map/npc/004-2/_mobs.txt +++ b/world/map/npc/004-2/_mobs.txt @@ -3,7 +3,7 @@ -004-2.gat,0,0,0|script|Mob004-2|-1, +004-2.gat,0,0,0|script|Mob004-2|-1 { end; } diff --git a/world/map/npc/004-2/pirate_cave_exit.txt b/world/map/npc/004-2/pirate_cave_exit.txt index 42b2a6b5..c5149098 100644 --- a/world/map/npc/004-2/pirate_cave_exit.txt +++ b/world/map/npc/004-2/pirate_cave_exit.txt @@ -1,6 +1,6 @@ // The Secret Pirate Cave Entrance -004-2.gat,33,62,0|script|#piratecave1|45,1,1, +004-2.gat,33,62,0|script|#piratecave1|45,1,1 { mes "[Trapdoor]"; mes "\"Descend into the caves?\""; diff --git a/world/map/npc/004-3/_mobs.txt b/world/map/npc/004-3/_mobs.txt index d3c48667..f221675e 100644 --- a/world/map/npc/004-3/_mobs.txt +++ b/world/map/npc/004-3/_mobs.txt @@ -1,16 +1,16 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Pirate Caves First Floor mobs -004-3.gat,43,72,7,8|monster|Thug|1119,2,100000,30000,Mob004-3::On1119 -004-3.gat,43,72,7,8|monster|Swashbuckler|1120,1,100000,30000,Mob004-3::On1120 -004-3.gat,43,72,7,8|monster|Grenadier|1121,1,100000,30000,Mob004-3::On1121 -004-3.gat,28,69,8,2|monster|Thug|1119,2,100000,30000,Mob004-3::On1119 -004-3.gat,71,63,7,8|monster|Thug|1119,2,100000,30000,Mob004-3::On1119 -004-3.gat,39,39,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-3::On1120 -004-3.gat,71,63,7,8|monster|Grenadier|1121,1,100000,30000,Mob004-3::On1121 +004-3.gat,43,72,7,8|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119 +004-3.gat,43,72,7,8|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob004-3::On1120 +004-3.gat,43,72,7,8|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-3::On1121 +004-3.gat,28,69,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119 +004-3.gat,71,63,7,8|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119 +004-3.gat,39,39,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-3::On1120 +004-3.gat,71,63,7,8|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-3::On1121 -004-3.gat,0,0,0|script|Mob004-3|-1, +004-3.gat,0,0,0|script|Mob004-3|-1 { end; diff --git a/world/map/npc/004-4/_mobs.txt b/world/map/npc/004-4/_mobs.txt index 75610f11..698da90b 100644 --- a/world/map/npc/004-4/_mobs.txt +++ b/world/map/npc/004-4/_mobs.txt @@ -1,18 +1,18 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Pirate Caves Second Floor mobs -004-4.gat,36,62,5,20|monster|Grenadier|1121,1,100000,30000,Mob004-4::On1121 -004-4.gat,37,61,5,21|monster|Swashbuckler|1120,2,100000,30000,Mob004-4::On1120 -004-4.gat,62,52,12,7|monster|Thug|1119,2,100000,30000,Mob004-4::On1119 -004-4.gat,34,87,12,7|monster|Thug|1119,2,100000,30000,Mob004-4::On1119 -004-4.gat,37,62,6,22|monster|Thug|1119,2,100000,30000,Mob004-4::On1119 -004-4.gat,34,88,10,6|monster|Swashbuckler|1120,2,100000,30000,Mob004-4::On1120 -004-4.gat,63,52,10,6|monster|Swashbuckler|1120,2,100000,30000,Mob004-4::On1120 -004-4.gat,62,52,11,4|monster|Grenadier|1121,1,100000,30000,Mob004-4::On1121 -004-4.gat,34,88,10,4|monster|Grenadier|1121,1,100000,30000,Mob004-4::On1121 +004-4.gat,36,62,5,20|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121 +004-4.gat,37,61,5,21|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120 +004-4.gat,62,52,12,7|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119 +004-4.gat,34,87,12,7|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119 +004-4.gat,37,62,6,22|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119 +004-4.gat,34,88,10,6|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120 +004-4.gat,63,52,10,6|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120 +004-4.gat,62,52,11,4|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121 +004-4.gat,34,88,10,4|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121 -004-4.gat,0,0,0|script|Mob004-4|-1, +004-4.gat,0,0,0|script|Mob004-4|-1 { end; diff --git a/world/map/npc/004-5/_mobs.txt b/world/map/npc/004-5/_mobs.txt index 3c636b8e..436843fd 100644 --- a/world/map/npc/004-5/_mobs.txt +++ b/world/map/npc/004-5/_mobs.txt @@ -1,21 +1,21 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Pirate Den mobs -004-5.gat,41,70,6,5|monster|Grenadier|1121,1,100000,30000,Mob004-5::On1121 -004-5.gat,41,70,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-5::On1120 -004-5.gat,40,70,8,2|monster|Thug|1119,2,100000,30000,Mob004-5::On1119 -004-5.gat,35,86,6,5|monster|Grenadier|1121,1,100000,30000,Mob004-5::On1121 -004-5.gat,34,86,8,2|monster|Thug|1119,2,100000,30000,Mob004-5::On1119 -004-5.gat,35,86,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-5::On1120 -004-5.gat,54,38,6,5|monster|Grenadier|1121,1,100000,30000,Mob004-5::On1121 -004-5.gat,53,38,8,2|monster|Thug|1119,2,100000,30000,Mob004-5::On1119 -004-5.gat,54,38,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-5::On1120 -004-5.gat,81,38,6,5|monster|Grenadier|1121,1,100000,30000,Mob004-5::On1121 -004-5.gat,80,38,8,2|monster|Thug|1119,2,100000,30000,Mob004-5::On1119 -004-5.gat,81,38,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-5::On1120 +004-5.gat,41,70,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121 +004-5.gat,41,70,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120 +004-5.gat,40,70,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119 +004-5.gat,35,86,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121 +004-5.gat,34,86,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119 +004-5.gat,35,86,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120 +004-5.gat,54,38,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121 +004-5.gat,53,38,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119 +004-5.gat,54,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120 +004-5.gat,81,38,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121 +004-5.gat,80,38,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119 +004-5.gat,81,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120 -004-5.gat,0,0,0|script|Mob004-5|-1, +004-5.gat,0,0,0|script|Mob004-5|-1 { end; diff --git a/world/map/npc/004-5/chest.txt b/world/map/npc/004-5/chest.txt index 1d0e9d32..23674b24 100644 --- a/world/map/npc/004-5/chest.txt +++ b/world/map/npc/004-5/chest.txt @@ -1,4 +1,4 @@ -004-5.gat,89,67,0|script|Old Chest#crastur|111, +004-5.gat,89,67,0|script|Old Chest#crastur|111 { setarray @npc_loc, 89, 67, 1; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/005-1/_mobs.txt b/world/map/npc/005-1/_mobs.txt index d20f1eec..22f80e0f 100644 --- a/world/map/npc/005-1/_mobs.txt +++ b/world/map/npc/005-1/_mobs.txt @@ -1,20 +1,20 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Snake Desert mobs -005-1.gat,0,0,0,0|monster|Maggot|1002,1,100000,30000,Mob005-1::On1002 -005-1.gat,0,0,0,0|monster|Snake|1010,1,100000,30000,Mob005-1::On1010 -005-1.gat,71,77,9,6|monster|Snake|1010,2,40000,50000,Mob005-1::On1010 -005-1.gat,92,25,8,5|monster|Snake|1010,3,40000,50000,Mob005-1::On1010 -005-1.gat,99,68,95,52|monster|GiantMaggot|1006,20,100000,30000,Mob005-1::On1006 -005-1.gat,91,15,66,23|monster|BlackScorpion|1009,7,100000,30000,Mob005-1::On1009 -005-1.gat,99,87,85,32|monster|BlackScorpion|1009,8,100000,30000,Mob005-1::On1009 -005-1.gat,30,43,21,25|monster|GreenSlime|1005,3,100000,30000,Mob005-1::On1005 -005-1.gat,118,70,3,2|monster|GreenSlime|1005,2,100000,30000,Mob005-1::On1005 -005-1.gat,163,71,32,65|monster|Snake|1010,8,100000,30000,Mob005-1::On1010 -005-1.gat,122,52,77,84|monster|Maggot|1002,20,100000,30000,Mob005-1::On1002 - - -005-1.gat,0,0,0|script|Mob005-1|-1, +005-1.gat,0,0,0,0|monster|Maggot|1002,1,100000ms,30000ms,Mob005-1::On1002 +005-1.gat,0,0,0,0|monster|Snake|1010,1,100000ms,30000ms,Mob005-1::On1010 +005-1.gat,71,77,9,6|monster|Snake|1010,2,40000ms,50000ms,Mob005-1::On1010 +005-1.gat,92,25,8,5|monster|Snake|1010,3,40000ms,50000ms,Mob005-1::On1010 +005-1.gat,99,68,95,52|monster|GiantMaggot|1006,20,100000ms,30000ms,Mob005-1::On1006 +005-1.gat,91,15,66,23|monster|BlackScorpion|1009,7,100000ms,30000ms,Mob005-1::On1009 +005-1.gat,99,87,85,32|monster|BlackScorpion|1009,8,100000ms,30000ms,Mob005-1::On1009 +005-1.gat,30,43,21,25|monster|GreenSlime|1005,3,100000ms,30000ms,Mob005-1::On1005 +005-1.gat,118,70,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob005-1::On1005 +005-1.gat,163,71,32,65|monster|Snake|1010,8,100000ms,30000ms,Mob005-1::On1010 +005-1.gat,122,52,77,84|monster|Maggot|1002,20,100000ms,30000ms,Mob005-1::On1002 + + +005-1.gat,0,0,0|script|Mob005-1|-1 { end; diff --git a/world/map/npc/005-1/npcs.txt b/world/map/npc/005-1/npcs.txt index 8189a4a4..6eed9735 100644 --- a/world/map/npc/005-1/npcs.txt +++ b/world/map/npc/005-1/npcs.txt @@ -1,7 +1,7 @@ // -//005-1.gat,66,75,0|script|Kieron|132, +//005-1.gat,66,75,0|script|Kieron|132 //{ // mes "[Kieron]"; // mes "\"Be careful if you're going in that cave,"; @@ -9,7 +9,7 @@ // close; //} -005-1.gat,91,23,0|script|William|131, +005-1.gat,91,23,0|script|William|131 { mes "[William]"; mes "\"Going in the cave?"; diff --git a/world/map/npc/005-1/spirit.txt b/world/map/npc/005-1/spirit.txt index 6d328d23..6e2784d2 100644 --- a/world/map/npc/005-1/spirit.txt +++ b/world/map/npc/005-1/spirit.txt @@ -1,4 +1,4 @@ -function|script|EarthImpTouch|, +function|script|EarthImpTouch { if (getskilllv(SKILL_MAGIC)) goto L_message; @@ -286,13 +286,13 @@ S_update_var: return; } -005-1.gat,118,70,0|script|#EarthImp0#_M|400, +005-1.gat,118,70,0|script|#EarthImp0#_M|400 { callfunc "EarthImpTouch"; end; } -005-1.gat,119,70,0|script|#EarthImp1#_M|400, +005-1.gat,119,70,0|script|#EarthImp1#_M|400 { callfunc "EarthImpTouch"; end; diff --git a/world/map/npc/005-1/traveler.txt b/world/map/npc/005-1/traveler.txt index b050d355..0d6f2eee 100644 --- a/world/map/npc/005-1/traveler.txt +++ b/world/map/npc/005-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -005-1.gat,73,36,0|script|Kieron the Traveler|103, +005-1.gat,73,36,0|script|Kieron the Traveler|103 { set @NpcName$, "Kieron"; set @NpcTravelBit, $@druid_tree_bit; diff --git a/world/map/npc/005-1/tree.txt b/world/map/npc/005-1/tree.txt index db6541fd..27840370 100644 --- a/world/map/npc/005-1/tree.txt +++ b/world/map/npc/005-1/tree.txt @@ -1,4 +1,4 @@ -function|script|QuestTreeTrigger|, +function|script|QuestTreeTrigger { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; @@ -47,7 +47,7 @@ S_update_var: return; } -function|script|QuestTreeTouch|, +function|script|QuestTreeTouch { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; @@ -155,13 +155,13 @@ L_Close: } -005-1.gat,79,41,0|script|#DruidTree0#_M|400, +005-1.gat,79,41,0|script|#DruidTree0#_M|400 { callfunc "QuestTreeTouch"; end; } -005-1.gat,80,41,0|script|#DruidTree1#_M|400, +005-1.gat,80,41,0|script|#DruidTree1#_M|400 { callfunc "QuestTreeTouch"; end; diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt index ce412a3e..f275f267 100644 --- a/world/map/npc/005-3/_mobs.txt +++ b/world/map/npc/005-3/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Snake Pit mobs -005-3.gat,0,0,0,0|monster|Snake|1010,175,0,0,Mob005-3::On1010 +005-3.gat,0,0,0,0|monster|Snake|1010,175,0ms,0ms,Mob005-3::On1010 -005-3.gat,0,0,0|script|Mob005-3|-1, +005-3.gat,0,0,0|script|Mob005-3|-1 { end; diff --git a/world/map/npc/005-4/_mobs.txt b/world/map/npc/005-4/_mobs.txt index 35b4adb1..cc3a7de8 100644 --- a/world/map/npc/005-4/_mobs.txt +++ b/world/map/npc/005-4/_mobs.txt @@ -3,7 +3,7 @@ -005-4.gat,0,0,0|script|Mob005-4|-1, +005-4.gat,0,0,0|script|Mob005-4|-1 { end; } diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt index 653acd7f..7b5aaf95 100644 --- a/world/map/npc/006-1/_mobs.txt +++ b/world/map/npc/006-1/_mobs.txt @@ -1,24 +1,24 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Desert Mountains mobs -006-1.gat,25,34,12,31|monster|Snake|1010,3,100000,30000,Mob006-1::On1010 -006-1.gat,36,29,9,16|monster|Snake|1010,1,100000,30000,Mob006-1::On1010 -006-1.gat,34,41,4,6|monster|MountainSnake|1026,1,30000,75000,Mob006-1::On1026 -006-1.gat,55,37,27,23|monster|MountainSnake|1026,3,150000,10000,Mob006-1::On1026 -006-1.gat,89,26,33,13|monster|MountainSnake|1026,5,15000,75000,Mob006-1::On1026 -006-1.gat,118,43,22,40|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026 -006-1.gat,115,49,6,3|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026 -006-1.gat,88,47,36,11|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026 -006-1.gat,105,72,25,16|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026 -006-1.gat,75,106,16,22|monster|MountainSnake|1026,4,15000,75000,Mob006-1::On1026 -006-1.gat,102,97,36,29|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026 -006-1.gat,65,65,49,30|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026 -006-1.gat,95,120,38,13|monster|MountainSnake|1026,5,15000,75000,Mob006-1::On1026 -006-1.gat,54,120,29,7|monster|MountainSnake|1026,4,15000,75000,Mob006-1::On1026 -006-1.gat,36,98,33,35|monster|Scorpion|1003,10,100000,30000,Mob006-1::On1003 +006-1.gat,25,34,12,31|monster|Snake|1010,3,100000ms,30000ms,Mob006-1::On1010 +006-1.gat,36,29,9,16|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010 +006-1.gat,34,41,4,6|monster|MountainSnake|1026,1,30000ms,75000ms,Mob006-1::On1026 +006-1.gat,55,37,27,23|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026 +006-1.gat,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,118,43,22,40|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,115,49,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,88,47,36,11|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,105,72,25,16|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,75,106,16,22|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,102,97,36,29|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,65,65,49,30|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,95,120,38,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,54,120,29,7|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026 +006-1.gat,36,98,33,35|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003 -006-1.gat,0,0,0|script|Mob006-1|-1, +006-1.gat,0,0,0|script|Mob006-1|-1 { end; diff --git a/world/map/npc/006-1/mika.txt b/world/map/npc/006-1/mika.txt index d7ba11bc..82b3db85 100644 --- a/world/map/npc/006-1/mika.txt +++ b/world/map/npc/006-1/mika.txt @@ -1,4 +1,4 @@ -006-1.gat,39,22,0|script|Mika|114, +006-1.gat,39,22,0|script|Mika|114 { mes "[Mika]"; mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\""; diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt index b97b0c96..a84922da 100644 --- a/world/map/npc/006-1/pachua.txt +++ b/world/map/npc/006-1/pachua.txt @@ -1,4 +1,4 @@ -006-1.gat,24,113,0|script|Pachua|143, +006-1.gat,24,113,0|script|Pachua|143 { setarray @npc_loc, 24, 113, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/006-1/traveler.txt b/world/map/npc/006-1/traveler.txt index 799e31e7..82b8c8a5 100644 --- a/world/map/npc/006-1/traveler.txt +++ b/world/map/npc/006-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -006-1.gat,25,95,0|script|Rhutan the Traveler|103, +006-1.gat,25,95,0|script|Rhutan the Traveler|103 { set @NpcName$, "Rhutan"; set @NpcTravelBit, $@pachua_bit; diff --git a/world/map/npc/006-2/_mobs.txt b/world/map/npc/006-2/_mobs.txt index a9eb390d..fbda9ffc 100644 --- a/world/map/npc/006-2/_mobs.txt +++ b/world/map/npc/006-2/_mobs.txt @@ -3,7 +3,7 @@ -006-2.gat,0,0,0|script|Mob006-2|-1, +006-2.gat,0,0,0|script|Mob006-2|-1 { end; } diff --git a/world/map/npc/006-2/npcs.txt b/world/map/npc/006-2/npcs.txt index 547a0075..6a32164e 100644 --- a/world/map/npc/006-2/npcs.txt +++ b/world/map/npc/006-2/npcs.txt @@ -1,6 +1,6 @@ // Pachua's Tribe -006-2.gat,49,25,0|script|Falkurn|178, +006-2.gat,49,25,0|script|Falkurn|178 { set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT); set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); @@ -45,7 +45,7 @@ L_Close: close; } -006-2.gat,80,25,0|script|Darug|178, +006-2.gat,80,25,0|script|Darug|178 { mes "[Darug]"; mes "\"We are the all thats left of the natives that used to wander the plains.\""; @@ -65,7 +65,7 @@ L_Close: close; } -006-2.gat,34,64,0|script|Meluna|179, +006-2.gat,34,64,0|script|Meluna|179 { mes "[Meluna]"; mes "\"Greetings traveler, how blows the wind?\""; diff --git a/world/map/npc/006-2/shops.txt b/world/map/npc/006-2/shops.txt index b7e8d85a..d6fff45d 100644 --- a/world/map/npc/006-2/shops.txt +++ b/world/map/npc/006-2/shops.txt @@ -1,5 +1,5 @@ // Exotic Trader // Toy Sabre - 10mil, Cap - 20mil, High Priest Crown - 30mil, Monster Skull Helmet - 30mil -006-2.gat,81,36,0|shop|Reathe|179,ToySabre :10000000,Cap :20000000,HighPriestCrown :30000000,MonsterSkullHelmet :30000000 +006-2.gat,81,36,0|shop|Reathe|179,ToySabre:*10000000,Cap:*20000000,HighPriestCrown:*30000000,MonsterSkullHelmet:*30000000 -006-2.gat,30,35,0|shop|Ardra|179,CactusDrink :-1,CactusPotion :-1,BottleOfWater :-1,RoastedMaggot :-1 +006-2.gat,30,35,0|shop|Ardra|179,CactusDrink:*1,CactusPotion:*1,BottleOfWater:*1,RoastedMaggot:*1 diff --git a/world/map/npc/006-3/_mobs.txt b/world/map/npc/006-3/_mobs.txt index d369a3e7..000615eb 100644 --- a/world/map/npc/006-3/_mobs.txt +++ b/world/map/npc/006-3/_mobs.txt @@ -1,35 +1,35 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Desert Mountain Cave mobs -006-3.gat,108,25,36,8|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026 -006-3.gat,99,50,14,13|monster|MountainSnake|1026,1,15000,90000,Mob006-3::On1026 -006-3.gat,89,63,14,11|monster|MountainSnake|1026,2,15000,90000,Mob006-3::On1026 -006-3.gat,86,90,29,9|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026 -006-3.gat,109,78,12,9|monster|MountainSnake|1026,1,15000,90000,Mob006-3::On1026 -006-3.gat,119,117,15,14|monster|MountainSnake|1026,4,15000,90000,Mob006-3::On1026 -006-3.gat,106,64,14,17|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026 -006-3.gat,65,71,31,35|monster|MountainSnake|1026,10,15000,90000,Mob006-3::On1026 -006-3.gat,57,105,27,30|monster|MountainSnake|1026,8,15000,90000,Mob006-3::On1026 -006-3.gat,73,120,16,5|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026 -006-3.gat,117,54,11,9|monster|MountainSnake|1026,4,15000,90000,Mob006-3::On1026 -006-3.gat,123,62,10,5|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026 -006-3.gat,72,36,24,25|monster|MountainSnake|1026,10,15000,90000,Mob006-3::On1026 -006-3.gat,84,27,5,7|monster|MountainSnake|1026,1,15000,90000,Mob006-3::On1026 -006-3.gat,40,40,36,28|monster|MountainSnake|1026,8,15000,90000,Mob006-3::On1026 -006-3.gat,34,60,27,11|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026 -006-3.gat,87,74,26,9|monster|RedSlime|1008,3,15000,10000,Mob006-3::On1008 -006-3.gat,120,76,9,21|monster|RedSlime|1008,3,15000,10000,Mob006-3::On1008 -006-3.gat,101,85,14,8|monster|RedSlime|1008,4,15000,10000,Mob006-3::On1008 -006-3.gat,44,124,29,7|monster|MountainSnake|1026,5,15000,90000,Mob006-3::On1026 -006-3.gat,90,125,17,7|monster|MountainSnake|1026,5,15000,90000,Mob006-3::On1026 -006-3.gat,30,88,13,20|monster|RedSlime|1008,3,90000,30000,Mob006-3::On1008 -006-3.gat,122,98,10,16|monster|Spider|1012,3,90000,30000,Mob006-3::On1012 -006-3.gat,112,104,7,13|monster|Spider|1012,1,90000,30000,Mob006-3::On1012 -006-3.gat,103,108,9,9|monster|Spider|1012,1,90000,30000,Mob006-3::On1012 -006-3.gat,83,107,13,14|monster|YellowSlime|1007,6,90000,30000,Mob006-3::On1007 +006-3.gat,108,25,36,8|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,99,50,14,13|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,89,63,14,11|monster|MountainSnake|1026,2,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,86,90,29,9|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,109,78,12,9|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,119,117,15,14|monster|MountainSnake|1026,4,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,106,64,14,17|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,65,71,31,35|monster|MountainSnake|1026,10,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,57,105,27,30|monster|MountainSnake|1026,8,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,73,120,16,5|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,117,54,11,9|monster|MountainSnake|1026,4,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,123,62,10,5|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,72,36,24,25|monster|MountainSnake|1026,10,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,84,27,5,7|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,40,40,36,28|monster|MountainSnake|1026,8,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,34,60,27,11|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,87,74,26,9|monster|RedSlime|1008,3,15000ms,10000ms,Mob006-3::On1008 +006-3.gat,120,76,9,21|monster|RedSlime|1008,3,15000ms,10000ms,Mob006-3::On1008 +006-3.gat,101,85,14,8|monster|RedSlime|1008,4,15000ms,10000ms,Mob006-3::On1008 +006-3.gat,44,124,29,7|monster|MountainSnake|1026,5,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,90,125,17,7|monster|MountainSnake|1026,5,15000ms,90000ms,Mob006-3::On1026 +006-3.gat,30,88,13,20|monster|RedSlime|1008,3,90000ms,30000ms,Mob006-3::On1008 +006-3.gat,122,98,10,16|monster|Spider|1012,3,90000ms,30000ms,Mob006-3::On1012 +006-3.gat,112,104,7,13|monster|Spider|1012,1,90000ms,30000ms,Mob006-3::On1012 +006-3.gat,103,108,9,9|monster|Spider|1012,1,90000ms,30000ms,Mob006-3::On1012 +006-3.gat,83,107,13,14|monster|YellowSlime|1007,6,90000ms,30000ms,Mob006-3::On1007 -006-3.gat,0,0,0|script|Mob006-3|-1, +006-3.gat,0,0,0|script|Mob006-3|-1 { end; diff --git a/world/map/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt index 16231518..e4ca3357 100644 --- a/world/map/npc/007-1/_mobs.txt +++ b/world/map/npc/007-1/_mobs.txt @@ -1,18 +1,18 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland mobs -007-1.gat,0,0,0,0|monster|PinkFlower|1014,17,100000,30000,Mob007-1::On1014 -007-1.gat,0,0,0,0|monster|SpikyMushroom|1019,15,100000,30000,Mob007-1::On1019 -007-1.gat,0,0,0,0|monster|Snail|1041,25,100000,30000,Mob007-1::On1041 -007-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000,180000,Mob007-1::On1029 -007-1.gat,0,0,0,0|monster|GambogePlant|1031,1,2700000,1800000,Mob007-1::On1031 -007-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob007-1::On1035 -007-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob007-1::On1037 -007-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob007-1::On1038 -007-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob007-1::On1055 - - -007-1.gat,0,0,0|script|Mob007-1|-1, +007-1.gat,0,0,0,0|monster|PinkFlower|1014,17,100000ms,30000ms,Mob007-1::On1014 +007-1.gat,0,0,0,0|monster|SpikyMushroom|1019,15,100000ms,30000ms,Mob007-1::On1019 +007-1.gat,0,0,0,0|monster|Snail|1041,25,100000ms,30000ms,Mob007-1::On1041 +007-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob007-1::On1029 +007-1.gat,0,0,0,0|monster|GambogePlant|1031,1,2700000ms,1800000ms,Mob007-1::On1031 +007-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob007-1::On1035 +007-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob007-1::On1037 +007-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob007-1::On1038 +007-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob007-1::On1055 + + +007-1.gat,0,0,0|script|Mob007-1|-1 { end; diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt index b164ef45..ed1c3ee8 100644 --- a/world/map/npc/007-1/voltain.txt +++ b/world/map/npc/007-1/voltain.txt @@ -25,7 +25,7 @@ // # 12: bring gamboge herbs // # 13: bring chocolate cake -007-1.gat,37,21,0|script|Voltain|103, +007-1.gat,37,21,0|script|Voltain|103 { set @BOTTLE_NEEDED, 3; set @BOTTLE_REWARD_XP, 100; diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt index 7e8cb8ab..61b169fc 100644 --- a/world/map/npc/007-1/witch.txt +++ b/world/map/npc/007-1/witch.txt @@ -14,7 +14,7 @@ // 254: Quest is being ended and cleaned: the hero logged off. // 255: Quest is being ended and cleaned: the hero died or he ran out of time -007-1.gat,77,81,0|script|Valia|370, +007-1.gat,77,81,0|script|Valia|370 { set @illia_sapphire_powder, 3; set @illia_amethyst_powder, 1; @@ -686,7 +686,7 @@ L_KillHero: } -007-1.gat,128,100,0|script|#IlliaDaemon|127, +007-1.gat,128,100,0|script|#IlliaDaemon|127 { end; @@ -919,7 +919,7 @@ L_Start: } -function|script|UpdateIlliaProgress|, +function|script|UpdateIlliaProgress { if ($@illia_progress == 1) goto L_Torch1; @@ -981,42 +981,42 @@ L_Torch1: return; } -007-1.gat,72,88,0|script|#IlliaTorch1|374, +007-1.gat,72,88,0|script|#IlliaTorch1|374 { end; } -007-1.gat,71,85,0|script|#IlliaTorch2|374, +007-1.gat,71,85,0|script|#IlliaTorch2|374 { end; } -007-1.gat,75,70,0|script|#IlliaTorch3|374, +007-1.gat,75,70,0|script|#IlliaTorch3|374 { end; } -007-1.gat,85,71,0|script|#IlliaTorch4|374, +007-1.gat,85,71,0|script|#IlliaTorch4|374 { end; } -007-1.gat,88,69,0|script|#IlliaTorch5|374, +007-1.gat,88,69,0|script|#IlliaTorch5|374 { end; } -007-1.gat,86,68,0|script|#IlliaTorch6|374, +007-1.gat,86,68,0|script|#IlliaTorch6|374 { end; } -007-1.gat,87,68,0|script|#IlliaTorch7|374, +007-1.gat,87,68,0|script|#IlliaTorch7|374 { end; } -007-1.gat,88,67,0|script|#IlliaTorch8|374, +007-1.gat,88,67,0|script|#IlliaTorch8|374 { end; } diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt index 04a93ca3..546a93a2 100644 --- a/world/map/npc/008-1/_mobs.txt +++ b/world/map/npc/008-1/_mobs.txt @@ -1,18 +1,18 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Hurnscald Outskirts mobs -008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20,0,Mob008-1::On1014 -008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20,0,Mob008-1::On1018 -008-1.gat,0,0,0,0|monster|SpikyMushroom|1019,18,20,0,Mob008-1::On1019 -008-1.gat,0,0,0,0|monster|Snail|1041,5,30,0,Mob008-1::On1041 -008-1.gat,0,0,0,0|monster|MauvePlant|1029,2,270000,180000,Mob008-1::On1029 -008-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob008-1::On1035 -008-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob008-1::On1037 -008-1.gat,0,0,0,0|monster|Squirrel|1038,10,30,20,Mob008-1::On1038 -008-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob008-1::On1055 - - -008-1.gat,0,0,0|script|Mob008-1|-1, +008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20ms,0ms,Mob008-1::On1014 +008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20ms,0ms,Mob008-1::On1018 +008-1.gat,0,0,0,0|monster|SpikyMushroom|1019,18,20ms,0ms,Mob008-1::On1019 +008-1.gat,0,0,0,0|monster|Snail|1041,5,30ms,0ms,Mob008-1::On1041 +008-1.gat,0,0,0,0|monster|MauvePlant|1029,2,270000ms,180000ms,Mob008-1::On1029 +008-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob008-1::On1035 +008-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob008-1::On1037 +008-1.gat,0,0,0,0|monster|Squirrel|1038,10,30ms,20ms,Mob008-1::On1038 +008-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob008-1::On1055 + + +008-1.gat,0,0,0|script|Mob008-1|-1 { end; diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt index 25a7684a..989005f0 100644 --- a/world/map/npc/008-1/andra.txt +++ b/world/map/npc/008-1/andra.txt @@ -1,6 +1,6 @@ // Andra asks for your help to keep the soil fertile. The best way to do it is planting, so she asks for water and seeds. When she plants the seeds, some plants are spawned. -008-1.gat,36,26,0|script|Andra|201, +008-1.gat,36,26,0|script|Andra|201 { set @water_amount, 1; set @seeds_amount, 4; diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index d42be802..698aa65f 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -9,7 +9,7 @@ // the event in these days. -function|script|AnnualEasterEvent|, +function|script|AnnualEasterEvent { if ((gettimetick(2)-TUT_var < 5*7*86400) || (BaseLevel < 40)) //player must be created at least 5 weeks ago goto L_EndTooYoung; @@ -113,21 +113,21 @@ L_End1: return; } -008-1.gat,65,40,0|script|#TestEgg0|375, +008-1.gat,65,40,0|script|#TestEgg0|375 { set @EasterEggID, 0; callfunc("AnnualEasterEvent"); end; } -008-1.gat,65,40,0|script|#TestEgg1|375, +008-1.gat,65,40,0|script|#TestEgg1|375 { set @EasterEggID, 1; callfunc("AnnualEasterEvent"); end; } -008-1.gat,65,40,0|script|#TestEgg2|375, +008-1.gat,65,40,0|script|#TestEgg2|375 { set @EasterEggID, 2; callfunc("AnnualEasterEvent"); @@ -135,7 +135,7 @@ L_End1: } -008-1.gat,59,38,0|script|#AnnualEaster|-1, +008-1.gat,59,38,0|script|#AnnualEaster|-1 { end; diff --git a/world/map/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt index 2755866c..d0630074 100644 --- a/world/map/npc/008-1/diryn.txt +++ b/world/map/npc/008-1/diryn.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -008-1.gat,81,82,0|script|Diryn the Traveler|103, +008-1.gat,81,82,0|script|Diryn the Traveler|103 { set @NpcName$, "Diryn"; set @NpcTravelBit, $@hurnscald_bit; diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt index 240cdc15..d24355bd 100644 --- a/world/map/npc/008-1/dock.txt +++ b/world/map/npc/008-1/dock.txt @@ -1,18 +1,18 @@ // The ferry dock -008-1.gat,134,63,0|script|Ferry Schedule#5|397, +008-1.gat,134,63,0|script|Ferry Schedule#5|397 { callfunc "FerryManifest"; end; } -008-1.gat,147,64,0|script|Hurnscald Koga|395,8,3, +008-1.gat,147,64,0|script|Hurnscald Koga|395,8,3 { callfunc "BoardFerry"; close; } -008-1.gat,120,44,0|script|#HurnscaldDock|127, +008-1.gat,120,44,0|script|#HurnscaldDock|127 { end; OnCommandArrive: diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt index df89f52c..af36f75f 100644 --- a/world/map/npc/008-1/george.txt +++ b/world/map/npc/008-1/george.txt @@ -1,6 +1,6 @@ // -008-1.gat,136,36,0|script|George#pirate|138, +008-1.gat,136,36,0|script|George#pirate|138 { set @halloween_npc_id, $@halloween_npc_george; callfunc "TrickOrTreat"; diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt index f3ada878..36a8d3f5 100644 --- a/world/map/npc/008-1/hinnak.txt +++ b/world/map/npc/008-1/hinnak.txt @@ -5,7 +5,7 @@ // // Variables used: Nibble 1 of QUEST_Hurnscald (previously QUEST_Scythe_state) -008-1.gat,101,30,0|script|Hinnak|142, +008-1.gat,101,30,0|script|Hinnak|142 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt index dabfbb98..ab998d66 100644 --- a/world/map/npc/009-1/_mobs.txt +++ b/world/map/npc/009-1/_mobs.txt @@ -1,14 +1,14 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Hurnscald mobs -009-1.gat,74,32,2,1|monster|CloverPatch|1037,1,100000,120000,Mob009-1::On1037 -009-1.gat,29,44,9,13|monster|PinkFlower|1014,2,0,250,Mob009-1::On1014 -009-1.gat,88,51,15,4|monster|Squirrel|1038,2,0,5000,Mob009-1::On1038 -009-1.gat,80,38,5,5|monster|Squirrel|1038,1,0,5000,Mob009-1::On1038 -009-1.gat,0,0,0,0|monster|Butterfly|1055,5,30,20,Mob009-1::On1055 +009-1.gat,74,32,2,1|monster|CloverPatch|1037,1,100000ms,120000ms,Mob009-1::On1037 +009-1.gat,29,44,9,13|monster|PinkFlower|1014,2,0ms,250ms,Mob009-1::On1014 +009-1.gat,88,51,15,4|monster|Squirrel|1038,2,0ms,5000ms,Mob009-1::On1038 +009-1.gat,80,38,5,5|monster|Squirrel|1038,1,0ms,5000ms,Mob009-1::On1038 +009-1.gat,0,0,0,0|monster|Butterfly|1055,5,30ms,20ms,Mob009-1::On1055 -009-1.gat,0,0,0|script|Mob009-1|-1, +009-1.gat,0,0,0|script|Mob009-1|-1 { end; diff --git a/world/map/npc/009-1/dock.txt b/world/map/npc/009-1/dock.txt index a6fa2553..a3ed067d 100644 --- a/world/map/npc/009-1/dock.txt +++ b/world/map/npc/009-1/dock.txt @@ -1,6 +1,6 @@ // Ferry Sign -009-1.gat,46,34,0|script|FerrySchedule#4|397, +009-1.gat,46,34,0|script|FerrySchedule#4|397 { callfunc "FerryManifest"; end; diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt index c25624cc..c2206faa 100644 --- a/world/map/npc/009-1/jack.txt +++ b/world/map/npc/009-1/jack.txt @@ -14,7 +14,7 @@ //################################################################################# // Lumberjack -009-1.gat,40,45,0|script|Jack|141, +009-1.gat,40,45,0|script|Jack|141 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt index 4dc99cce..0e488c13 100644 --- a/world/map/npc/009-1/milly.txt +++ b/world/map/npc/009-1/milly.txt @@ -6,7 +6,7 @@ // // Inspector quest -009-1.gat,81,41,0|script|Milly|114, +009-1.gat,81,41,0|script|Milly|114 { callfunc "ClearVariables"; @@ -385,7 +385,7 @@ L_Return: return; } -009-1.gat,82,41,0|script|MillyDebugHelper|114, +009-1.gat,82,41,0|script|MillyDebugHelper|114 { mes "You can set certain quests as finished or not finished. What would you like to do?"; menu diff --git a/world/map/npc/009-1/old_man.txt b/world/map/npc/009-1/old_man.txt index cebd0f59..7328cd1f 100644 --- a/world/map/npc/009-1/old_man.txt +++ b/world/map/npc/009-1/old_man.txt @@ -1,6 +1,6 @@ // Old man -009-1.gat,85,51,0|script|Old Man|159, +009-1.gat,85,51,0|script|Old Man|159 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt index d8c063dc..7442e174 100644 --- a/world/map/npc/009-1/old_woman.txt +++ b/world/map/npc/009-1/old_woman.txt @@ -1,6 +1,6 @@ // Old woman -009-1.gat,29,43,0|script|Old Woman|154, +009-1.gat,29,43,0|script|Old Woman|154 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/sabine.txt b/world/map/npc/009-1/sabine.txt index 48d7e441..8c74819a 100644 --- a/world/map/npc/009-1/sabine.txt +++ b/world/map/npc/009-1/sabine.txt @@ -1,6 +1,6 @@ // Girl sitting on bench -009-1.gat,88,27,0|script|Sabine|106, +009-1.gat,88,27,0|script|Sabine|106 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/soul-menhir.txt b/world/map/npc/009-1/soul-menhir.txt index cc711625..9ffd8614 100644 --- a/world/map/npc/009-1/soul-menhir.txt +++ b/world/map/npc/009-1/soul-menhir.txt @@ -1,6 +1,6 @@ // -009-1.gat,53,40,0|script|Soul Menhir#hurnscald|344, +009-1.gat,53,40,0|script|Soul Menhir#hurnscald|344 { callfunc "ClearVariables"; set @map$, "009-1.gat"; diff --git a/world/map/npc/009-1/water_pump.txt b/world/map/npc/009-1/water_pump.txt index 9f15355f..b7de62a5 100644 --- a/world/map/npc/009-1/water_pump.txt +++ b/world/map/npc/009-1/water_pump.txt @@ -1,6 +1,6 @@ // Water pump. You can fill empty bottles here -009-1.gat,76,33,0|script|Water Pump|400, +009-1.gat,76,33,0|script|Water Pump|400 { callfunc "WaterBottle"; end; diff --git a/world/map/npc/009-2/_mobs.txt b/world/map/npc/009-2/_mobs.txt index f404b00d..987e4ef3 100644 --- a/world/map/npc/009-2/_mobs.txt +++ b/world/map/npc/009-2/_mobs.txt @@ -3,7 +3,7 @@ -009-2.gat,0,0,0|script|Mob009-2|-1, +009-2.gat,0,0,0|script|Mob009-2|-1 { end; } diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt index 3748269d..df430683 100644 --- a/world/map/npc/009-2/airlia.txt +++ b/world/map/npc/009-2/airlia.txt @@ -6,7 +6,7 @@ // * Airlia quest = 2 unlocks other options, perhaps with future Warrior Guild prospects (this is long term) -009-2.gat,123,71,0|script|Airlia|108, +009-2.gat,123,71,0|script|Airlia|108 { // Subquest 1a: Caretaker's daughter (initial, once) set @LETTER_REWARD_GOLD_INITIAL, 1000; diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt index a6209b70..b02b1904 100644 --- a/world/map/npc/009-2/alan.txt +++ b/world/map/npc/009-2/alan.txt @@ -8,7 +8,7 @@ //################################################################################# // Archer Shop Master -009-2.gat,99,23,0|script|Alan|125, +009-2.gat,99,23,0|script|Alan|125 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt index 1f2ecbd3..8810e4e3 100644 --- a/world/map/npc/009-2/doctor.txt +++ b/world/map/npc/009-2/doctor.txt @@ -1,6 +1,6 @@ // Doctor -009-2.gat,148,25,0|script|Doctor|107, +009-2.gat,148,25,0|script|Doctor|107 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt index 73158c14..c5585d59 100644 --- a/world/map/npc/009-2/drunks.txt +++ b/world/map/npc/009-2/drunks.txt @@ -1,6 +1,6 @@ //Left drinking contest guy -009-2.gat,65,55,0|script|Drinker#1|121, +009-2.gat,65,55,0|script|Drinker#1|121 { mes "[Binge Drinker]"; mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\""; @@ -9,7 +9,7 @@ //Right drinking contest guy -009-2.gat,68,55,0|script|Drinker#2|121, +009-2.gat,68,55,0|script|Drinker#2|121 { mes "[Binge Drinker]"; mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\""; diff --git a/world/map/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt index 662b0c74..476b4596 100644 --- a/world/map/npc/009-2/inspector.txt +++ b/world/map/npc/009-2/inspector.txt @@ -1,6 +1,6 @@ // -009-2.gat,24,99,0|script|Inspector#Hurnscald|150, +009-2.gat,24,99,0|script|Inspector#Hurnscald|150 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt index 9c772452..ef5cb001 100644 --- a/world/map/npc/009-2/kfahr.txt +++ b/world/map/npc/009-2/kfahr.txt @@ -13,7 +13,7 @@ //# //################################################################################# -009-2.gat,67,57,0|script|Kfahr|125, +009-2.gat,67,57,0|script|Kfahr|125 { set @halloween_npc_id, $@halloween_npc_kfahr; callfunc "TrickOrTreat"; diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt index d5ce1d8e..e29863c5 100644 --- a/world/map/npc/009-2/lena.txt +++ b/world/map/npc/009-2/lena.txt @@ -1,7 +1,7 @@ // Quest for Fairy Hat and Forest Armor // Variables used: nibble 0 of QUEST_Hurnscald -009-2.gat,146,43,0|script|Lena|182, +009-2.gat,146,43,0|script|Lena|182 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt index 1959ad9c..ff350b88 100644 --- a/world/map/npc/009-2/misc.txt +++ b/world/map/npc/009-2/misc.txt @@ -1,6 +1,6 @@ //Note in bar -009-2.gat,54,49,0|script|Note#bar|400, +009-2.gat,54,49,0|script|Note#bar|400 { mes "[Note]"; mes "\"We refuse service to anyone who:\""; @@ -12,7 +12,7 @@ } //Bookshelf -009-2.gat,109,44,0|script|#Book|400, +009-2.gat,109,44,0|script|#Book|400 { if (getskilllv(SKILL_MAGIC)) goto L_magic; diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt index 31a1d0da..568f9a71 100644 --- a/world/map/npc/009-2/nicholas.txt +++ b/world/map/npc/009-2/nicholas.txt @@ -11,7 +11,7 @@ //# //################################################################################# -009-2.gat,185,55,0|script|Nicholas|135, +009-2.gat,185,55,0|script|Nicholas|135 { set @SETZER_XP, 100000; set @SHIELD_XP, 20000; diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt index 44605134..3c6be98a 100644 --- a/world/map/npc/009-2/nurse.txt +++ b/world/map/npc/009-2/nurse.txt @@ -22,7 +22,7 @@ //###################################################################################### -009-2.gat,147,65,0|script|Nurse|119, +009-2.gat,147,65,0|script|Nurse|119 { callfunc "ClearVariables"; set @halloween_npc_id, $@halloween_npc_nurse; diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt index cf200391..7c654759 100644 --- a/world/map/npc/009-2/olana.txt +++ b/world/map/npc/009-2/olana.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -009-2.gat,63,79,0|script|Olana|190, +009-2.gat,63,79,0|script|Olana|190 { set @MinLevel, 60; diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt index 4c0d2bd2..2c739055 100644 --- a/world/map/npc/009-2/peter.txt +++ b/world/map/npc/009-2/peter.txt @@ -1,6 +1,6 @@ // Nicholas' Apprentice and Armorsmith -009-2.gat,183,57,0|script|Peter|157, +009-2.gat,183,57,0|script|Peter|157 { set @peter_chain_mail_coal, 10; set @peter_chain_mail_ingot, 5; diff --git a/world/map/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt index 143de014..f7c48633 100644 --- a/world/map/npc/009-2/richard.txt +++ b/world/map/npc/009-2/richard.txt @@ -1,6 +1,6 @@ // -009-2.gat,20,99,0|script|Richard|161, +009-2.gat,20,99,0|script|Richard|161 { callfunc "ClearVariables"; set @npcname$, "Richard"; diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt index 81531749..4a19336a 100644 --- a/world/map/npc/009-2/selim.txt +++ b/world/map/npc/009-2/selim.txt @@ -5,7 +5,7 @@ //# # //################################################################################# -009-2.gat,32,104,0|script|Selim|326, +009-2.gat,32,104,0|script|Selim|326 { setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green"; diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt index bcf512b5..1b3ed2ca 100644 --- a/world/map/npc/009-2/shops.txt +++ b/world/map/npc/009-2/shops.txt @@ -6,11 +6,11 @@ // Bartender // sells beer, cake and steak -009-2.gat,65,49,0|shop|Barkeeper|112,539:-1,513:-1,676:-1 +009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*1,Cake:*1,Steak:*1 // Receptionist // Offers the player to rest at the inn for 100gp -009-2.gat,50,48,0|script|Receptionist#inn|108, +009-2.gat,50,48,0|script|Receptionist#inn|108 { set @npcname$, "Receptionist"; set @cost, 100; @@ -20,12 +20,12 @@ // Archer Shop // sells bow, short bow, arrows and iron arrows -009-2.gat,97,24,0|shop|Apprentice|120,Arrow :-1,IronArrow :-1,Bow :1000,ShortBow :3000 +009-2.gat,97,24,0|shop|Apprentice|120,Arrow:*1,IronArrow:*1,Bow:*1000,ShortBow:*3000 // Potion Shop // sells cactus drink, cactus potion, iron potion, concentration potion, and slow poison potion -009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1,SlowPoisonPotion :-1 +009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1 // General Store // Sells various things, many not sold elsewhere -009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1 +009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1 diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt index 553e20f6..57eca972 100644 --- a/world/map/npc/009-2/waitress.txt +++ b/world/map/npc/009-2/waitress.txt @@ -1,6 +1,6 @@ // Waitress -009-2.gat,60,52,0|script|Melinda|140, +009-2.gat,60,52,0|script|Melinda|140 { mes "[Melinda]"; mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\""; diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt index a9b738a0..65c16fc7 100644 --- a/world/map/npc/009-2/wyara.txt +++ b/world/map/npc/009-2/wyara.txt @@ -1,7 +1,7 @@ // ---------------------------------------- // Wyara the Hurnscald witch // ---------------------------------------- -009-2.gat,121,26,0|script|Wyara#_M|103, +009-2.gat,121,26,0|script|Wyara#_M|103 { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt index f78c4d1a..2ccde6e5 100644 --- a/world/map/npc/009-3/_mobs.txt +++ b/world/map/npc/009-3/_mobs.txt @@ -1,12 +1,12 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Hurnscald Cave mobs -009-3.gat,0,0,0,0|monster|YellowSlime|1007,20,0,0,Mob009-3::On1007 -009-3.gat,0,0,0,0|monster|BlackScorpion|1009,25,0,0,Mob009-3::On1009 -009-3.gat,0,0,0,0|monster|RedSlime|1008,35,0,0,Mob009-3::On1008 +009-3.gat,0,0,0,0|monster|YellowSlime|1007,20,0ms,0ms,Mob009-3::On1007 +009-3.gat,0,0,0,0|monster|BlackScorpion|1009,25,0ms,0ms,Mob009-3::On1009 +009-3.gat,0,0,0,0|monster|RedSlime|1008,35,0ms,0ms,Mob009-3::On1008 -009-3.gat,0,0,0|script|Mob009-3|-1, +009-3.gat,0,0,0|script|Mob009-3|-1 { end; diff --git a/world/map/npc/009-3/sword.txt b/world/map/npc/009-3/sword.txt index d419dbaa..12c85bbd 100644 --- a/world/map/npc/009-3/sword.txt +++ b/world/map/npc/009-3/sword.txt @@ -1,4 +1,4 @@ -009-3.gat,26,100,0|script|#MysticSword#_M|400, +009-3.gat,26,100,0|script|#MysticSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/009-3/warp.txt b/world/map/npc/009-3/warp.txt index bc828df4..739751bf 100644 --- a/world/map/npc/009-3/warp.txt +++ b/world/map/npc/009-3/warp.txt @@ -1,4 +1,4 @@ -009-3.gat,162,80,0|script|#PVPCaveBarrier|45,0,0, +009-3.gat,162,80,0|script|#PVPCaveBarrier|45,0,0 { mes "Do you want to enter the PVP cave? It costs 150GP."; menu diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt index c5369cad..3be599b8 100644 --- a/world/map/npc/009-4/_mobs.txt +++ b/world/map/npc/009-4/_mobs.txt @@ -1,16 +1,16 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Orum Caves mobs -009-4.gat,117,97,24,15|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035 -009-4.gat,115,98,24,15|monster|CaveSnake|1021,5,20000,14000,Mob009-4::On1021 -009-4.gat,103,28,24,15|monster|CaveSnake|1021,3,20000,14000,Mob009-4::On1021 -009-4.gat,106,27,24,15|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035 -009-4.gat,119,45,12,10|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035 -009-4.gat,72,130,24,15|monster|Maggot|1002,3,20000,14000,Mob009-4::On1002 -009-4.gat,38,116,24,15|monster|Maggot|1002,3,20000,14000,Mob009-4::On1002 +009-4.gat,117,97,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035 +009-4.gat,115,98,24,15|monster|CaveSnake|1021,5,20000ms,14000ms,Mob009-4::On1021 +009-4.gat,103,28,24,15|monster|CaveSnake|1021,3,20000ms,14000ms,Mob009-4::On1021 +009-4.gat,106,27,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035 +009-4.gat,119,45,12,10|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035 +009-4.gat,72,130,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002 +009-4.gat,38,116,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002 -009-4.gat,0,0,0|script|Mob009-4|-1, +009-4.gat,0,0,0|script|Mob009-4|-1 { end; diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt index ae960d97..9e3e85b9 100644 --- a/world/map/npc/009-4/barriers.txt +++ b/world/map/npc/009-4/barriers.txt @@ -1,5 +1,5 @@ //# see detailed description at orum.txt -function|script|GetBarrierColor|, +function|script|GetBarrierColor { if (@Barrier < 0 || @Barrier > 2) goto L_Error; @@ -22,7 +22,7 @@ L_Error2: goto L_GetBarrierColor; } -function|script|SetBarrierColor|, +function|script|SetBarrierColor { if (@Barrier < 0 || @Barrier > 2) goto L_Error; @@ -44,7 +44,7 @@ L_Error2: // Starting Barrier / Quest Entrance -009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,1,0, +009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,1,0 { if (OrumQuest >= 3) close; if (OrumQuest == 2) goto L_Started; @@ -60,7 +60,7 @@ L_Started: } // First Barrier -009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,1,0, +009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,1,0 { if (OrumQuest >= 5) close; @@ -70,7 +70,7 @@ L_Started: } // Second Barrier -009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,1,0, +009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,1,0 { if (OrumQuest == 3) set OrumQuest, 4; @@ -99,7 +99,7 @@ L_Advance_Quest: } // Third Barrier -009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,1,0, +009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,1,0 { if (OrumQuest == 3) set OrumQuest, 4; @@ -143,7 +143,7 @@ L_Advance_Quest: } // Ending Barrier -009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,1,0, +009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,1,0 { if (OrumQuest >= 11) close; if (OrumQuest == 3) set OrumQuest, 4; diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt index c547af05..db99d50c 100644 --- a/world/map/npc/009-4/orum.txt +++ b/world/map/npc/009-4/orum.txt @@ -18,7 +18,7 @@ //# OrumQuestBarrier nibble (0,1,2) stores the color of the barriers # //################################################################################# -009-4.gat,35,115,0|script|OrumDebug|158, +009-4.gat,35,115,0|script|OrumDebug|158 { mes "[Orum Debug]"; menu @@ -49,7 +49,7 @@ OnInit: disablenpc "OrumDebug"; end; } -009-4.gat,37,115,0|script|Orum#barrier|158, +009-4.gat,37,115,0|script|Orum#barrier|158 { // needed to pass the very first barrier set @B0_WISPPOWDER, 4; @@ -592,7 +592,7 @@ L_Close: set @TorchColor, 0; close; } -function|script|SetUpOrumQuest|, +function|script|SetUpOrumQuest { // Second Barrier set @BarrierColor, 1 + rand(3) * 4; diff --git a/world/map/npc/009-4/orum_warps.txt b/world/map/npc/009-4/orum_warps.txt index d4267eb1..86afb56f 100644 --- a/world/map/npc/009-4/orum_warps.txt +++ b/world/map/npc/009-4/orum_warps.txt @@ -1,4 +1,4 @@ -009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0, +009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0 { if (OrumQuest >= 12) goto L_Second_Entrance; warp "009-4.gat", 37, 113; @@ -8,7 +8,7 @@ L_Second_Entrance: warp "009-4.gat", 72, 126; close; } -009-4.gat,36,26,0|script|#LairExit|45,0,0, +009-4.gat,36,26,0|script|#LairExit|45,0,0 { if (OrumQuest >= 12) goto L_Second_Entrance; warp "009-4.gat", 37, 122; @@ -19,7 +19,7 @@ L_Second_Entrance: close; } -009-4.gat,51,47,0|script|#CavernEnter|45,0,0, +009-4.gat,51,47,0|script|#CavernEnter|45,0,0 { if (OrumQuest >= 14) goto L_Second_Cavern; if (OrumQuest < 12) goto L_See_Orum; diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt index e9d8ff3e..b92098c0 100644 --- a/world/map/npc/009-4/torches.txt +++ b/world/map/npc/009-4/torches.txt @@ -1,5 +1,5 @@ //# see detailed description at orum.txt -function|script|GetTorchColor|, +function|script|GetTorchColor { if (@Torch < 0 || @Torch > 2) goto L_Error; @@ -13,7 +13,7 @@ L_Error: close; } -function|script|SetTorchColor|, +function|script|SetTorchColor { if (@Torch < 0 || @Torch > 2) goto L_Error; if (@TorchColor < 1 || @TorchColor > 12) goto L_Error2; @@ -31,7 +31,7 @@ L_Error2: close; } -function|script|GetTorchIntensity|, +function|script|GetTorchIntensity { if (@Torch < 0 || @Torch > 2) goto L_Error; @@ -45,7 +45,7 @@ L_Error: close; } -function|script|SetTorchIntensity|, +function|script|SetTorchIntensity { if (@Torch < 0 || @Torch > 2) goto L_Error; if (@TorchIntensity < 0 || @TorchIntensity > 2) goto L_Error2; @@ -63,7 +63,7 @@ L_Error2: close; } -function|script|DoneWithTorches|, +function|script|DoneWithTorches { if (OrumQuest < 11 && OrumQuest >= 8) goto L_Return; @@ -87,7 +87,7 @@ L_Return: } // To make sure in range of torches -function|script|InRangeTorch1|, +function|script|InRangeTorch1 { if (isin("009-4.gat",67,20,69,25)) goto L_Return; @@ -97,7 +97,7 @@ function|script|InRangeTorch1|, L_Return: return; } -function|script|InRangeTorch2|, +function|script|InRangeTorch2 { if (isin("009-4.gat",65,41,69,46)) goto L_Return; @@ -107,7 +107,7 @@ function|script|InRangeTorch2|, L_Return: return; } -function|script|InRangeTorch3|, +function|script|InRangeTorch3 { if (isin("009-4.gat",33,84,37,88)) goto L_Return; @@ -118,7 +118,7 @@ L_Return: return; } -function|script|TorchLoop|, +function|script|TorchLoop { // Variables used here: // @Torch - pass before calling @@ -281,7 +281,7 @@ L_Failed: } // First Torch -009-4.gat,68,21,0|script|Torch#1|400, +009-4.gat,68,21,0|script|Torch#1|400 { callfunc "InRangeTorch1"; callfunc "DoneWithTorches"; @@ -293,7 +293,7 @@ L_Failed: } // Second Torch -009-4.gat,67,42,0|script|Torch#2|400, +009-4.gat,67,42,0|script|Torch#2|400 { callfunc "InRangeTorch2"; callfunc "DoneWithTorches"; @@ -305,7 +305,7 @@ L_Failed: } // Third Torch -009-4.gat,33,86,0|script|Torch#3|400, +009-4.gat,33,86,0|script|Torch#3|400 { callfunc "InRangeTorch3"; callfunc "DoneWithTorches"; diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt index ca28d2f7..b83a14cc 100644 --- a/world/map/npc/009-4/waric.txt +++ b/world/map/npc/009-4/waric.txt @@ -1,6 +1,6 @@ //# see detailed description at orum.txt -009-4.gat,99,33,0|script|#WizardTrap|127,2,1, +009-4.gat,99,33,0|script|#WizardTrap|127,2,1 { set @gender$, "They're"; if (Sex == 0) @@ -19,7 +19,7 @@ close; } -009-4.gat,120,43,0|script|Orum#trap|158, +009-4.gat,120,43,0|script|Orum#trap|158 { mes "[Orum]"; mes "\"I told you to forget about this place but you did not heed my advice!\""; @@ -28,7 +28,7 @@ close; } -009-4.gat,118,42,0|script|Waric#trap|153, +009-4.gat,118,42,0|script|Waric#trap|153 { set @EXP_LEARNED_ALOT, 10000; if (OrumQuest >= 13) diff --git a/world/map/npc/009-5/_mobs.txt b/world/map/npc/009-5/_mobs.txt index bbcf3732..6d4ac092 100644 --- a/world/map/npc/009-5/_mobs.txt +++ b/world/map/npc/009-5/_mobs.txt @@ -3,7 +3,7 @@ -009-5.gat,0,0,0|script|Mob009-5|-1, +009-5.gat,0,0,0|script|Mob009-5|-1 { end; } diff --git a/world/map/npc/009-6/_mobs.txt b/world/map/npc/009-6/_mobs.txt index c565f872..08f88f9d 100644 --- a/world/map/npc/009-6/_mobs.txt +++ b/world/map/npc/009-6/_mobs.txt @@ -3,7 +3,7 @@ -009-6.gat,0,0,0|script|Mob009-6|-1, +009-6.gat,0,0,0|script|Mob009-6|-1 { end; } diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt index e981e603..5e332814 100644 --- a/world/map/npc/009-6/brodomir.txt +++ b/world/map/npc/009-6/brodomir.txt @@ -1,6 +1,6 @@ // Last Man Standing PvP Event NPC // Authors: tux9th, Jenalya -// many thanks to Jenalaya, o11c, Ablu :) +// many thanks to Jenalaya, o11c, Ablu:*) // CAVE: this script requires a patch by o11c that makes it possible for // getareausers to check if players are alive or dead. @@ -18,7 +18,7 @@ // $@BRODOMIR_MONEY: Amount of money given by the sponsor -009-6.gat,36,40,0|script|Brodomir|116, +009-6.gat,36,40,0|script|Brodomir|116 { set @brodomir_money, 0; set @brodomir_item_amount, 0; @@ -133,11 +133,11 @@ L_Go: set $@BRODOMIR_MONEY, @brodomir_money; set $@brodomir_delay_seconds, 600; set $@BRODOMIR_PVP_STATUS, 1; - announce "Brodomir : In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0; + announce "Brodomir:* In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0; if ($@BRODOMIR_ITEM_AMOUNT > 0) - announce "Brodomir : The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0; + announce "Brodomir:* The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0; if ($@BRODOMIR_MONEY > 0) - announce "Brodomir : The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0; + announce "Brodomir:* The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0; mes "[Brodomir]"; mes "\"In "+$@brodomir_delay_seconds/60+" minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\""; set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds; diff --git a/world/map/npc/009-7/_mobs.txt b/world/map/npc/009-7/_mobs.txt index 1ae8e9b2..5c20a109 100644 --- a/world/map/npc/009-7/_mobs.txt +++ b/world/map/npc/009-7/_mobs.txt @@ -3,7 +3,7 @@ -009-7.gat,0,0,0|script|Mob009-7|-1, +009-7.gat,0,0,0|script|Mob009-7|-1 { end; } diff --git a/world/map/npc/009-7/battlemaster.txt b/world/map/npc/009-7/battlemaster.txt index cdb79923..d5c2a37f 100644 --- a/world/map/npc/009-7/battlemaster.txt +++ b/world/map/npc/009-7/battlemaster.txt @@ -1,4 +1,4 @@ -009-7.gat,40,35,0|script|Battle Master#Duels|322, +009-7.gat,40,35,0|script|Battle Master#Duels|322 { if(($fightclub_enabled % 6) != 3) goto L_Disabled; mes "[Battle Master]"; @@ -49,7 +49,7 @@ L_NoMoney: // death and exit handlers below -function|script|fightclub_GoBack|, +function|script|fightclub_GoBack { set @Duel_PVP, DUELS & $@DuelPvpBit; if((@Duel_PVP == 0) && ((getmap() == "009-6") || (getmap() == "009-5"))) goto L_NormalExit; @@ -78,24 +78,24 @@ L_NormalExit: gmcommand "@alive"; return; } -009-6.gat,36,48,0|script|#GoBack2#Duels|127,0,1, +009-6.gat,36,48,0|script|#GoBack2#Duels|127,0,1 { callfunc "fightclub_GoBack"; end; } -009-5.gat,53,74,0|script|#GoBack3#Duels|127,3,1, +009-5.gat,53,74,0|script|#GoBack3#Duels|127,3,1 { callfunc "fightclub_GoBack"; end; } -001-2.gat,130,22,0|script|#GoBack4#Duels|127,1,1, +001-2.gat,130,22,0|script|#GoBack4#Duels|127,1,1 { callfunc "fightclub_GoBack"; end; } -001-3.gat,73,28,0|script|#GoBack#Duels|127,0,1, +001-3.gat,73,28,0|script|#GoBack#Duels|127,0,1 { callfunc "fightclub_GoBack"; end; diff --git a/world/map/npc/009-7/core.txt b/world/map/npc/009-7/core.txt index 167c4458..ab033c66 100644 --- a/world/map/npc/009-7/core.txt +++ b/world/map/npc/009-7/core.txt @@ -1,6 +1,6 @@ // this file contains the game logic of the fight club -function|script|fightclub_sendrequest|, +function|script|fightclub_sendrequest { set @loop, 0; goto L_Loop; @@ -30,7 +30,7 @@ L_Proceed: return; } -function|script|fightclub_getrules|, +function|script|fightclub_getrules { set $@fightclub_myself, getcharid(3); if(@target < 1) goto L_Proceed; // get our own rules @@ -57,7 +57,7 @@ L_Proceed2: } // ** called when someone agree to duel -function|script|fightclub_AddToQueue|, +function|script|fightclub_AddToQueue { set @Duel_Loop, 0; goto L_Loop; @@ -110,7 +110,7 @@ L_Request: } // ** called when a duel is finished -function|script|fightclub_NextBattle|, +function|script|fightclub_NextBattle { set $@Duel_Queue_Blue$[0], ""; // clean the 0 index set $@Duel_Queue_Red$[0], ""; @@ -155,7 +155,7 @@ L_Proceed2: } // ** called after the delay -function|script|fightclub_NextBattleProceed|, +function|script|fightclub_NextBattleProceed { set $@Duel_NoMagic, (DUELS & $@NoMagicBit); // get the rules of the caster donpcevent "Rouge#Duels::OnAnnounceNext"; @@ -164,7 +164,7 @@ function|script|fightclub_NextBattleProceed|, return; } -function|script|fightclub_StartBattle|, +function|script|fightclub_StartBattle { set $@Duel_Started, 1; npcwarp 40, 45, "Rouge#Duels"; @@ -181,7 +181,7 @@ L_Missing: return; } -function|script|fightclub_TimeOut|, +function|script|fightclub_TimeOut { debugmes "on time out"; donpcevent "Rouge#Duels::OnAnnounceTimeOut"; @@ -200,13 +200,13 @@ L_Missing: } // ** called when someone uninvited is on stage -function|script|fightclub_Intrusion|, +function|script|fightclub_Intrusion { // nothing to do here (yet) return; } -function|script|fightclub_EmergencyWipe|, +function|script|fightclub_EmergencyWipe { callfunc "fightclub_CleanStage"; callfunc "fightclub_StartUp"; @@ -215,7 +215,7 @@ function|script|fightclub_EmergencyWipe|, } // ** called whenever someone wins (to handle rewards and bids) -function|script|fightclub_Victory|, +function|script|fightclub_Victory { // TODO: give some sort of reward // TODO: increase score @@ -224,7 +224,7 @@ function|script|fightclub_Victory|, } // ** called when the player needs to be reset -function|script|fightclub_DestroyMe|, +function|script|fightclub_DestroyMe { callfunc "fightclub_exit"; percentheal -100, 0; // dying removes @killable, @killer or any temp buff @@ -232,7 +232,7 @@ function|script|fightclub_DestroyMe|, } // ** called when the red or blue player disappears from stage -function|script|fightclub_Missing|, +function|script|fightclub_Missing { // $@Duel_Missing 1 = red, 2 = blue if (attachrid($@Duel_BluePlayer) == 1) goto L_Proceed; // we need to attach to at least one player @@ -276,7 +276,7 @@ L_Resume: } // ** called after the server boots up -function|script|fightclub_StartUp|, +function|script|fightclub_StartUp { if($fightclub_enabled < 1) set $fightclub_enabled, 1; // init the (permanent) enabled global (this will only be done once, when the duel system is merged with master) if($@Duel_TimeBeforeNext < 1) set $@Duel_TimeBeforeNext, 5; // init the (temporary) TimeBeforeNext global @@ -300,7 +300,7 @@ function|script|fightclub_StartUp|, } // ** called before and after each duel to wipe the vars -function|script|fightclub_CleanStage|, +function|script|fightclub_CleanStage { if($@Duel_NoWarp != 1) areawarp "009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, "009-7.gat", 31, 40; // kick all players from stage set $@Duel_NoWarp, 0; @@ -318,7 +318,7 @@ function|script|fightclub_CleanStage|, } // ** called by npc; allows the player to change their custom rules -function|script|fightclub_setrules|, +function|script|fightclub_setrules { goto L_Main; @@ -355,7 +355,7 @@ L_Return: } // ** called by event handler whenever someone dies -function|script|fightclub_death|, +function|script|fightclub_death { if(@Duel_Fighter != 1) goto L_NoDuel; if(($@Duel_CurrentDuel < 1) || ($@Duel_Started != 1)) goto L_Reset; @@ -421,7 +421,7 @@ L_Reset: // the player has duel_fighter but no duel is ongoing (happens if the p } // ** called every time a player enters the ring -function|script|fightclub_enter|, +function|script|fightclub_enter { set @Duel_Fighter, 1; warp "009-7.gat", rand($@fightclub_x1,$@fightclub_x2), rand($@fightclub_y1,$@fightclub_y2); @@ -432,7 +432,7 @@ function|script|fightclub_enter|, } // ** called 3 seconds after a player enters the ring -function|script|fightclub_enter_killer|, +function|script|fightclub_enter_killer { gmcommand "@killable"; gmcommand "@killer"; // add both killable and killer so if one doesn't kick in, the other (hopefully) will @@ -442,7 +442,7 @@ function|script|fightclub_enter_killer|, } // ** called every time a player exits the ring -function|script|fightclub_exit|, +function|script|fightclub_exit { set @Duel_Fighter, 0; if(getmap() == "009-7") warp "009-7.gat", 31, 40; // do not warp if player left the room diff --git a/world/map/npc/009-7/debug.txt b/world/map/npc/009-7/debug.txt index 6ca0de8d..da780bc7 100644 --- a/world/map/npc/009-7/debug.txt +++ b/world/map/npc/009-7/debug.txt @@ -1,4 +1,4 @@ -function|script|fightclub_Debug|, +function|script|fightclub_Debug { goto L_Menu; @@ -134,7 +134,7 @@ L_End: return; } -009-7.gat,41,45,0|script|Debug#Duels|181, +009-7.gat,41,45,0|script|Debug#Duels|181 { mes "The debug menu can also be accessed by wearing a dev cap while talking to Rouge."; mes "For the documentation, @@https://wiki.themanaworld.org/index.php/User:Meko/FightClub/debug|click here@@##0"; diff --git a/world/map/npc/009-7/eventHandler.txt b/world/map/npc/009-7/eventHandler.txt index 4098e14a..dcaae899 100644 --- a/world/map/npc/009-7/eventHandler.txt +++ b/world/map/npc/009-7/eventHandler.txt @@ -1,6 +1,6 @@ // this file handles every events related to the fight club and calls the appropriate functions from core -009-7.gat,45,33,0|script|#trapdoor2#FightClub|327,0,0, +009-7.gat,45,33,0|script|#trapdoor2#FightClub|327,0,0 { if(countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)) goto L_Enter; end; @@ -9,13 +9,13 @@ L_Enter: warp "009-7.gat",34,22; // this warp is a special thanks for contributors end; } -009-7.gat,33,21,0|script|#trapdoor3#FightClub|327,0,0, +009-7.gat,33,21,0|script|#trapdoor3#FightClub|327,0,0 { warp "009-7.gat",44,32; end; } -009-7.gat,22,38,0|script|#FightClub#utils|127, +009-7.gat,22,38,0|script|#FightClub#utils|127 { end; @@ -44,7 +44,7 @@ OnCommandIntrusion: end; } -009-7.gat,20,45,0|script|#FightClub#TimeLimit|127,0,0, +009-7.gat,20,45,0|script|#FightClub#TimeLimit|127,0,0 { end; @@ -76,7 +76,7 @@ OnInit: end; } -009-7.gat,20,44,0|script|#FightClub#handler|127,0,0, +009-7.gat,20,44,0|script|#FightClub#handler|127,0,0 { end; diff --git a/world/map/npc/009-7/npcs.txt b/world/map/npc/009-7/npcs.txt index 72a4e9f8..cdeb6d84 100644 --- a/world/map/npc/009-7/npcs.txt +++ b/world/map/npc/009-7/npcs.txt @@ -1,4 +1,4 @@ -009-2.gat,38,105,0|script|#trapdoor#FightClub|327,0,0, +009-2.gat,38,105,0|script|#trapdoor#FightClub|327,0,0 { mes "What is the password?"; menu @@ -15,6 +15,6 @@ L_Close: close; } -009-7.gat,34,23,0|shop|Bartender#Duels|177,Beer :-1,IronPotion :-1,ConcentrationPotion :-1,SmallManaElixir :2400,BottleOfWater :-1,Milk :-1 +009-7.gat,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*2400,BottleOfWater:*1,Milk:*1 -009-7.gat,27,26,0|shop|Garçon#Duels|180,RoastedMaggot :-1,PickledBeets :5000,ChickenLeg :-1,Steak :-1,Beer :180 +009-7.gat,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*1,PickledBeets:*5000,ChickenLeg:*1,Steak:*1,Beer:*180 diff --git a/world/map/npc/009-7/rouge.txt b/world/map/npc/009-7/rouge.txt index 34df9dd4..bf872566 100644 --- a/world/map/npc/009-7/rouge.txt +++ b/world/map/npc/009-7/rouge.txt @@ -1,4 +1,4 @@ -009-7.gat,32,45,0|script|Rouge#Duels|181, +009-7.gat,32,45,0|script|Rouge#Duels|181 { if (getgmlevel() >= 40 && getequipid(equip_head) == 647) goto L_CallDebug; if (!debug && (strcharinfo(0) == "meko")) goto L_CallDebug; // allow meko to debug (has no dev cap) diff --git a/world/map/npc/010-1/_mobs.txt b/world/map/npc/010-1/_mobs.txt index 1c207f74..5f98b3c4 100644 --- a/world/map/npc/010-1/_mobs.txt +++ b/world/map/npc/010-1/_mobs.txt @@ -1,22 +1,22 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland mobs -010-1.gat,82,63,19,19|monster|Scorpion|1003,1,100000,30000,Mob010-1::On1003 -010-1.gat,49,71,31,19|monster|SpikyMushroom|1019,1,100000,30000,Mob010-1::On1019 -010-1.gat,0,0,0,0|monster|PinkFlower|1014,30,50,0,Mob010-1::On1014 -010-1.gat,0,0,0,0|monster|Snail|1041,20,50,0,Mob010-1::On1041 -010-1.gat,0,0,0,0|monster|SpikyMushroom|1019,45,50,0,Mob010-1::On1019 -010-1.gat,0,0,0,0|monster|LogHead|1025,40,100,0,Mob010-1::On1025 -010-1.gat,0,0,0,0|monster|Mouboo|1028,15,0,10,Mob010-1::On1028 -010-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000,180000,Mob010-1::On1029 -010-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,2700000,1800000,Mob010-1::On1030 -010-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob010-1::On1035 -010-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob010-1::On1037 -010-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob010-1::On1038 -010-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob010-1::On1055 +010-1.gat,82,63,19,19|monster|Scorpion|1003,1,100000ms,30000ms,Mob010-1::On1003 +010-1.gat,49,71,31,19|monster|SpikyMushroom|1019,1,100000ms,30000ms,Mob010-1::On1019 +010-1.gat,0,0,0,0|monster|PinkFlower|1014,30,50ms,0ms,Mob010-1::On1014 +010-1.gat,0,0,0,0|monster|Snail|1041,20,50ms,0ms,Mob010-1::On1041 +010-1.gat,0,0,0,0|monster|SpikyMushroom|1019,45,50ms,0ms,Mob010-1::On1019 +010-1.gat,0,0,0,0|monster|LogHead|1025,40,100ms,0ms,Mob010-1::On1025 +010-1.gat,0,0,0,0|monster|Mouboo|1028,15,0ms,10ms,Mob010-1::On1028 +010-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob010-1::On1029 +010-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,2700000ms,1800000ms,Mob010-1::On1030 +010-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob010-1::On1035 +010-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob010-1::On1037 +010-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob010-1::On1038 +010-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob010-1::On1055 -010-1.gat,0,0,0|script|Mob010-1|-1, +010-1.gat,0,0,0|script|Mob010-1|-1 { end; diff --git a/world/map/npc/010-2/_mobs.txt b/world/map/npc/010-2/_mobs.txt index 46950616..5f2a75f0 100644 --- a/world/map/npc/010-2/_mobs.txt +++ b/world/map/npc/010-2/_mobs.txt @@ -3,7 +3,7 @@ -010-2.gat,0,0,0|script|Mob010-2|-1, +010-2.gat,0,0,0|script|Mob010-2|-1 { end; } diff --git a/world/map/npc/010-2/band.txt b/world/map/npc/010-2/band.txt index d0783d8d..ab0074f3 100644 --- a/world/map/npc/010-2/band.txt +++ b/world/map/npc/010-2/band.txt @@ -1,22 +1,22 @@ // dimonds band -010-2.gat,40,35,0|script|Phil|157, +010-2.gat,40,35,0|script|Phil|157 { callfunc "DimondBand"; end; } -010-2.gat,40,37,0|script|Jerry|160, +010-2.gat,40,37,0|script|Jerry|160 { callfunc "DimondBand"; end; } -010-2.gat,42,36,0|script|Robert|162, +010-2.gat,42,36,0|script|Robert|162 { callfunc "DimondBand"; end; } -function|script|DimondBand|, +function|script|DimondBand { npctalk $@SongLyrics$[$@LyricSpot]; set $@LyricSpot, ($@LyricSpot + 1); @@ -27,7 +27,7 @@ function|script|DimondBand|, L_Return: return; } --|script|#BandConfig|-1, +-|script|#BandConfig|-1 { end; diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt index 9fcc1831..572e5185 100644 --- a/world/map/npc/010-2/chef.txt +++ b/world/map/npc/010-2/chef.txt @@ -1,4 +1,4 @@ -010-2.gat,33,25,0|script|Chef#dimond|148, +010-2.gat,33,25,0|script|Chef#dimond|148 { mes "[Chef]"; mes ""; diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt index 6f158c65..94c3f494 100644 --- a/world/map/npc/010-2/dimonds.txt +++ b/world/map/npc/010-2/dimonds.txt @@ -1,6 +1,6 @@ // -010-2.gat,34,38,0|script|Dimond|165, +010-2.gat,34,38,0|script|Dimond|165 { mes "[Dimond]"; mes "\"Welcome to Dimond's Cove!\""; @@ -12,7 +12,7 @@ close; } -010-2.gat,35,35,0|script|Shannon|193, +010-2.gat,35,35,0|script|Shannon|193 { set @month, 1; set @start_day, 24; @@ -458,7 +458,7 @@ L_Close: close; } -010-2.gat,27,30,0|script|Bar Rules|400, +010-2.gat,27,30,0|script|Bar Rules|400 { mes "Dimonds Cove Bar Rules"; next; @@ -478,28 +478,28 @@ L_Close: close; } -010-2.gat,71,38,0|script|Store Policy#1|400, +010-2.gat,71,38,0|script|Store Policy#1|400 { mes "All sales are final."; mes "Returns are subject to a 50% re-stocking fee."; close; } -010-2.gat,77,38,0|script|Store Policy#2|400, +010-2.gat,77,38,0|script|Store Policy#2|400 { mes "All sales are final."; mes "Returns are subject to a 50% re-stocking fee."; close; } -010-2.gat,36,30,0|script|Directions|400, +010-2.gat,36,30,0|script|Directions|400 { mes "This way to the Dimonds Cove Inn."; mes "Five star accommodation for the weary traveler!"; close; } -010-2.gat,80,32,0|script|Dimonds Cove 1|400, +010-2.gat,80,32,0|script|Dimonds Cove 1|400 { mes "The Story of Dimonds Cove"; next; @@ -519,7 +519,7 @@ L_Close: close; } -010-2.gat,85,32,0|script|Dimonds Cove 2|400, +010-2.gat,85,32,0|script|Dimonds Cove 2|400 { mes "List of Events at Dimonds Cove"; mes "January 2008 - Construction of Dimonds Cove."; @@ -527,7 +527,7 @@ L_Close: } -010-2.gat,71,30,0|script|Inn|400, +010-2.gat,71,30,0|script|Inn|400 { mes "Welcome to the Dimonds Cove Inn"; mes "Rooms are 200 gp a night."; @@ -536,15 +536,15 @@ L_Close: } -010-2.gat,24,27,0|shop|Bartender|112,Beer :-1,IronPotion :-1,ConcentrationPotion :-1 +010-2.gat,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,ConcentrationPotion:*1 -010-2.gat,32,34,0|shop|Waitress|139,CherryCake :-1,RoastedMaggot :-1,OrangeCupcake :-1,ChickenLeg :-1,Steak :-1 +010-2.gat,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1 -010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow :-1,IronArrow :-1,LeatherShield :-1 +010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow:*1,IronArrow:*1,LeatherShield:*1 -010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1 +010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts:*1,FancyHat:*1,SilkHeadband:*1,CottonSkirt:*1,Boots:*1,CottonBoots:*1 -010-2.gat,75,68,0|script|Basil|107, +010-2.gat,75,68,0|script|Basil|107 { set @npcname$, "Basil the Inn Keeper"; set @cost, 200; diff --git a/world/map/npc/010-2/doug.txt b/world/map/npc/010-2/doug.txt index 4b5598d7..1f984a3d 100644 --- a/world/map/npc/010-2/doug.txt +++ b/world/map/npc/010-2/doug.txt @@ -1,6 +1,6 @@ // -010-2.gat,68,87,0|script|Doug|113, +010-2.gat,68,87,0|script|Doug|113 { mes "[Doug]"; mes "\"This room is too dark. I want to brighten it up.\""; diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt index 9d98cdaa..f10395a2 100644 --- a/world/map/npc/010-2/loratay.txt +++ b/world/map/npc/010-2/loratay.txt @@ -1,4 +1,4 @@ -010-2.gat,85,85,0|script|Lora Tay|151, +010-2.gat,85,85,0|script|Lora Tay|151 { set @ROBE_COCOONS_NR, 150; // must be multiple of ten set @ROBE_ZENY, 10000; diff --git a/world/map/npc/010-2/workers.txt b/world/map/npc/010-2/workers.txt index 17109491..e88ba650 100644 --- a/world/map/npc/010-2/workers.txt +++ b/world/map/npc/010-2/workers.txt @@ -1,13 +1,13 @@ // -010-2.gat,23,70,0|script|Josh|155, +010-2.gat,23,70,0|script|Josh|155 { mes "[Josh]"; mes "\"We're working on getting the cellar pass open.\""; close; } -010-2.gat,39,75,0|script|Zack|155, +010-2.gat,39,75,0|script|Zack|155 { set @halloween_npc_id, $@halloween_npc_zack; callfunc "TrickOrTreat"; diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt index 35f25bb3..e209acea 100644 --- a/world/map/npc/011-1/_mobs.txt +++ b/world/map/npc/011-1/_mobs.txt @@ -1,21 +1,21 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland mobs -011-1.gat,0,0,0,0|monster|EvilMushroom|1013,30,0,0,Mob011-1::On1013 -011-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0,0,Mob011-1::On1014 -011-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0,0,Mob011-1::On1019 -011-1.gat,0,0,0,0|monster|Snail|1041,1,0,0,Mob011-1::On1041 -011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob011-1::On1028 -011-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000,180000,Mob011-1::On1029 -011-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,2700000,1800000,Mob011-1::On1032 -011-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob011-1::On1035 -011-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob011-1::On1037 -011-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob011-1::On1038 -011-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob011-1::On1055 -011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob011-1::On1028 +011-1.gat,0,0,0,0|monster|EvilMushroom|1013,30,0ms,0ms,Mob011-1::On1013 +011-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob011-1::On1014 +011-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob011-1::On1019 +011-1.gat,0,0,0,0|monster|Snail|1041,1,0ms,0ms,Mob011-1::On1041 +011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028 +011-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob011-1::On1029 +011-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,2700000ms,1800000ms,Mob011-1::On1032 +011-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob011-1::On1035 +011-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob011-1::On1037 +011-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob011-1::On1038 +011-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob011-1::On1055 +011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028 -011-1.gat,0,0,0|script|Mob011-1|-1, +011-1.gat,0,0,0|script|Mob011-1|-1 { end; diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt index fd8ec7a8..6e78a408 100644 --- a/world/map/npc/011-1/alchemist.txt +++ b/world/map/npc/011-1/alchemist.txt @@ -1,5 +1,5 @@ // This NPC makes potions and dyes -011-1.gat,117,77,0|script|Rauk|103, +011-1.gat,117,77,0|script|Rauk|103 { // Setzer quest/monster oil quest participation set @SETZER_INITIAL, 0; diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt index 1fe5c285..9790e8ef 100644 --- a/world/map/npc/011-1/auldsbel.txt +++ b/world/map/npc/011-1/auldsbel.txt @@ -1,7 +1,7 @@ // Auldsbel the Wizard // Transmutation Magic expert -011-1.gat,50,68,0|script|Auldsbel#_M|168, +011-1.gat,50,68,0|script|Auldsbel#_M|168 { set @mexp, MAGIC_EXPERIENCE & 65535; diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt index 2927c5e8..3bbfa545 100644 --- a/world/map/npc/011-1/oscar.txt +++ b/world/map/npc/011-1/oscar.txt @@ -24,11 +24,11 @@ // 4: the player is asked to go refill water bottles // 5: various possible states here: the water bottles are refilled and the pumpkin spawns will start right away. // the player will start by kafloshing ($@HalloweenQuest_PumpkinHunter$ == "") -// 5 + $@HalloweenQuest_PumpkinHunter$ != "" : the player watered the patches (by kaflosh, or the farmer did). Pumpkins spawn. +// 5 + $@HalloweenQuest_PumpkinHunter$ != "":* the player watered the patches (by kaflosh, or the farmer did). Pumpkins spawn. // 6: the player saved the farmer from the pumpkin invasion (all pumpkins / mobs killed) // 10: the player failed to save the farmer from the pumpkin invasion (player left the map, died -- logging off is allowed however) -function|script|HalloweenQuestWaterPumpkins|, +function|script|HalloweenQuestWaterPumpkins { if (Quest_Halloween != 5 || $@HalloweenQuest_PumpkinHunter$ != "") end; @@ -37,7 +37,7 @@ function|script|HalloweenQuestWaterPumpkins|, end; } -011-1.gat,94,38,0|script|Oscar|142, +011-1.gat,94,38,0|script|Oscar|142 { // Check we are at the good time of the year if (!(gettime(6) == 11 && (gettime(5) >= 4 && gettime(5) <= 30))) goto L_NoEvent; diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt index 2fd115b8..48126fe2 100644 --- a/world/map/npc/011-1/shops.txt +++ b/world/map/npc/011-1/shops.txt @@ -5,4 +5,4 @@ //################################################################################# // Shop -011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple :-1,RedApple :-1,Orange :-1 +011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1 diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt index 2ad3e897..3c8fa066 100644 --- a/world/map/npc/011-3/_mobs.txt +++ b/world/map/npc/011-3/_mobs.txt @@ -1,11 +1,11 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Hermit's Cave mobs -011-3.gat,0,0,0,0|monster|Bat|1017,10,0,0,Mob011-3::On1017 -011-3.gat,0,0,0,0|monster|Silkworm|1035,3,60000,30000,Mob011-3::On1035 +011-3.gat,0,0,0,0|monster|Bat|1017,10,0ms,0ms,Mob011-3::On1017 +011-3.gat,0,0,0,0|monster|Silkworm|1035,3,60000ms,30000ms,Mob011-3::On1035 -011-3.gat,0,0,0|script|Mob011-3|-1, +011-3.gat,0,0,0|script|Mob011-3|-1 { end; diff --git a/world/map/npc/011-3/hermit.txt b/world/map/npc/011-3/hermit.txt index e8c2d11a..2f758ee7 100644 --- a/world/map/npc/011-3/hermit.txt +++ b/world/map/npc/011-3/hermit.txt @@ -1,6 +1,6 @@ // -011-3.gat,30,23,0|script|Arkim|116, +011-3.gat,30,23,0|script|Arkim|116 { mes "[Arkim the Hermit]"; mes "\"Do you want to go back outside?\""; diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt index e4fcf12c..fa887b14 100644 --- a/world/map/npc/011-4/_mobs.txt +++ b/world/map/npc/011-4/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Lake Cave mobs -011-4.gat,52,30,39,39|monster|SpikyMushroom|1019,1,100000,30000,Mob011-4::On1019 -011-4.gat,93,114,39,39|monster|CaveSnake|1021,1,100000,30000,Mob011-4::On1021 -011-4.gat,0,0,0,0|monster|CaveSnake|1021,40,0,0,Mob011-4::On1021 -011-4.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0,0,Mob011-4::On1019 +011-4.gat,52,30,39,39|monster|SpikyMushroom|1019,1,100000ms,30000ms,Mob011-4::On1019 +011-4.gat,93,114,39,39|monster|CaveSnake|1021,1,100000ms,30000ms,Mob011-4::On1021 +011-4.gat,0,0,0,0|monster|CaveSnake|1021,40,0ms,0ms,Mob011-4::On1021 +011-4.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0ms,0ms,Mob011-4::On1019 -011-4.gat,0,0,0|script|Mob011-4|-1, +011-4.gat,0,0,0|script|Mob011-4|-1 { end; diff --git a/world/map/npc/011-4/bl_barrier.txt b/world/map/npc/011-4/bl_barrier.txt index fd33b9fd..98f52d39 100644 --- a/world/map/npc/011-4/bl_barrier.txt +++ b/world/map/npc/011-4/bl_barrier.txt @@ -1,6 +1,6 @@ //bandit lord barrier -011-4.gat,111,121,0|script|#BL_Barrier|45,0,0, +011-4.gat,111,121,0|script|#BL_Barrier|45,0,0 { set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt index 9bf56f93..c627e4aa 100644 --- a/world/map/npc/011-6/_mobs.txt +++ b/world/map/npc/011-6/_mobs.txt @@ -1,56 +1,56 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Bandit Cave mobs -011-6.gat,152,72,283,127|monster|Silkworm|1035,9,30000,100000,Mob011-6::On1035 -011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,262,114,38,38|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,132,119,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,170,66,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,67,70,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,196,107,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,196,29,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,36,37,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,112,40,45,48|monster|Bandit|1064,2,30000,60000,Mob011-6::On1064 -011-6.gat,31,99,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064 -011-6.gat,223,250,123,65|monster|Bat|1017,5,30000,100000,Mob011-6::On1017 -011-6.gat,224,175,118,25|monster|Bat|1017,3,30000,100000,Mob011-6::On1017 -011-6.gat,257,77,4,126|monster|Bat|1017,6,30000,100000,Mob011-6::On1017 -011-6.gat,192,77,4,126|monster|Bat|1017,9,30000,100000,Mob011-6::On1017 -011-6.gat,167,110,87,13|monster|Bat|1017,9,30000,100000,Mob011-6::On1017 -011-6.gat,75,70,104,96|monster|Bat|1017,23,30000,100000,Mob011-6::On1017 -011-6.gat,78,195,129,97|monster|Bat|1017,9,30000,100000,Mob011-6::On1017 -011-6.gat,168,109,36,37|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019 -011-6.gat,199,76,36,37|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019 -011-6.gat,88,163,29,27|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019 -011-6.gat,48,113,35,19|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019 -011-6.gat,177,94,20,28|monster|EvilMushroom|1013,4,30000,100000,Mob011-6::On1013 -011-6.gat,194,49,20,28|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013 -011-6.gat,51,115,47,24|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013 -011-6.gat,63,169,13,17|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013 -011-6.gat,100,226,29,14|monster|SpikyMushroom|1019,3,30000,100000,Mob011-6::On1019 -011-6.gat,260,44,53,16|monster|SpikyMushroom|1019,3,30000,100000,Mob011-6::On1019 -011-6.gat,272,48,21,28|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013 -011-6.gat,95,78,31,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007 -011-6.gat,59,36,19,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007 -011-6.gat,26,69,19,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007 -011-6.gat,61,101,14,10|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007 -011-6.gat,50,61,9,12|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007 -011-6.gat,128,39,9,12|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007 -011-6.gat,41,178,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007 -011-6.gat,70,229,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007 -011-6.gat,20,204,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007 -011-6.gat,114,190,9,12|monster|YellowSlime|1007,4,30000,100000,Mob011-6::On1007 -011-6.gat,137,205,9,12|monster|YellowSlime|1007,2,30000,100000,Mob011-6::On1007 -011-6.gat,79,220,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021 -011-6.gat,115,210,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021 -011-6.gat,41,193,31,31|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021 -011-6.gat,70,143,31,31|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021 -011-6.gat,97,183,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021 -011-6.gat,172,252,9,12|monster|CaveMaggot|1056,4,30000,100000,Mob011-6::On1056 -011-6.gat,263,236,16,5|monster|CaveMaggot|1056,3,30000,100000,Mob011-6::On1056 +011-6.gat,152,72,283,127|monster|Silkworm|1035,9,30000ms,100000ms,Mob011-6::On1035 +011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,262,114,38,38|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,132,119,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,170,66,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,67,70,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,196,107,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,196,29,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,36,37,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,112,40,45,48|monster|Bandit|1064,2,30000ms,60000ms,Mob011-6::On1064 +011-6.gat,31,99,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064 +011-6.gat,223,250,123,65|monster|Bat|1017,5,30000ms,100000ms,Mob011-6::On1017 +011-6.gat,224,175,118,25|monster|Bat|1017,3,30000ms,100000ms,Mob011-6::On1017 +011-6.gat,257,77,4,126|monster|Bat|1017,6,30000ms,100000ms,Mob011-6::On1017 +011-6.gat,192,77,4,126|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017 +011-6.gat,167,110,87,13|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017 +011-6.gat,75,70,104,96|monster|Bat|1017,23,30000ms,100000ms,Mob011-6::On1017 +011-6.gat,78,195,129,97|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017 +011-6.gat,168,109,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019 +011-6.gat,199,76,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019 +011-6.gat,88,163,29,27|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019 +011-6.gat,48,113,35,19|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019 +011-6.gat,177,94,20,28|monster|EvilMushroom|1013,4,30000ms,100000ms,Mob011-6::On1013 +011-6.gat,194,49,20,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013 +011-6.gat,51,115,47,24|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013 +011-6.gat,63,169,13,17|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013 +011-6.gat,100,226,29,14|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019 +011-6.gat,260,44,53,16|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019 +011-6.gat,272,48,21,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013 +011-6.gat,95,78,31,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,59,36,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,26,69,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,61,101,14,10|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,50,61,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,128,39,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,41,178,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,70,229,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,20,204,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,114,190,9,12|monster|YellowSlime|1007,4,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,137,205,9,12|monster|YellowSlime|1007,2,30000ms,100000ms,Mob011-6::On1007 +011-6.gat,79,220,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021 +011-6.gat,115,210,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021 +011-6.gat,41,193,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021 +011-6.gat,70,143,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021 +011-6.gat,97,183,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021 +011-6.gat,172,252,9,12|monster|CaveMaggot|1056,4,30000ms,100000ms,Mob011-6::On1056 +011-6.gat,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms,Mob011-6::On1056 -011-6.gat,0,0,0|script|Mob011-6|-1, +011-6.gat,0,0,0|script|Mob011-6|-1 { end; diff --git a/world/map/npc/011-6/barrier.txt b/world/map/npc/011-6/barrier.txt index cf5908e4..7b4f2b25 100644 --- a/world/map/npc/011-6/barrier.txt +++ b/world/map/npc/011-6/barrier.txt @@ -1,4 +1,4 @@ -011-6.gat,264,236,0|script|#BL_Barrier2|45,0,0, +011-6.gat,264,236,0|script|#BL_Barrier2|45,0,0 { set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt index 42b8c747..2aaa15fe 100644 --- a/world/map/npc/011-6/bryant.txt +++ b/world/map/npc/011-6/bryant.txt @@ -1,7 +1,7 @@ //NPC to set the state for killing the bandit lord. // Variables used: nibble 0 of QUEST_Hurnscald -011-6.gat,27,200,0|script|Bryant|126, +011-6.gat,27,200,0|script|Bryant|126 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt index f9acb0bf..2818998b 100644 --- a/world/map/npc/011-6/crastur.txt +++ b/world/map/npc/011-6/crastur.txt @@ -1,4 +1,4 @@ -011-6.gat,172,250,0|script|Crastur the Ugly|418, +011-6.gat,172,250,0|script|Crastur the Ugly|418 { set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt index f0c8af8b..38f003d9 100644 --- a/world/map/npc/012-1/_mobs.txt +++ b/world/map/npc/012-1/_mobs.txt @@ -1,20 +1,20 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Hills mobs -012-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0,100,Mob012-1::On1014 -012-1.gat,0,0,0,0|monster|SpikyMushroom|1019,25,0,10,Mob012-1::On1019 -012-1.gat,0,0,0,0|monster|Mouboo|1028,20,0,10,Mob012-1::On1028 -012-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000,1800000,Mob012-1::On1029 -012-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000,1800000,Mob012-1::On1030 -012-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000,1800000,Mob012-1::On1031 -012-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000,1800000,Mob012-1::On1032 -012-1.gat,0,0,0,0|monster|Silkworm|1035,5,60000,30000,Mob012-1::On1035 -012-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob012-1::On1037 -012-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob012-1::On1038 -012-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob012-1::On1055 +012-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob012-1::On1014 +012-1.gat,0,0,0,0|monster|SpikyMushroom|1019,25,0ms,10ms,Mob012-1::On1019 +012-1.gat,0,0,0,0|monster|Mouboo|1028,20,0ms,10ms,Mob012-1::On1028 +012-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000ms,1800000ms,Mob012-1::On1029 +012-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob012-1::On1030 +012-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob012-1::On1031 +012-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob012-1::On1032 +012-1.gat,0,0,0,0|monster|Silkworm|1035,5,60000ms,30000ms,Mob012-1::On1035 +012-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob012-1::On1037 +012-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob012-1::On1038 +012-1.gat,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob012-1::On1055 -012-1.gat,0,0,0|script|Mob012-1|-1, +012-1.gat,0,0,0|script|Mob012-1|-1 { end; diff --git a/world/map/npc/012-1/amrak.txt b/world/map/npc/012-1/amrak.txt index 8997631f..1305b9dd 100644 --- a/world/map/npc/012-1/amrak.txt +++ b/world/map/npc/012-1/amrak.txt @@ -1,6 +1,6 @@ // -012-1.gat,137,104,0|script|Amrak|103, +012-1.gat,137,104,0|script|Amrak|103 { mes "[Amrak]"; mes "\"I'm studying this waterfall. The water seems to flow from it like magic.\""; diff --git a/world/map/npc/012-1/flowerpentagram2.txt b/world/map/npc/012-1/flowerpentagram2.txt index e002ec8a..35a9a21e 100644 --- a/world/map/npc/012-1/flowerpentagram2.txt +++ b/world/map/npc/012-1/flowerpentagram2.txt @@ -1,6 +1,6 @@ // Author: Jenalya -012-1.gat,143,70,0|script|#FlowerPentagram2|400, +012-1.gat,143,70,0|script|#FlowerPentagram2|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt index 4fe62ce5..03a5bb70 100644 --- a/world/map/npc/012-1/injured-mouboo.txt +++ b/world/map/npc/012-1/injured-mouboo.txt @@ -1,6 +1,6 @@ // The following auxiliary function is used both by appropriate magic and within the regular script: -function|script|QuestMoubooHeal|, +function|script|QuestMoubooHeal { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; @@ -43,7 +43,7 @@ S_update_var: return; } -012-1.gat,57,153,0|script|Mouboo|171, +012-1.gat,57,153,0|script|Mouboo|171 { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt index a47e3274..fb29a68a 100644 --- a/world/map/npc/012-1/shops.txt +++ b/world/map/npc/012-1/shops.txt @@ -1,8 +1,8 @@ // -012-1.gat,36,99,0|shop|#FlowerShop|127,RedRose :-1,PinkRose :-1,YellowRose :-1,WhiteRose :-1,OrangeRose :-1,DarkRedRose :-1,RedTulip :-1,PinkTulip :-1,YellowTulip :-1,WhiteTulip :-1,OrangeTulip :-1 +012-1.gat,36,99,0|shop|#FlowerShop|127,RedRose:*1,PinkRose:*1,YellowRose:*1,WhiteRose:*1,OrangeRose:*1,DarkRedRose:*1,RedTulip:*1,PinkTulip:*1,YellowTulip:*1,WhiteTulip:*1,OrangeTulip:*1 -012-1.gat,36,99,0|script|Blossom|163, +012-1.gat,36,99,0|script|Blossom|163 { mes "[Blossom]"; mes "\"Hello, would you like to buy some flowers?\""; diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt index e27b7c6f..5407229a 100644 --- a/world/map/npc/012-3/_mobs.txt +++ b/world/map/npc/012-3/_mobs.txt @@ -1,25 +1,25 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Moggun Cave mobs -012-3.gat,448,65,18,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,442,45,18,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,412,31,18,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,347,39,8,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,363,101,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061 -012-3.gat,446,81,18,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,388,138,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,409,78,8,17|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,382,152,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,430,117,8,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,330,100,8,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061 -012-3.gat,269,138,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061 -012-3.gat,188,52,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061 -012-3.gat,165,106,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061 -012-3.gat,0,0,0,0|monster|Bat|1017,100,0,0,Mob012-3::On1017 -012-3.gat,0,0,0,0|monster|CaveSnake|1021,75,0,0,Mob012-3::On1021 +012-3.gat,448,65,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,442,45,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,412,31,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,347,39,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,363,101,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,446,81,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,388,138,17,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,409,78,8,17|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,382,152,17,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,430,117,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,330,100,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,269,138,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,188,52,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,165,106,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061 +012-3.gat,0,0,0,0|monster|Bat|1017,100,0ms,0ms,Mob012-3::On1017 +012-3.gat,0,0,0,0|monster|CaveSnake|1021,75,0ms,0ms,Mob012-3::On1021 -012-3.gat,0,0,0|script|Mob012-3|-1, +012-3.gat,0,0,0|script|Mob012-3|-1 { end; diff --git a/world/map/npc/012-3/mana-seed.txt b/world/map/npc/012-3/mana-seed.txt index 3fd46393..7f4dcb5c 100644 --- a/world/map/npc/012-3/mana-seed.txt +++ b/world/map/npc/012-3/mana-seed.txt @@ -1,4 +1,4 @@ -012-3.gat,62,130,0|script|Forest Mana Seed#_M|166, +012-3.gat,62,130,0|script|Forest Mana Seed#_M|166 { setarray @magic_exp_needed, 0, // level 0 diff --git a/world/map/npc/012-3/traveler.txt b/world/map/npc/012-3/traveler.txt index ef77b88a..958fdec9 100644 --- a/world/map/npc/012-3/traveler.txt +++ b/world/map/npc/012-3/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -012-3.gat,439,62,0|script|Meridith the Traveler|103, +012-3.gat,439,62,0|script|Meridith the Traveler|103 { set @NpcName$, "Meridith"; set @NpcTravelBit, $@terranite_cave_bit; diff --git a/world/map/npc/012-3/warningsigns.txt b/world/map/npc/012-3/warningsigns.txt index bb92d1fe..0c84a895 100644 --- a/world/map/npc/012-3/warningsigns.txt +++ b/world/map/npc/012-3/warningsigns.txt @@ -1,6 +1,6 @@ //warning signs at pvp entrance! -012-3.gat,445,61,0|script|sign#pvp-1|187, +012-3.gat,445,61,0|script|sign#pvp-1|187 { mes "You are about to enter a dangerous area!"; next; @@ -9,7 +9,7 @@ close; } -012-3.gat,451,61,0|script|sign#pvp-2|186, +012-3.gat,451,61,0|script|sign#pvp-2|186 { mes "You are about to enter a dangerous area!"; next; diff --git a/world/map/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt index d5a30f2c..d4eeb43a 100644 --- a/world/map/npc/012-4/_mobs.txt +++ b/world/map/npc/012-4/_mobs.txt @@ -1,73 +1,73 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Terranite Cave mobs -012-4.gat,217,45,12,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061 -012-4.gat,223,30,12,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061 -012-4.gat,239,48,12,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061 -012-4.gat,197,39,7,8|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061 -012-4.gat,210,35,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,241,38,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,237,59,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,226,73,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,209,94,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,263,29,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,274,48,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,267,70,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,259,79,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,274,79,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,268,91,24,15|monster|Moggun|1061,10,100000,30000,Mob012-4::On1061 -012-4.gat,209,146,69,55|monster|Spider|1012,50,100000,30000,Mob012-4::On1012 -012-4.gat,254,163,19,46|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007 -012-4.gat,167,175,17,22|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007 -012-4.gat,148,176,17,22|monster|RedSlime|1008,20,100000,30000,Mob012-4::On1008 -012-4.gat,131,88,17,22|monster|RedSlime|1008,15,100000,30000,Mob012-4::On1008 -012-4.gat,140,131,17,22|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007 -012-4.gat,42,128,17,9|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007 -012-4.gat,64,62,25,30|monster|Spider|1012,20,100000,30000,Mob012-4::On1012 -012-4.gat,69,89,17,21|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007 -012-4.gat,34,45,17,33|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062 -012-4.gat,64,36,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043 -012-4.gat,100,115,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043 -012-4.gat,90,137,17,22|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007 -012-4.gat,59,113,14,17|monster|LadySkeleton|1044,3,100000,30000,Mob012-4::On1044 -012-4.gat,42,176,15,13|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062 -012-4.gat,120,177,24,17|monster|LadySkeleton|1044,3,100000,30000,Mob012-4::On1044 -012-4.gat,287,180,24,17|monster|LadySkeleton|1044,3,100000,30000,Mob012-4::On1044 -012-4.gat,340,175,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043 -012-4.gat,390,156,69,54|monster|Spider|1012,40,100000,30000,Mob012-4::On1012 -012-4.gat,358,37,20,22|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062 -012-4.gat,481,110,19,24|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062 -012-4.gat,435,114,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043 -012-4.gat,477,82,24,17|monster|LadySkeleton|1044,3,100000,30000,Mob012-4::On1044 -012-4.gat,354,106,19,46|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007 -012-4.gat,342,139,17,22|monster|RedSlime|1008,15,100000,30000,Mob012-4::On1008 -012-4.gat,389,81,33,15|monster|RedSlime|1008,20,100000,30000,Mob012-4::On1008 -012-4.gat,409,35,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,413,73,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,395,63,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,314,182,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,409,121,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,456,99,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,133,153,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,153,98,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,126,65,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,81,180,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,61,159,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,271,157,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,270,182,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,322,141,17,22|monster|RedSlime|1008,20,100000,30000,Mob012-4::On1008 -012-4.gat,451,111,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,422,50,11,32|monster|Spider|1012,10,100000,30000,Mob012-4::On1012 -012-4.gat,380,40,14,22|monster|Spider|1012,10,100000,30000,Mob012-4::On1012 -012-4.gat,124,49,9,24|monster|Terranite|1062,1,100000,30000,Mob012-4::On1062 -012-4.gat,80,110,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,42,142,20,11|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043 -012-4.gat,41,159,11,20|monster|Spider|1012,20,100000,30000,Mob012-4::On1012 -012-4.gat,95,180,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017 -012-4.gat,91,180,23,10|monster|Spider|1012,20,100000,30000,Mob012-4::On1012 +012-4.gat,217,45,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061 +012-4.gat,223,30,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061 +012-4.gat,239,48,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061 +012-4.gat,197,39,7,8|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061 +012-4.gat,210,35,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,241,38,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,237,59,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,226,73,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,209,94,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,263,29,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,274,48,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,267,70,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,259,79,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,274,79,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,268,91,24,15|monster|Moggun|1061,10,100000ms,30000ms,Mob012-4::On1061 +012-4.gat,209,146,69,55|monster|Spider|1012,50,100000ms,30000ms,Mob012-4::On1012 +012-4.gat,254,163,19,46|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007 +012-4.gat,167,175,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007 +012-4.gat,148,176,17,22|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008 +012-4.gat,131,88,17,22|monster|RedSlime|1008,15,100000ms,30000ms,Mob012-4::On1008 +012-4.gat,140,131,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007 +012-4.gat,42,128,17,9|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007 +012-4.gat,64,62,25,30|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012 +012-4.gat,69,89,17,21|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007 +012-4.gat,34,45,17,33|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062 +012-4.gat,64,36,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043 +012-4.gat,100,115,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043 +012-4.gat,90,137,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007 +012-4.gat,59,113,14,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044 +012-4.gat,42,176,15,13|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062 +012-4.gat,120,177,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044 +012-4.gat,287,180,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044 +012-4.gat,340,175,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043 +012-4.gat,390,156,69,54|monster|Spider|1012,40,100000ms,30000ms,Mob012-4::On1012 +012-4.gat,358,37,20,22|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062 +012-4.gat,481,110,19,24|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062 +012-4.gat,435,114,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043 +012-4.gat,477,82,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044 +012-4.gat,354,106,19,46|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007 +012-4.gat,342,139,17,22|monster|RedSlime|1008,15,100000ms,30000ms,Mob012-4::On1008 +012-4.gat,389,81,33,15|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008 +012-4.gat,409,35,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,413,73,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,395,63,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,314,182,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,409,121,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,456,99,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,133,153,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,153,98,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,126,65,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,81,180,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,61,159,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,271,157,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,270,182,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,322,141,17,22|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008 +012-4.gat,451,111,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,422,50,11,32|monster|Spider|1012,10,100000ms,30000ms,Mob012-4::On1012 +012-4.gat,380,40,14,22|monster|Spider|1012,10,100000ms,30000ms,Mob012-4::On1012 +012-4.gat,124,49,9,24|monster|Terranite|1062,1,100000ms,30000ms,Mob012-4::On1062 +012-4.gat,80,110,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,42,142,20,11|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043 +012-4.gat,41,159,11,20|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012 +012-4.gat,95,180,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017 +012-4.gat,91,180,23,10|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012 -012-4.gat,0,0,0|script|Mob012-4|-1, +012-4.gat,0,0,0|script|Mob012-4|-1 { end; diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt index 5e34f374..2119ca73 100644 --- a/world/map/npc/013-1/_mobs.txt +++ b/world/map/npc/013-1/_mobs.txt @@ -1,24 +1,24 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Hills mobs -013-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0,100,Mob013-1::On1014 -013-1.gat,0,0,0,0|monster|SpikyMushroom|1019,12,0,100,Mob013-1::On1019 -013-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,100,Mob013-1::On1028 -013-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270,180,Mob013-1::On1029 -013-1.gat,0,0,0,0|monster|MauvePlant|1029,4,2700000,1800000,Mob013-1::On1029 -013-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270,180,Mob013-1::On1030 -013-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000,1800000,Mob013-1::On1030 -013-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270,180,Mob013-1::On1031 -013-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000,1800000,Mob013-1::On1031 -013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270,180,Mob013-1::On1032 -013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000,1800000,Mob013-1::On1032 -013-1.gat,0,0,0,0|monster|Silkworm|1035,4,60000,30000,Mob013-1::On1035 -013-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob013-1::On1037 -013-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob013-1::On1038 -013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob013-1::On1055 +013-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob013-1::On1014 +013-1.gat,0,0,0,0|monster|SpikyMushroom|1019,12,0ms,100ms,Mob013-1::On1019 +013-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,100ms,Mob013-1::On1028 +013-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob013-1::On1029 +013-1.gat,0,0,0,0|monster|MauvePlant|1029,4,2700000ms,1800000ms,Mob013-1::On1029 +013-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob013-1::On1030 +013-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob013-1::On1030 +013-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob013-1::On1031 +013-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob013-1::On1031 +013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob013-1::On1032 +013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob013-1::On1032 +013-1.gat,0,0,0,0|monster|Silkworm|1035,4,60000ms,30000ms,Mob013-1::On1035 +013-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob013-1::On1037 +013-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob013-1::On1038 +013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob013-1::On1055 -013-1.gat,0,0,0|script|Mob013-1|-1, +013-1.gat,0,0,0|script|Mob013-1|-1 { end; diff --git a/world/map/npc/013-1/flowerpentagram.txt b/world/map/npc/013-1/flowerpentagram.txt index 2b834a03..59c8e392 100644 --- a/world/map/npc/013-1/flowerpentagram.txt +++ b/world/map/npc/013-1/flowerpentagram.txt @@ -1,10 +1,10 @@ -013-1.gat,1,1,0|script|#FlowerPentagram|127, +013-1.gat,1,1,0|script|#FlowerPentagram|127 { end; OnSummon: // This is just annoying - //announce "Sagatha : What kind of a foolish trick is this? Who dares to create such calamity in my forest?", 0; + //announce "Sagatha:* What kind of a foolish trick is this? Who dares to create such calamity in my forest?", 0; callsub S_CleanUp; // area closely to sagatha @@ -88,7 +88,7 @@ S_CleanUp: return; } -function|script|FlowerPentagramCount| +function|script|FlowerPentagramCount { set $@Flower_Pentagram_Mobcount, mobcount("013-1.gat", "#FlowerPentagram::OnSquirrelDeath") + diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt index 914744d1..cf99cd28 100644 --- a/world/map/npc/013-1/sagatha.txt +++ b/world/map/npc/013-1/sagatha.txt @@ -1,7 +1,7 @@ // Sagatha the witch, expert for nature and astral magic //---------------------------------------- -function|script|QuestSagathaHappy|, +function|script|QuestSagathaHappy { set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; if (@unhappiness < @value) @@ -20,7 +20,7 @@ L_write: } //---------------------------------------- -function|script|QuestSagathaAnnoy|, +function|script|QuestSagathaAnnoy { set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; if ((@unhappiness + @value) > 15) @@ -39,7 +39,7 @@ L_write: } //---------------------------------------- -function|script|SagathaStatus|, +function|script|SagathaStatus { if (getequipid(equip_head) != 1216 && getequipid(equip_head) != 752) goto L_next; @@ -72,7 +72,7 @@ L_next: } //---------------------------------------- -013-1.gat,131,24,0|script|Sagatha#_M|167, +013-1.gat,131,24,0|script|Sagatha#_M|167 { callfunc "SagathaStatus"; diff --git a/world/map/npc/013-1/traveler.txt b/world/map/npc/013-1/traveler.txt index 405c82b1..ff36ded4 100644 --- a/world/map/npc/013-1/traveler.txt +++ b/world/map/npc/013-1/traveler.txt @@ -1,4 +1,4 @@ -013-1.gat,120,90,0|script|Faris the Traveler|103, +013-1.gat,120,90,0|script|Faris the Traveler|103 { set @NpcName$, "Faris"; set @NpcTravelBit, $@magic_house_bit; diff --git a/world/map/npc/013-2/_mobs.txt b/world/map/npc/013-2/_mobs.txt index 6464434f..f13e817b 100644 --- a/world/map/npc/013-2/_mobs.txt +++ b/world/map/npc/013-2/_mobs.txt @@ -3,7 +3,7 @@ -013-2.gat,0,0,0|script|Mob013-2|-1, +013-2.gat,0,0,0|script|Mob013-2|-1 { end; } diff --git a/world/map/npc/013-2/apprentice.txt b/world/map/npc/013-2/apprentice.txt index 843c10fb..0b0e4ea2 100644 --- a/world/map/npc/013-2/apprentice.txt +++ b/world/map/npc/013-2/apprentice.txt @@ -1,4 +1,4 @@ -013-2.gat,25,37,0|script|Fabius|115, +013-2.gat,25,37,0|script|Fabius|115 { mes "[Fabius]"; mes "\"Hey! Wanna have a drink or something? High quality, low cost. A poor fella like me needs a bit of extra cash, ye know.\""; diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt index c8b386bd..37014a76 100644 --- a/world/map/npc/013-2/notes.txt +++ b/world/map/npc/013-2/notes.txt @@ -1,25 +1,25 @@ // -013-2.gat,23,32,0|script|Motto#wiz|400, +013-2.gat,23,32,0|script|Motto#wiz|400 { mes "Mid pleasures and palaces though we may roam,"; mes "Be it ever so humble, there's no place like home."; close; } -013-2.gat,30,32,0|script|Note#wiz|400, +013-2.gat,30,32,0|script|Note#wiz|400 { mes "Please do not open."; close; } -013-2.gat,38,20,0|script|Saying#wiz|400, +013-2.gat,38,20,0|script|Saying#wiz|400 { mes "The early bird catcheth the worm."; close; } -013-2.gat,27,21,0|script|Mirror#wiz|400, +013-2.gat,27,21,0|script|Mirror#wiz|400 { mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\""; next; @@ -33,7 +33,7 @@ } // Warp to wood clearings -013-2.gat,25,23,0|script|Spell#wiz1|400, +013-2.gat,25,23,0|script|Spell#wiz1|400 { mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\""; next; @@ -66,7 +66,7 @@ L_Close: } // Warp to desert -013-2.gat,27,24,0|script|Spell#wiz2|400, +013-2.gat,27,24,0|script|Spell#wiz2|400 { mes "You read: \"You must not fear, for it is the mind-killer. That and sharp pointy things.\""; next; @@ -106,7 +106,7 @@ L_Close: } // Warp to snow area -013-2.gat,25,27,0|script|Spell#wiz3|400, +013-2.gat,25,27,0|script|Spell#wiz3|400 { mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\""; next; @@ -137,7 +137,7 @@ L_Close: } // Warp to Inns -013-2.gat,27,27,0|script|Spell#wiz4|400, +013-2.gat,27,27,0|script|Spell#wiz4|400 { mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\""; next; @@ -168,7 +168,7 @@ L_Close: } // Warp to mines -013-2.gat,26,28,0|script|Spell#wiz5|400, +013-2.gat,26,28,0|script|Spell#wiz5|400 { mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\""; next; @@ -199,7 +199,7 @@ L_Close: } // Death -013-2.gat,21,29,0|script|Spell#wiz6|400, +013-2.gat,21,29,0|script|Spell#wiz6|400 { mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\""; next; @@ -210,7 +210,7 @@ L_Close: } // Naked -013-2.gat,28,29,0|script|Spell#wiz7|400, +013-2.gat,28,29,0|script|Spell#wiz7|400 { mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\""; next; diff --git a/world/map/npc/013-2/wizard.txt b/world/map/npc/013-2/wizard.txt index b6a60661..1cc47128 100644 --- a/world/map/npc/013-2/wizard.txt +++ b/world/map/npc/013-2/wizard.txt @@ -1,4 +1,4 @@ -013-2.gat,66,39,0|script|Old Wizard#_W|116, +013-2.gat,66,39,0|script|Old Wizard#_W|116 { set @has_magic, getskilllv(SKILL_MAGIC); set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_OLD_WIZARD; diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt index d3d28053..176f7c90 100644 --- a/world/map/npc/013-3/_mobs.txt +++ b/world/map/npc/013-3/_mobs.txt @@ -1,37 +1,37 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Hills Cave mobs -013-3.gat,28,89,16,52|monster|CaveSnake|1021,10,120000,60000,Mob013-3::On1021 -013-3.gat,61,22,2,2|monster|FireSkull|1023,1,120000,60000,Mob013-3::On1023 -013-3.gat,81,22,2,2|monster|PoisonSkull|1024,1,120000,60000,Mob013-3::On1024 -013-3.gat,109,31,6,22|monster|BlackScorpion|1009,20,50000,25000,Mob013-3::On1009 -013-3.gat,119,84,27,38|monster|Spider|1012,20,120000,40000,Mob013-3::On1012 -013-3.gat,176,23,5,6|monster|Spider|1012,10,100000,40000,Mob013-3::On1012 -013-3.gat,82,75,2,2|monster|FireSkull|1023,1,180000,60000,Mob013-3::On1023 -013-3.gat,142,37,2,2|monster|PoisonSkull|1024,1,180000,60000,Mob013-3::On1024 -013-3.gat,79,134,21,16|monster|BlackScorpion|1009,5,80000,40000,Mob013-3::On1009 -013-3.gat,71,169,38,17|monster|BlackScorpion|1009,5,80000,40000,Mob013-3::On1009 -013-3.gat,64,85,9,21|monster|BlackScorpion|1009,10,80000,40000,Mob013-3::On1009 -013-3.gat,81,92,3,20|monster|BlackScorpion|1009,10,80000,40000,Mob013-3::On1009 -013-3.gat,163,84,33,37|monster|Snake|1010,30,120000,50000,Mob013-3::On1010 -013-3.gat,162,85,33,37|monster|Spider|1012,30,120000,50000,Mob013-3::On1012 -013-3.gat,172,77,18,25|monster|BlackScorpion|1009,15,120000,50000,Mob013-3::On1009 -013-3.gat,145,36,20,15|monster|RedSlime|1008,25,80000,40000,Mob013-3::On1008 -013-3.gat,167,37,23,11|monster|Snake|1010,20,120000,40000,Mob013-3::On1010 -013-3.gat,165,25,16,11|monster|BlackScorpion|1009,15,120000,40000,Mob013-3::On1009 -013-3.gat,71,39,2,3|monster|Snake|1010,2,40000,20000,Mob013-3::On1010 -013-3.gat,159,102,3,5|monster|YellowSlime|1007,2,80000,40000,Mob013-3::On1007 -013-3.gat,67,22,2,2|monster|Maggot|1002,2,40000,20000,Mob013-3::On1002 -013-3.gat,75,22,2,2|monster|Maggot|1002,2,40000,20000,Mob013-3::On1002 -013-3.gat,76,39,7,4|monster|BlackScorpion|1009,8,40000,20000,Mob013-3::On1009 -013-3.gat,65,39,7,4|monster|RedSlime|1008,8,40000,20000,Mob013-3::On1008 -013-3.gat,62,33,2,1|monster|PoisonSkull|1024,1,120000,60000,Mob013-3::On1024 -013-3.gat,80,33,2,1|monster|FireSkull|1023,1,120000,60000,Mob013-3::On1023 -013-3.gat,75,46,2,1|monster|PoisonSkull|1024,1,120000,60000,Mob013-3::On1024 -013-3.gat,67,46,2,1|monster|FireSkull|1023,1,120000,60000,Mob013-3::On1023 +013-3.gat,28,89,16,52|monster|CaveSnake|1021,10,120000ms,60000ms,Mob013-3::On1021 +013-3.gat,61,22,2,2|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023 +013-3.gat,81,22,2,2|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024 +013-3.gat,109,31,6,22|monster|BlackScorpion|1009,20,50000ms,25000ms,Mob013-3::On1009 +013-3.gat,119,84,27,38|monster|Spider|1012,20,120000ms,40000ms,Mob013-3::On1012 +013-3.gat,176,23,5,6|monster|Spider|1012,10,100000ms,40000ms,Mob013-3::On1012 +013-3.gat,82,75,2,2|monster|FireSkull|1023,1,180000ms,60000ms,Mob013-3::On1023 +013-3.gat,142,37,2,2|monster|PoisonSkull|1024,1,180000ms,60000ms,Mob013-3::On1024 +013-3.gat,79,134,21,16|monster|BlackScorpion|1009,5,80000ms,40000ms,Mob013-3::On1009 +013-3.gat,71,169,38,17|monster|BlackScorpion|1009,5,80000ms,40000ms,Mob013-3::On1009 +013-3.gat,64,85,9,21|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob013-3::On1009 +013-3.gat,81,92,3,20|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob013-3::On1009 +013-3.gat,163,84,33,37|monster|Snake|1010,30,120000ms,50000ms,Mob013-3::On1010 +013-3.gat,162,85,33,37|monster|Spider|1012,30,120000ms,50000ms,Mob013-3::On1012 +013-3.gat,172,77,18,25|monster|BlackScorpion|1009,15,120000ms,50000ms,Mob013-3::On1009 +013-3.gat,145,36,20,15|monster|RedSlime|1008,25,80000ms,40000ms,Mob013-3::On1008 +013-3.gat,167,37,23,11|monster|Snake|1010,20,120000ms,40000ms,Mob013-3::On1010 +013-3.gat,165,25,16,11|monster|BlackScorpion|1009,15,120000ms,40000ms,Mob013-3::On1009 +013-3.gat,71,39,2,3|monster|Snake|1010,2,40000ms,20000ms,Mob013-3::On1010 +013-3.gat,159,102,3,5|monster|YellowSlime|1007,2,80000ms,40000ms,Mob013-3::On1007 +013-3.gat,67,22,2,2|monster|Maggot|1002,2,40000ms,20000ms,Mob013-3::On1002 +013-3.gat,75,22,2,2|monster|Maggot|1002,2,40000ms,20000ms,Mob013-3::On1002 +013-3.gat,76,39,7,4|monster|BlackScorpion|1009,8,40000ms,20000ms,Mob013-3::On1009 +013-3.gat,65,39,7,4|monster|RedSlime|1008,8,40000ms,20000ms,Mob013-3::On1008 +013-3.gat,62,33,2,1|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024 +013-3.gat,80,33,2,1|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023 +013-3.gat,75,46,2,1|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024 +013-3.gat,67,46,2,1|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023 -013-3.gat,0,0,0|script|Mob013-3|-1, +013-3.gat,0,0,0|script|Mob013-3|-1 { end; diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt index 40c2600c..bf6621e1 100644 --- a/world/map/npc/013-3/barrier.txt +++ b/world/map/npc/013-3/barrier.txt @@ -1,6 +1,6 @@ // -013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|45,1,1, +013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|45,1,1 { callfunc "ClearVariables"; diff --git a/world/map/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt index 87b90878..44d7956b 100644 --- a/world/map/npc/013-3/mask_chest.txt +++ b/world/map/npc/013-3/mask_chest.txt @@ -1,6 +1,6 @@ // -013-3.gat,28,27,0|script|Chest#DemonMask|111, +013-3.gat,28,27,0|script|Chest#DemonMask|111 { callfunc "ClearVariables"; diff --git a/world/map/npc/013-3/misc.txt b/world/map/npc/013-3/misc.txt index 60324fff..5a23b850 100644 --- a/world/map/npc/013-3/misc.txt +++ b/world/map/npc/013-3/misc.txt @@ -1,6 +1,6 @@ // -013-3.gat,127,68,0|script|Chest#boring|111, +013-3.gat,127,68,0|script|Chest#boring|111 { mes "You can't see any way to open this chest."; close; diff --git a/world/map/npc/013-3/sword_chest.txt b/world/map/npc/013-3/sword_chest.txt index 14aaffec..bbcd4fb9 100644 --- a/world/map/npc/013-3/sword_chest.txt +++ b/world/map/npc/013-3/sword_chest.txt @@ -1,6 +1,6 @@ // -013-3.gat,177,22,0|script|Chest#sword|111, +013-3.gat,177,22,0|script|Chest#sword|111 { callfunc "ClearVariables"; if (FLAGS & FLAG_HURNSMINE_CHEST) goto L_Finished; diff --git a/world/map/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt index 49e12433..709ab5fd 100644 --- a/world/map/npc/014-1/_mobs.txt +++ b/world/map/npc/014-1/_mobs.txt @@ -1,25 +1,25 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland mobs -014-1.gat,0,0,0,0|monster|EvilMushroom|1013,20,0,0,Mob014-1::On1013 -014-1.gat,0,0,0,0|monster|PinkFlower|1014,25,0,0,Mob014-1::On1014 -014-1.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0,0,Mob014-1::On1019 -014-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob014-1::On1028 -014-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270,180,Mob014-1::On1029 -014-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000,1800000,Mob014-1::On1029 -014-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270,180,Mob014-1::On1030 -014-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000,1800000,Mob014-1::On1030 -014-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270,180,Mob014-1::On1031 -014-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000,1800000,Mob014-1::On1031 -014-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270,180,Mob014-1::On1032 -014-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000,1800000,Mob014-1::On1032 -014-1.gat,0,0,0,0|monster|Silkworm|1035,4,6000,3000,Mob014-1::On1035 -014-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob014-1::On1037 -014-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob014-1::On1038 -014-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob014-1::On1055 +014-1.gat,0,0,0,0|monster|EvilMushroom|1013,20,0ms,0ms,Mob014-1::On1013 +014-1.gat,0,0,0,0|monster|PinkFlower|1014,25,0ms,0ms,Mob014-1::On1014 +014-1.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0ms,0ms,Mob014-1::On1019 +014-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob014-1::On1028 +014-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob014-1::On1029 +014-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000ms,1800000ms,Mob014-1::On1029 +014-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob014-1::On1030 +014-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob014-1::On1030 +014-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob014-1::On1031 +014-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob014-1::On1031 +014-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob014-1::On1032 +014-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob014-1::On1032 +014-1.gat,0,0,0,0|monster|Silkworm|1035,4,6000ms,3000ms,Mob014-1::On1035 +014-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob014-1::On1037 +014-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob014-1::On1038 +014-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob014-1::On1055 -014-1.gat,0,0,0|script|Mob014-1|-1, +014-1.gat,0,0,0|script|Mob014-1|-1 { end; diff --git a/world/map/npc/014-1/wedding-officiator.txt b/world/map/npc/014-1/wedding-officiator.txt index 2c22e0be..273f3025 100644 --- a/world/map/npc/014-1/wedding-officiator.txt +++ b/world/map/npc/014-1/wedding-officiator.txt @@ -1,6 +1,6 @@ // Wedding officiator: Marriages and divorces -014-1.gat,31,31,0|script|Wedding Officiator|164, +014-1.gat,31,31,0|script|Wedding Officiator|164 { mes "[Wedding Officiator]"; mes "A young lady in a long, green dress is overseeing the park. As she notices you looking at her, she gives you a broad and happy smile."; diff --git a/world/map/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt index 2da1744f..f170658e 100644 --- a/world/map/npc/014-3/_mobs.txt +++ b/world/map/npc/014-3/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Cave mobs -014-3.gat,0,0,0,0|monster|Bat|1017,50,0,0,Mob014-3::On1017 +014-3.gat,0,0,0,0|monster|Bat|1017,50,0ms,0ms,Mob014-3::On1017 -014-3.gat,0,0,0|script|Mob014-3|-1, +014-3.gat,0,0,0|script|Mob014-3|-1 { end; diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt index 1fa54f0c..2346adc2 100644 --- a/world/map/npc/015-1/_mobs.txt +++ b/world/map/npc/015-1/_mobs.txt @@ -1,19 +1,19 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland mobs -015-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000,1000,Mob015-1::On1037 -015-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob015-1::On1055 -015-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob015-1::On1038 -015-1.gat,0,0,0,0|monster|LogHead|1025,40,0,0,Mob015-1::On1025 -015-1.gat,0,0,0,0|monster|SpikyMushroom|1019,20,0,0,Mob015-1::On1019 -015-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0,0,Mob015-1::On1014 -015-1.gat,0,0,0,0|monster|GambogePlant|1031,5,0,0,Mob015-1::On1031 -015-1.gat,0,0,0,0|monster|AlizarinPlant|1032,5,0,0,Mob015-1::On1032 -015-1.gat,0,0,0,0|monster|Silkworm|1035,7,15000,7000,Mob015-1::On1035 -015-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000,180000,Mob015-1::On1029 +015-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000ms,1000ms,Mob015-1::On1037 +015-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob015-1::On1055 +015-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob015-1::On1038 +015-1.gat,0,0,0,0|monster|LogHead|1025,40,0ms,0ms,Mob015-1::On1025 +015-1.gat,0,0,0,0|monster|SpikyMushroom|1019,20,0ms,0ms,Mob015-1::On1019 +015-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob015-1::On1014 +015-1.gat,0,0,0,0|monster|GambogePlant|1031,5,0ms,0ms,Mob015-1::On1031 +015-1.gat,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms,Mob015-1::On1032 +015-1.gat,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms,Mob015-1::On1035 +015-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob015-1::On1029 -015-1.gat,0,0,0|script|Mob015-1|-1, +015-1.gat,0,0,0|script|Mob015-1|-1 { end; diff --git a/world/map/npc/015-1/alice.txt b/world/map/npc/015-1/alice.txt index 8b7255b1..4b1d0a9a 100644 --- a/world/map/npc/015-1/alice.txt +++ b/world/map/npc/015-1/alice.txt @@ -1,7 +1,7 @@ // A herb collector giving the players some hints about finding and brewing // herbs. -015-1.gat,52,53,0|script|Alice|106, +015-1.gat,52,53,0|script|Alice|106 { set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); diff --git a/world/map/npc/015-1/barrier.txt b/world/map/npc/015-1/barrier.txt index 6b451f42..dacad6e7 100644 --- a/world/map/npc/015-1/barrier.txt +++ b/world/map/npc/015-1/barrier.txt @@ -1,7 +1,7 @@ // This barrier is for checking whether the player went outside after // progressing with the cat quest. -015-1.gat,59,32,0|script|#CatOutsideBarrier|127,1,1, +015-1.gat,59,32,0|script|#CatOutsideBarrier|127,1,1 { set @catNeedsAlone, 0; end; diff --git a/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt index 98d5f843..199066f2 100644 --- a/world/map/npc/015-1/sword.txt +++ b/world/map/npc/015-1/sword.txt @@ -1,4 +1,4 @@ -015-1.gat,97,97,0|script|#MagicSword#_M|400, +015-1.gat,97,97,0|script|#MagicSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt index ba763804..9c1e23ba 100644 --- a/world/map/npc/015-3/_mobs.txt +++ b/world/map/npc/015-3/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Cat's Cave mobs -015-3.gat,22,25,2,4|monster|Bat|1017,2,100000,30000,Mob015-3::On1017 -015-3.gat,29,31,2,2|monster|Maggot|1002,2,100000,30000,Mob015-3::On1002 -015-3.gat,23,19,1,1|monster|Maggot|1002,1,100000,30000,Mob015-3::On1002 -015-3.gat,40,19,1,1|monster|Spider|1012,1,100000,30000,Mob015-3::On1012 +015-3.gat,22,25,2,4|monster|Bat|1017,2,100000ms,30000ms,Mob015-3::On1017 +015-3.gat,29,31,2,2|monster|Maggot|1002,2,100000ms,30000ms,Mob015-3::On1002 +015-3.gat,23,19,1,1|monster|Maggot|1002,1,100000ms,30000ms,Mob015-3::On1002 +015-3.gat,40,19,1,1|monster|Spider|1012,1,100000ms,30000ms,Mob015-3::On1012 -015-3.gat,0,0,0|script|Mob015-3|-1, +015-3.gat,0,0,0|script|Mob015-3|-1 { end; diff --git a/world/map/npc/015-3/barrier.txt b/world/map/npc/015-3/barrier.txt index a1393304..7e34aeee 100644 --- a/world/map/npc/015-3/barrier.txt +++ b/world/map/npc/015-3/barrier.txt @@ -1,7 +1,7 @@ // You can only enter the cat cave naked, otherwise the cat's reaction scares // you away. You can also get in while wearing the cat ears. -015-3.gat,31,42,0|script|#CatCaveBarrier|45,1,1, +015-3.gat,31,42,0|script|#CatCaveBarrier|45,1,1 { set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); if (getequipid(equip_head) != 1217 diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt index 45a6349a..cbf48d22 100644 --- a/world/map/npc/015-3/katze.txt +++ b/world/map/npc/015-3/katze.txt @@ -16,7 +16,7 @@ // * 2 Hard spikes // * 2 Tiny potions -015-3.gat,32,25,0|script|Katze|172, +015-3.gat,32,25,0|script|Katze|172 { set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt index 786f0b3b..9c6ccc8f 100644 --- a/world/map/npc/015-3/pot.txt +++ b/world/map/npc/015-3/pot.txt @@ -1,6 +1,6 @@ // The pot where the player can deposit stuff for the cat. -015-3.gat,37,29,0|script|Pot|400, +015-3.gat,37,29,0|script|Pot|400 { set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt index 9fd9e68c..781e2392 100644 --- a/world/map/npc/016-1/_mobs.txt +++ b/world/map/npc/016-1/_mobs.txt @@ -1,19 +1,19 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland mobs -016-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000,30000,Mob016-1::On1037 -016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob016-1::On1055 -016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob016-1::On1038 -016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob016-1::On1028 -016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0,0,Mob016-1::On1003 -016-1.gat,0,0,0,0|monster|MauvePlant|1029,3,0,0,Mob016-1::On1029 -016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000,180000,Mob016-1::On1029 -016-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0,0,Mob016-1::On1030 -016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000,180000,Mob016-1::On1029 -016-1.gat,0,0,0,0|monster|Silkworm|1035,7,150000,7000,Mob016-1::On1035 - - -016-1.gat,0,0,0|script|Mob016-1|-1, +016-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000ms,30000ms,Mob016-1::On1037 +016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob016-1::On1055 +016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob016-1::On1038 +016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob016-1::On1028 +016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0ms,0ms,Mob016-1::On1003 +016-1.gat,0,0,0,0|monster|MauvePlant|1029,3,0ms,0ms,Mob016-1::On1029 +016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029 +016-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob016-1::On1030 +016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029 +016-1.gat,0,0,0,0|monster|Silkworm|1035,7,150000ms,7000ms,Mob016-1::On1035 + + +016-1.gat,0,0,0|script|Mob016-1|-1 { end; diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt index 828acff3..e27b61db 100644 --- a/world/map/npc/016-1/gwendolyn.txt +++ b/world/map/npc/016-1/gwendolyn.txt @@ -21,7 +21,7 @@ // 5, state5: you are ready to do the targeting minigame // 6, state6: you did the minigame -016-1.gat,33,45,0|script|Gwendolyn|182, +016-1.gat,33,45,0|script|Gwendolyn|182 { // schoolfee in gp set @SCHOOLFEE, 25000; @@ -548,9 +548,7 @@ L_Close: close; S_Update_Var: - set QUEST_Forestbow_state, - (QUEST_Forestbow_state & ~(@Q_hawkseye_MASK) - | (@Q_hawkseye << @Q_hawkseye_SHIFT)); + set QUEST_Forestbow_state, (QUEST_Forestbow_state & ~(@Q_hawkseye_MASK) | (@Q_hawkseye << @Q_hawkseye_SHIFT)); return; S_getDirection: diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt index 23605651..4be9ea91 100644 --- a/world/map/npc/017-1/_mobs.txt +++ b/world/map/npc/017-1/_mobs.txt @@ -1,27 +1,27 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Hills mobs -017-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob017-1::On1037 -017-1.gat,99,30,2,1|monster|CloverPatch|1037,1,150000,50000,Mob017-1::On1037 -017-1.gat,29,29,19,12|monster|GambogePlant|1031,1,0,25000,Mob017-1::On1031 -017-1.gat,91,25,76,8|monster|LogHead|1025,3,5000,60000,Mob017-1::On1025 -017-1.gat,31,48,19,12|monster|LogHead|1025,3,5000,60000,Mob017-1::On1025 -017-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob017-1::On1055 -017-1.gat,0,0,0,0|monster|Bat|1017,5,0,0,Mob017-1::On1017 -017-1.gat,0,0,0,0|monster|FireGoblin|1011,5,0,0,Mob017-1::On1011 -017-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob017-1::On1028 -017-1.gat,0,0,0,0|monster|PinkFlower|1014,5,0,0,Mob017-1::On1014 -017-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0,0,Mob017-1::On1019 -017-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,0,0,Mob017-1::On1013 -017-1.gat,0,0,0,0|monster|AlizarinPlant|1032,3,0,0,Mob017-1::On1032 -017-1.gat,0,0,0,0|monster|GambogePlant|1031,3,0,0,Mob017-1::On1031 -017-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0,0,Mob017-1::On1030 -017-1.gat,0,0,0,0|monster|MauvePlant|1029,5,0,0,Mob017-1::On1029 -017-1.gat,0,0,0,0|monster|Silkworm|1035,10,0,0,Mob017-1::On1035 -017-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob017-1::On1038 - - -017-1.gat,0,0,0|script|Mob017-1|-1, +017-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob017-1::On1037 +017-1.gat,99,30,2,1|monster|CloverPatch|1037,1,150000ms,50000ms,Mob017-1::On1037 +017-1.gat,29,29,19,12|monster|GambogePlant|1031,1,0ms,25000ms,Mob017-1::On1031 +017-1.gat,91,25,76,8|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025 +017-1.gat,31,48,19,12|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025 +017-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob017-1::On1055 +017-1.gat,0,0,0,0|monster|Bat|1017,5,0ms,0ms,Mob017-1::On1017 +017-1.gat,0,0,0,0|monster|FireGoblin|1011,5,0ms,0ms,Mob017-1::On1011 +017-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob017-1::On1028 +017-1.gat,0,0,0,0|monster|PinkFlower|1014,5,0ms,0ms,Mob017-1::On1014 +017-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob017-1::On1019 +017-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,0ms,0ms,Mob017-1::On1013 +017-1.gat,0,0,0,0|monster|AlizarinPlant|1032,3,0ms,0ms,Mob017-1::On1032 +017-1.gat,0,0,0,0|monster|GambogePlant|1031,3,0ms,0ms,Mob017-1::On1031 +017-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob017-1::On1030 +017-1.gat,0,0,0,0|monster|MauvePlant|1029,5,0ms,0ms,Mob017-1::On1029 +017-1.gat,0,0,0,0|monster|Silkworm|1035,10,0ms,0ms,Mob017-1::On1035 +017-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob017-1::On1038 + + +017-1.gat,0,0,0|script|Mob017-1|-1 { end; diff --git a/world/map/npc/017-1/flowerpentagram1.txt b/world/map/npc/017-1/flowerpentagram1.txt index 77af8b45..e925445c 100644 --- a/world/map/npc/017-1/flowerpentagram1.txt +++ b/world/map/npc/017-1/flowerpentagram1.txt @@ -1,6 +1,6 @@ // Author: Jenalya -017-1.gat,95,42,0|script|#FlowerPentagram1|400, +017-1.gat,95,42,0|script|#FlowerPentagram1|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; diff --git a/world/map/npc/017-2/_mobs.txt b/world/map/npc/017-2/_mobs.txt index 1fa5a2ef..a7734e3f 100644 --- a/world/map/npc/017-2/_mobs.txt +++ b/world/map/npc/017-2/_mobs.txt @@ -3,7 +3,7 @@ -017-2.gat,0,0,0|script|Mob017-2|-1, +017-2.gat,0,0,0|script|Mob017-2|-1 { end; } diff --git a/world/map/npc/017-3/_mobs.txt b/world/map/npc/017-3/_mobs.txt index c1312235..903e6565 100644 --- a/world/map/npc/017-3/_mobs.txt +++ b/world/map/npc/017-3/_mobs.txt @@ -3,7 +3,7 @@ -017-3.gat,0,0,0|script|Mob017-3|-1, +017-3.gat,0,0,0|script|Mob017-3|-1 { end; } diff --git a/world/map/npc/017-4/_mobs.txt b/world/map/npc/017-4/_mobs.txt index e6678f62..0a7d5d29 100644 --- a/world/map/npc/017-4/_mobs.txt +++ b/world/map/npc/017-4/_mobs.txt @@ -3,7 +3,7 @@ -017-4.gat,0,0,0|script|Mob017-4|-1, +017-4.gat,0,0,0|script|Mob017-4|-1 { end; } diff --git a/world/map/npc/017-4/orum.txt b/world/map/npc/017-4/orum.txt index 5f6ce8a3..b13f415d 100644 --- a/world/map/npc/017-4/orum.txt +++ b/world/map/npc/017-4/orum.txt @@ -20,7 +20,7 @@ // 31: Placed fifth flower // 32: Got reward -017-4.gat,211,32,0|script|Orum|158, +017-4.gat,211,32,0|script|Orum|158 { // first flower set @AMOUNT_SMALLMUSHROOM, 5; diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt index 4c2e9710..917c93db 100644 --- a/world/map/npc/017-4/waric.txt +++ b/world/map/npc/017-4/waric.txt @@ -19,7 +19,7 @@ // OrumQuest State 41 - Learned Summon snake // When extending these Quest Variable to 51 all of the other dark magic spells will be available. Keep this in mind. -017-4.gat,216,36,0|script|Waric|153, +017-4.gat,216,36,0|script|Waric|153 { set @mouboo_status, ((QUEST_MAGIC & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) & 3; set @killed_mouboo, 0; @@ -383,7 +383,7 @@ L_Close: close; } -017-1.gat,74,32,0|script|DebugFlowerP|153, +017-1.gat,74,32,0|script|DebugFlowerP|153 { mes "Debug options for Orum's quest:"; menu diff --git a/world/map/npc/017-9/_mobs.txt b/world/map/npc/017-9/_mobs.txt index b43738be..fb3f894e 100644 --- a/world/map/npc/017-9/_mobs.txt +++ b/world/map/npc/017-9/_mobs.txt @@ -3,7 +3,7 @@ -017-9.gat,0,0,0|script|Mob017-9|-1, +017-9.gat,0,0,0|script|Mob017-9|-1 { end; } diff --git a/world/map/npc/017-9/announcements.txt b/world/map/npc/017-9/announcements.txt index 585fbc28..f9e24e52 100644 --- a/world/map/npc/017-9/announcements.txt +++ b/world/map/npc/017-9/announcements.txt @@ -13,7 +13,7 @@ // $@GMSA_TICK: broadcast the message every $@GMSA_TICK hours // $@GMSA_CURRENT_TICK: internal counter incremented every hour -017-9.gat,26,24,0|script|Stone Board|145, +017-9.gat,26,24,0|script|Stone Board|145 { if (getgmlevel() < 60) goto L_Close; diff --git a/world/map/npc/017-9/secret.txt b/world/map/npc/017-9/secret.txt index 43e485c7..050773a6 100644 --- a/world/map/npc/017-9/secret.txt +++ b/world/map/npc/017-9/secret.txt @@ -1,4 +1,4 @@ -009-1.gat,42,43,0|script|#SecretDoor|127,0,0, +009-1.gat,42,43,0|script|#SecretDoor|127,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; warp "017-9.gat", 26, 25; @@ -8,7 +8,7 @@ L_close: close; } -020-1.gat,60,76,0|script|#SecretDoor2|127,0,0, +020-1.gat,60,76,0|script|#SecretDoor2|127,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; warp "017-9.gat", 22, 22; @@ -18,7 +18,7 @@ L_close: close; } -001-1.gat,32,65,0|script|#SecretDoor3|127,0,0, +001-1.gat,32,65,0|script|#SecretDoor3|127,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; warp "017-9.gat", 30, 22; @@ -28,7 +28,7 @@ L_close: close; } -027-2.gat,118,111,0|script|#SecretDoor4|127,0,0, +027-2.gat,118,111,0|script|#SecretDoor4|127,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; warp "017-9.gat", 30, 29; diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt index 7847511d..d2aa5d7d 100644 --- a/world/map/npc/018-1/_mobs.txt +++ b/world/map/npc/018-1/_mobs.txt @@ -1,35 +1,35 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Mining Camp mobs -018-1.gat,136,79,9,41|monster|SeaSlime|1033,10,100000,30000,Mob018-1::On1033 -018-1.gat,108,87,53,25|monster|LogHead|1025,10,100000,30000,Mob018-1::On1025 -018-1.gat,116,44,6,7|monster|SeaSlime|1033,3,100000,30000,Mob018-1::On1033 -018-1.gat,119,56,13,6|monster|PinkFlower|1014,2,100000,30000,Mob018-1::On1014 -018-1.gat,175,28,17,19|monster|JackO|1022,1,180000,120000,Mob018-1::On1022 -018-1.gat,78,59,3,1|monster|YellowSlime|1007,1,100000,30000,Mob018-1::On1007 -018-1.gat,57,63,14,7|monster|Silkworm|1035,2,100000,30000,Mob018-1::On1035 -018-1.gat,43,63,31,28|monster|Bat|1017,10,100000,30000,Mob018-1::On1017 -018-1.gat,134,39,18,10|monster|GrassSnake|1034,4,100000,50000,Mob018-1::On1034 -018-1.gat,124,42,9,11|monster|GrassSnake|1034,2,100000,50000,Mob018-1::On1034 -018-1.gat,124,19,22,9|monster|GrassSnake|1034,3,100000,50000,Mob018-1::On1034 -018-1.gat,122,29,19,9|monster|GrassSnake|1034,2,100000,50000,Mob018-1::On1034 -018-1.gat,149,45,10,8|monster|Bat|1017,5,100000,30000,Mob018-1::On1017 -018-1.gat,169,47,20,10|monster|RedSlime|1008,4,120000,30000,Mob018-1::On1008 -018-1.gat,136,49,13,8|monster|Bat|1017,4,100000,30000,Mob018-1::On1017 -018-1.gat,166,49,13,9|monster|CloverPatch|1037,1,100000,30000,Mob018-1::On1037 -018-1.gat,111,62,5,2|monster|Silkworm|1035,1,60000,30000,Mob018-1::On1035 -018-1.gat,117,50,4,3|monster|SeaSlime|1033,1,120000,60000,Mob018-1::On1033 -018-1.gat,96,47,18,11|monster|RedSlime|1008,3,100000,50000,Mob018-1::On1008 -018-1.gat,106,52,15,6|monster|CobaltPlant|1030,1,240000,120000,Mob018-1::On1030 -018-1.gat,78,55,37,6|monster|RedSlime|1008,7,100000,50000,Mob018-1::On1008 -018-1.gat,145,24,10,9|monster|RedSlime|1008,3,100000,50000,Mob018-1::On1008 -018-1.gat,68,89,14,17|monster|Bat|1017,3,100000,50000,Mob018-1::On1017 -018-1.gat,160,31,11,18|monster|RedSlime|1008,5,100000,50000,Mob018-1::On1008 -018-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob018-1::On1037 -018-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob018-1::On1055 +018-1.gat,136,79,9,41|monster|SeaSlime|1033,10,100000ms,30000ms,Mob018-1::On1033 +018-1.gat,108,87,53,25|monster|LogHead|1025,10,100000ms,30000ms,Mob018-1::On1025 +018-1.gat,116,44,6,7|monster|SeaSlime|1033,3,100000ms,30000ms,Mob018-1::On1033 +018-1.gat,119,56,13,6|monster|PinkFlower|1014,2,100000ms,30000ms,Mob018-1::On1014 +018-1.gat,175,28,17,19|monster|JackO|1022,1,180000ms,120000ms,Mob018-1::On1022 +018-1.gat,78,59,3,1|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-1::On1007 +018-1.gat,57,63,14,7|monster|Silkworm|1035,2,100000ms,30000ms,Mob018-1::On1035 +018-1.gat,43,63,31,28|monster|Bat|1017,10,100000ms,30000ms,Mob018-1::On1017 +018-1.gat,134,39,18,10|monster|GrassSnake|1034,4,100000ms,50000ms,Mob018-1::On1034 +018-1.gat,124,42,9,11|monster|GrassSnake|1034,2,100000ms,50000ms,Mob018-1::On1034 +018-1.gat,124,19,22,9|monster|GrassSnake|1034,3,100000ms,50000ms,Mob018-1::On1034 +018-1.gat,122,29,19,9|monster|GrassSnake|1034,2,100000ms,50000ms,Mob018-1::On1034 +018-1.gat,149,45,10,8|monster|Bat|1017,5,100000ms,30000ms,Mob018-1::On1017 +018-1.gat,169,47,20,10|monster|RedSlime|1008,4,120000ms,30000ms,Mob018-1::On1008 +018-1.gat,136,49,13,8|monster|Bat|1017,4,100000ms,30000ms,Mob018-1::On1017 +018-1.gat,166,49,13,9|monster|CloverPatch|1037,1,100000ms,30000ms,Mob018-1::On1037 +018-1.gat,111,62,5,2|monster|Silkworm|1035,1,60000ms,30000ms,Mob018-1::On1035 +018-1.gat,117,50,4,3|monster|SeaSlime|1033,1,120000ms,60000ms,Mob018-1::On1033 +018-1.gat,96,47,18,11|monster|RedSlime|1008,3,100000ms,50000ms,Mob018-1::On1008 +018-1.gat,106,52,15,6|monster|CobaltPlant|1030,1,240000ms,120000ms,Mob018-1::On1030 +018-1.gat,78,55,37,6|monster|RedSlime|1008,7,100000ms,50000ms,Mob018-1::On1008 +018-1.gat,145,24,10,9|monster|RedSlime|1008,3,100000ms,50000ms,Mob018-1::On1008 +018-1.gat,68,89,14,17|monster|Bat|1017,3,100000ms,50000ms,Mob018-1::On1017 +018-1.gat,160,31,11,18|monster|RedSlime|1008,5,100000ms,50000ms,Mob018-1::On1008 +018-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob018-1::On1037 +018-1.gat,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob018-1::On1055 -018-1.gat,0,0,0|script|Mob018-1|-1, +018-1.gat,0,0,0|script|Mob018-1|-1 { end; diff --git a/world/map/npc/018-1/flowerpentagram3.txt b/world/map/npc/018-1/flowerpentagram3.txt index c83e72e2..08d72e79 100644 --- a/world/map/npc/018-1/flowerpentagram3.txt +++ b/world/map/npc/018-1/flowerpentagram3.txt @@ -1,6 +1,6 @@ // Author: Jenalya -018-1.gat,83,29,0|script|#FlowerPentagram3|400, +018-1.gat,83,29,0|script|#FlowerPentagram3|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; diff --git a/world/map/npc/018-1/mike.txt b/world/map/npc/018-1/mike.txt index e4c475f8..0ee02342 100644 --- a/world/map/npc/018-1/mike.txt +++ b/world/map/npc/018-1/mike.txt @@ -1,4 +1,4 @@ -018-1.gat,77,60,0|script|Mike|113, +018-1.gat,77,60,0|script|Mike|113 { mes "[Mike]"; mes "\"I need black stingers to make some medicine to cure my sister.\""; diff --git a/world/map/npc/018-1/miners.txt b/world/map/npc/018-1/miners.txt index c20a7ed6..f7837f0c 100644 --- a/world/map/npc/018-1/miners.txt +++ b/world/map/npc/018-1/miners.txt @@ -1,5 +1,5 @@ // -018-1.gat,80,61,0|script|Miner|109, +018-1.gat,80,61,0|script|Miner|109 { mes "[Miner]"; mes "\"Be careful in there.\""; diff --git a/world/map/npc/018-1/sword.txt b/world/map/npc/018-1/sword.txt index 271fc39d..58ad8ed2 100644 --- a/world/map/npc/018-1/sword.txt +++ b/world/map/npc/018-1/sword.txt @@ -1,4 +1,4 @@ -018-1.gat,110,43,0|script|#IceSword#_M|400, +018-1.gat,110,43,0|script|#IceSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt index 28aff946..31f0cc9a 100644 --- a/world/map/npc/018-2/_mobs.txt +++ b/world/map/npc/018-2/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Mining Camp Indoor mobs -018-2.gat,114,21,4,3|monster|YellowSlime|1007,1,100000,30000,Mob018-2::On1007 +018-2.gat,114,21,4,3|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-2::On1007 -018-2.gat,0,0,0|script|Mob018-2|-1, +018-2.gat,0,0,0|script|Mob018-2|-1 { end; diff --git a/world/map/npc/018-2/angus.txt b/world/map/npc/018-2/angus.txt index 0bf7430c..6c9a76ed 100644 --- a/world/map/npc/018-2/angus.txt +++ b/world/map/npc/018-2/angus.txt @@ -1,6 +1,6 @@ // Angus the craftsman -018-2.gat,31,39,0|script|Angus|147, +018-2.gat,31,39,0|script|Angus|147 { set @honorific$, "lad"; if (Sex == 0) set @honorific$, "lass"; diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt index 0633c505..eeae9b37 100644 --- a/world/map/npc/018-2/caul.txt +++ b/world/map/npc/018-2/caul.txt @@ -7,7 +7,7 @@ //# //################################################################################# -018-2.gat,37,22,0|script|Caul|107, +018-2.gat,37,22,0|script|Caul|107 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-2/miners.txt b/world/map/npc/018-2/miners.txt index 59e97297..26662238 100644 --- a/world/map/npc/018-2/miners.txt +++ b/world/map/npc/018-2/miners.txt @@ -1,7 +1,7 @@ // This NPC makes gem powders out of gemstones // Authors: Ali-G, enchilado, Jenalya -018-2.gat,85,23,0|script|Malek|109, +018-2.gat,85,23,0|script|Malek|109 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt index be7d6bb9..b85ff2c1 100644 --- a/world/map/npc/018-2/receptionist.txt +++ b/world/map/npc/018-2/receptionist.txt @@ -1,6 +1,6 @@ // -018-2.gat,50,24,0|script|Receptionist#mine|108, +018-2.gat,50,24,0|script|Receptionist#mine|108 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt index 017b74bd..e80abda4 100644 --- a/world/map/npc/018-3/_mobs.txt +++ b/world/map/npc/018-3/_mobs.txt @@ -1,34 +1,34 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Northern Mines mobs -018-3.gat,48,29,57,19|monster|Bat|1017,10,100000,30000,Mob018-3::On1017 -018-3.gat,35,144,31,48|monster|EvilMushroom|1013,10,120000,30000,Mob018-3::On1013 -018-3.gat,35,65,28,22|monster|Spider|1012,20,100000,50000,Mob018-3::On1012 -018-3.gat,28,157,3,2|monster|PinkFlower|1014,1,60000,30000,Mob018-3::On1014 -018-3.gat,99,111,17,41|monster|YellowSlime|1007,10,90000,30000,Mob018-3::On1007 -018-3.gat,134,140,12,8|monster|Maggot|1002,3,80000,40000,Mob018-3::On1002 -018-3.gat,132,137,15,25|monster|Spider|1012,8,300000,120000,Mob018-3::On1012 -018-3.gat,102,172,131,13|monster|BlackScorpion|1009,20,60000,10000,Mob018-3::On1009 -018-3.gat,174,37,10,31|monster|YellowSlime|1007,5,180000,120000,Mob018-3::On1007 -018-3.gat,87,153,78,22|monster|Snake|1010,10,60000,10000,Mob018-3::On1010 -018-3.gat,148,148,13,24|monster|Bat|1017,3,180000,40000,Mob018-3::On1017 -018-3.gat,153,97,18,22|monster|YellowSlime|1007,6,80000,40000,Mob018-3::On1007 -018-3.gat,81,77,27,21|monster|RedSlime|1008,15,80000,40000,Mob018-3::On1008 -018-3.gat,111,80,5,6|monster|BlackScorpion|1009,10,80000,40000,Mob018-3::On1009 -018-3.gat,175,122,5,40|monster|Snake|1010,15,40000,20000,Mob018-3::On1010 -018-3.gat,98,75,1,2|monster|FireSkull|1023,1,120000,30000,Mob018-3::On1023 -018-3.gat,100,75,1,2|monster|PoisonSkull|1024,1,120000,30000,Mob018-3::On1024 -018-3.gat,171,95,15,19|monster|BlackScorpion|1009,5,60000,30000,Mob018-3::On1009 -018-3.gat,134,87,17,7|monster|RedSlime|1008,10,60000,30000,Mob018-3::On1008 -018-3.gat,59,95,11,8|monster|Spider|1012,15,60000,30000,Mob018-3::On1012 -018-3.gat,77,92,23,7|monster|BlackScorpion|1009,15,60000,30000,Mob018-3::On1009 -018-3.gat,94,55,16,8|monster|Snake|1010,5,60000,30000,Mob018-3::On1010 -018-3.gat,133,39,12,17|monster|Spider|1012,10,60000,30000,Mob018-3::On1012 -018-3.gat,111,33,30,16|monster|Snake|1010,15,60000,30000,Mob018-3::On1010 -018-3.gat,68,101,5,4|monster|Snake|1010,4,60000,30000,Mob018-3::On1010 +018-3.gat,48,29,57,19|monster|Bat|1017,10,100000ms,30000ms,Mob018-3::On1017 +018-3.gat,35,144,31,48|monster|EvilMushroom|1013,10,120000ms,30000ms,Mob018-3::On1013 +018-3.gat,35,65,28,22|monster|Spider|1012,20,100000ms,50000ms,Mob018-3::On1012 +018-3.gat,28,157,3,2|monster|PinkFlower|1014,1,60000ms,30000ms,Mob018-3::On1014 +018-3.gat,99,111,17,41|monster|YellowSlime|1007,10,90000ms,30000ms,Mob018-3::On1007 +018-3.gat,134,140,12,8|monster|Maggot|1002,3,80000ms,40000ms,Mob018-3::On1002 +018-3.gat,132,137,15,25|monster|Spider|1012,8,300000ms,120000ms,Mob018-3::On1012 +018-3.gat,102,172,131,13|monster|BlackScorpion|1009,20,60000ms,10000ms,Mob018-3::On1009 +018-3.gat,174,37,10,31|monster|YellowSlime|1007,5,180000ms,120000ms,Mob018-3::On1007 +018-3.gat,87,153,78,22|monster|Snake|1010,10,60000ms,10000ms,Mob018-3::On1010 +018-3.gat,148,148,13,24|monster|Bat|1017,3,180000ms,40000ms,Mob018-3::On1017 +018-3.gat,153,97,18,22|monster|YellowSlime|1007,6,80000ms,40000ms,Mob018-3::On1007 +018-3.gat,81,77,27,21|monster|RedSlime|1008,15,80000ms,40000ms,Mob018-3::On1008 +018-3.gat,111,80,5,6|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob018-3::On1009 +018-3.gat,175,122,5,40|monster|Snake|1010,15,40000ms,20000ms,Mob018-3::On1010 +018-3.gat,98,75,1,2|monster|FireSkull|1023,1,120000ms,30000ms,Mob018-3::On1023 +018-3.gat,100,75,1,2|monster|PoisonSkull|1024,1,120000ms,30000ms,Mob018-3::On1024 +018-3.gat,171,95,15,19|monster|BlackScorpion|1009,5,60000ms,30000ms,Mob018-3::On1009 +018-3.gat,134,87,17,7|monster|RedSlime|1008,10,60000ms,30000ms,Mob018-3::On1008 +018-3.gat,59,95,11,8|monster|Spider|1012,15,60000ms,30000ms,Mob018-3::On1012 +018-3.gat,77,92,23,7|monster|BlackScorpion|1009,15,60000ms,30000ms,Mob018-3::On1009 +018-3.gat,94,55,16,8|monster|Snake|1010,5,60000ms,30000ms,Mob018-3::On1010 +018-3.gat,133,39,12,17|monster|Spider|1012,10,60000ms,30000ms,Mob018-3::On1012 +018-3.gat,111,33,30,16|monster|Snake|1010,15,60000ms,30000ms,Mob018-3::On1010 +018-3.gat,68,101,5,4|monster|Snake|1010,4,60000ms,30000ms,Mob018-3::On1010 -018-3.gat,0,0,0|script|Mob018-3|-1, +018-3.gat,0,0,0|script|Mob018-3|-1 { end; diff --git a/world/map/npc/018-3/bookcase.txt b/world/map/npc/018-3/bookcase.txt index f30ff1da..50e2a40d 100644 --- a/world/map/npc/018-3/bookcase.txt +++ b/world/map/npc/018-3/bookcase.txt @@ -1,6 +1,6 @@ // -018-3.gat,75,123,0|script|#DemonMineBookcase1|400, +018-3.gat,75,123,0|script|#DemonMineBookcase1|400 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-3/evil-obelisk.txt b/world/map/npc/018-3/evil-obelisk.txt index 85f9ca20..b173e7f4 100644 --- a/world/map/npc/018-3/evil-obelisk.txt +++ b/world/map/npc/018-3/evil-obelisk.txt @@ -1,6 +1,6 @@ // -018-3.gat,67,28,0|script|Evil Obelisk|185, +018-3.gat,67,28,0|script|Evil Obelisk|185 { callfunc "ClearVariables"; set @map$, "018-3.gat"; diff --git a/world/map/npc/018-3/sword.txt b/world/map/npc/018-3/sword.txt index 8df51f67..bb5afa1d 100644 --- a/world/map/npc/018-3/sword.txt +++ b/world/map/npc/018-3/sword.txt @@ -1,4 +1,4 @@ -018-3.gat,71,127,0|script|#DemonSword#_M|400, +018-3.gat,71,127,0|script|#DemonSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt index 03c3aa2e..9adbdf8b 100644 --- a/world/map/npc/019-1/_mobs.txt +++ b/world/map/npc/019-1/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // snow Field mobs -019-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000,30000,Mob019-1::On1020 -019-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000,30000,Mob019-1::On1094 -019-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob019-1::On1095 -019-1.gat,0,0,0,0|monster|Santaboo|1112,4,100000,30000,Mob019-1::On1112 +019-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob019-1::On1020 +019-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000ms,30000ms,Mob019-1::On1094 +019-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob019-1::On1095 +019-1.gat,0,0,0,0|monster|Santaboo|1112,4,100000ms,30000ms,Mob019-1::On1112 -019-1.gat,0,0,0|script|Mob019-1|-1, +019-1.gat,0,0,0|script|Mob019-1|-1 { end; diff --git a/world/map/npc/019-1/santa_helper.txt b/world/map/npc/019-1/santa_helper.txt index 4e622fc7..7d4e864e 100644 --- a/world/map/npc/019-1/santa_helper.txt +++ b/world/map/npc/019-1/santa_helper.txt @@ -2,7 +2,7 @@ // and extended by wushin to be included in the annual // quest made seasonal and adapted to new scripting standards by Jenalya -019-1.gat,74,75,0|script|Santa's Helper|105, +019-1.gat,74,75,0|script|Santa's Helper|105 { callfunc "ClearVariables"; callfunc "XmasStates"; diff --git a/world/map/npc/019-1/snowman.txt b/world/map/npc/019-1/snowman.txt index 2beaff1d..c4b4a251 100644 --- a/world/map/npc/019-1/snowman.txt +++ b/world/map/npc/019-1/snowman.txt @@ -1,7 +1,7 @@ // Author: accoring to git history probably Jaxad // quest made seasonal and adapted to new scripting standards by Jenalya -019-1.gat,77,44,0|script|Snowman|129, +019-1.gat,77,44,0|script|Snowman|129 { callfunc "ClearVariables"; if (FLAGS & FLAG_SNOWMAN) goto L_Done; diff --git a/world/map/npc/019-3/_mobs.txt b/world/map/npc/019-3/_mobs.txt index a8d3c1d2..324d29e4 100644 --- a/world/map/npc/019-3/_mobs.txt +++ b/world/map/npc/019-3/_mobs.txt @@ -1,11 +1,11 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Snow Cave mobs -019-3.gat,0,4,0,0|monster|Moggun|1061,10,100000,30000,Mob019-3::On1061 -019-3.gat,0,4,0,0|monster|Bat|1017,50,100000,30000,Mob019-3::On1017 +019-3.gat,0,4,0,0|monster|Moggun|1061,10,100000ms,30000ms,Mob019-3::On1061 +019-3.gat,0,4,0,0|monster|Bat|1017,50,100000ms,30000ms,Mob019-3::On1017 -019-3.gat,0,0,0|script|Mob019-3|-1, +019-3.gat,0,0,0|script|Mob019-3|-1 { end; diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt index 2faee602..de8892bf 100644 --- a/world/map/npc/019-4/_mobs.txt +++ b/world/map/npc/019-4/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Deeper Snow Cave mobs -019-4.gat,0,0,0,0|monster|Moggun|1061,12,45000,30000,Mob019-4::On1061 -019-4.gat,47,67,15,9|monster|WhiteSlime|1093,5,45000,45000,Mob019-4::On1093 -019-4.gat,0,0,0,0|monster|Bat|1017,15,45000,25000,Mob019-4::On1017 -019-4.gat,0,0,0,0|monster|BlueSlime|1091,7,45000,30000,Mob019-4::On1091 +019-4.gat,0,0,0,0|monster|Moggun|1061,12,45000ms,30000ms,Mob019-4::On1061 +019-4.gat,47,67,15,9|monster|WhiteSlime|1093,5,45000ms,45000ms,Mob019-4::On1093 +019-4.gat,0,0,0,0|monster|Bat|1017,15,45000ms,25000ms,Mob019-4::On1017 +019-4.gat,0,0,0,0|monster|BlueSlime|1091,7,45000ms,30000ms,Mob019-4::On1091 -019-4.gat,0,0,0|script|Mob019-4|-1, +019-4.gat,0,0,0|script|Mob019-4|-1 { end; diff --git a/world/map/npc/020-1/KrickKrackKrock.txt b/world/map/npc/020-1/KrickKrackKrock.txt index 14a23bb9..cd0b7c3e 100644 --- a/world/map/npc/020-1/KrickKrackKrock.txt +++ b/world/map/npc/020-1/KrickKrackKrock.txt @@ -3,7 +3,7 @@ //To enable: sed 's_^// __' -i npc/020-1/KrickKrackKrock.txt -// 020-1.gat,82,82,0|script|Criker|192, +// 020-1.gat,82,82,0|script|Criker|192 // { // L_Main: // //Var diff --git a/world/map/npc/020-1/_mobs.txt b/world/map/npc/020-1/_mobs.txt index bdeafe1d..549ae3bf 100644 --- a/world/map/npc/020-1/_mobs.txt +++ b/world/map/npc/020-1/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Nivalis mobs -020-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000,30000,Mob020-1::On1095 +020-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob020-1::On1095 -020-1.gat,0,0,0|script|Mob020-1|-1, +020-1.gat,0,0,0|script|Mob020-1|-1 { end; diff --git a/world/map/npc/020-1/dock.txt b/world/map/npc/020-1/dock.txt index e0528e23..ce7807e8 100644 --- a/world/map/npc/020-1/dock.txt +++ b/world/map/npc/020-1/dock.txt @@ -1,5 +1,5 @@ // Ferry Sign -020-1.gat,81,76,0|script|Ferry Schedule#7|398, +020-1.gat,81,76,0|script|Ferry Schedule#7|398 { callfunc "FerryManifest"; end; diff --git a/world/map/npc/020-1/rockscissor.txt b/world/map/npc/020-1/rockscissor.txt index a4ca909e..1bfbf62c 100644 --- a/world/map/npc/020-1/rockscissor.txt +++ b/world/map/npc/020-1/rockscissor.txt @@ -11,7 +11,7 @@ //To enable: sed 's_^// __' -i npc/020-1/rockscissor.txt -// 020-1.gat,74,78,0|script|Gobmel|189, +// 020-1.gat,74,78,0|script|Gobmel|189 // { // //var // set @NPC_name$, "[Gobmel]"; @@ -20,7 +20,7 @@ // set @gamblerun, 0; // setarray @CHOOSE_PC$, "Scissors", "Paper", "Rock"; // setarray @CHOSE_ID, 0, 1, 2; -// //0 : scissors; 1: Paper; 2: Rock; +// //0:* scissors; 1: Paper; 2: Rock; // // 0 cut 1 and 1 cover 3 and break 0 ... // //var ends diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt index 6a53b8cd..5cd3c7e3 100644 --- a/world/map/npc/020-1/soul-menhir.txt +++ b/world/map/npc/020-1/soul-menhir.txt @@ -1,6 +1,6 @@ // -020-1.gat,63,89,0|script|Soul Menhir#nivalis|346, +020-1.gat,63,89,0|script|Soul Menhir#nivalis|346 { callfunc "ClearVariables"; set @map$, "020-1.gat"; diff --git a/world/map/npc/020-1/traveler.txt b/world/map/npc/020-1/traveler.txt index 95efd4cf..65bacdbc 100644 --- a/world/map/npc/020-1/traveler.txt +++ b/world/map/npc/020-1/traveler.txt @@ -1,4 +1,4 @@ -020-1.gat,57,123,0|script|Knox the Traveler|103, +020-1.gat,57,123,0|script|Knox the Traveler|103 { set @NpcName$, "Knox"; set @NpcTravelBit, $@nivalis_bit; diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt index 05db5265..9aa70d32 100644 --- a/world/map/npc/020-1/well.txt +++ b/world/map/npc/020-1/well.txt @@ -14,7 +14,7 @@ //# used variables: QUEST_Nivalis_state Nibble4 //############################################ -020-1.gat,99,83,0|script|#Well|400, +020-1.gat,99,83,0|script|#Well|400 { set @Q_MASK, NIBBLE_4_MASK; set @Q_SHIFT, NIBBLE_4_SHIFT; @@ -98,7 +98,7 @@ S_Update_Var: return; } -020-2.gat,100,28,0|script|Miler|100, +020-2.gat,100,28,0|script|Miler|100 { set @Q_MASK, NIBBLE_4_MASK; set @Q_SHIFT, NIBBLE_4_SHIFT; diff --git a/world/map/npc/020-2/_mobs.txt b/world/map/npc/020-2/_mobs.txt index 8d1af8c3..62928210 100644 --- a/world/map/npc/020-2/_mobs.txt +++ b/world/map/npc/020-2/_mobs.txt @@ -3,7 +3,7 @@ -020-2.gat,0,0,0|script|Mob020-2|-1, +020-2.gat,0,0,0|script|Mob020-2|-1 { end; } diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt index 33bae946..1c6e3202 100644 --- a/world/map/npc/020-2/baktar.txt +++ b/world/map/npc/020-2/baktar.txt @@ -31,7 +31,7 @@ //# bit 0 knows the name/location of the opponent //# bit 1 killed the ugly opponent //#========================= -020-2.gat,70,61,0|script|Baktar|191, +020-2.gat,70,61,0|script|Baktar|191 { set @npcname$, "[Baktar]"; diff --git a/world/map/npc/020-2/banker.txt b/world/map/npc/020-2/banker.txt index 7fb3b511..ac3b29df 100644 --- a/world/map/npc/020-2/banker.txt +++ b/world/map/npc/020-2/banker.txt @@ -1,4 +1,4 @@ -020-2.gat,122,64,0|script|Ben|193, +020-2.gat,122,64,0|script|Ben|193 { callfunc "ClearVariables"; set @npcname$, "Ben"; @@ -6,7 +6,7 @@ close; } -020-2.gat,127,63,0|script|Maria|190, +020-2.gat,127,63,0|script|Maria|190 { mes "[Maria]"; mes "\"Hello!"; diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt index 1fd7fa09..9e45b87e 100644 --- a/world/map/npc/020-2/furquest.txt +++ b/world/map/npc/020-2/furquest.txt @@ -3,7 +3,7 @@ //################################################################################# // Tulimshar Crafting Workshop - Agostine, The Legendary Tailor -020-2.gat,27,26,0|script|Agostine|137, +020-2.gat,27,26,0|script|Agostine|137 { set @CUTFUR_EXP, 10; set @FINEDRESS_COTTON_CLOTHS, 20; diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt index 08f2b531..1f43ebaa 100644 --- a/world/map/npc/020-2/shops.txt +++ b/world/map/npc/020-2/shops.txt @@ -1,7 +1,7 @@ // Snow town shops // About the Area NPC -020-2.gat,75,28,0|script|Taylor|137, +020-2.gat,75,28,0|script|Taylor|137 { mes "[Taylor]"; mes "\"While it can be dangerous up here in Kaizei, I take comfort that Nivalis is not surrounded by the Yeti like Thermin is. What a weird town.\""; @@ -14,12 +14,12 @@ close; } // Weapons shop -020-2.gat,25,65,0|shop|Bracco|135,IronArrow :-1,ShortBow :-1,Dagger :-1,LeatherShield :-1 +020-2.gat,25,65,0|shop|Bracco|135,IronArrow:*1,ShortBow:*1,Dagger:*1,LeatherShield:*1 // Potions shop -020-2.gat,75,24,0|shop|Mede|103,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1 +020-2.gat,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1 // INN -020-2.gat,111,23,0|script|Kane|120, +020-2.gat,111,23,0|script|Kane|120 { set @npcname$, "Kane the Inn Keeper"; set @cost, 100; diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt index 8ea16b7c..c84400ba 100644 --- a/world/map/npc/020-3/_mobs.txt +++ b/world/map/npc/020-3/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Ice cave mobs -020-3.gat,40,36,29,4|monster|Bat|1017,1,100000,30000,Mob020-3::On1017 -020-3.gat,40,49,34,7|monster|Pinkie|1018,1,100000,30000,Mob020-3::On1018 -020-3.gat,0,0,0,0|monster|Bat|1017,20,0,0,Mob020-3::On1017 -020-3.gat,0,0,0,0|monster|Pinkie|1018,10,0,0,Mob020-3::On1018 +020-3.gat,40,36,29,4|monster|Bat|1017,1,100000ms,30000ms,Mob020-3::On1017 +020-3.gat,40,49,34,7|monster|Pinkie|1018,1,100000ms,30000ms,Mob020-3::On1018 +020-3.gat,0,0,0,0|monster|Bat|1017,20,0ms,0ms,Mob020-3::On1017 +020-3.gat,0,0,0,0|monster|Pinkie|1018,10,0ms,0ms,Mob020-3::On1018 -020-3.gat,0,0,0|script|Mob020-3|-1, +020-3.gat,0,0,0|script|Mob020-3|-1 { end; diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt index 0ec59bf0..285a62e1 100644 --- a/world/map/npc/021-1/_mobs.txt +++ b/world/map/npc/021-1/_mobs.txt @@ -1,14 +1,14 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // North Tulimshar mobs -021-1.gat,126,86,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002 -021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002 -021-1.gat,95,124,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002 -021-1.gat,103,53,6,2|monster|Maggot|1002,5,100000,30000,Mob021-1::On1002 -021-1.gat,98,24,2,2|monster|SeaSlime|1033,1,150000,100000,Mob021-1::On1033 +021-1.gat,126,86,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002 +021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002 +021-1.gat,95,124,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002 +021-1.gat,103,53,6,2|monster|Maggot|1002,5,100000ms,30000ms,Mob021-1::On1002 +021-1.gat,98,24,2,2|monster|SeaSlime|1033,1,150000ms,100000ms,Mob021-1::On1033 -021-1.gat,0,0,0|script|Mob021-1|-1, +021-1.gat,0,0,0|script|Mob021-1|-1 { end; diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt index 46337613..2bb932da 100644 --- a/world/map/npc/021-1/bakery.txt +++ b/world/map/npc/021-1/bakery.txt @@ -1,8 +1,8 @@ // Outside the bakery -021-1.gat,103,103,0|shop|Ara|163,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,CherryCake :-1 +021-1.gat,103,103,0|shop|Ara|163,WhiteCake:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,CherryCake:*1 -021-1.gat,108,102,0|script|Itka|114, +021-1.gat,108,102,0|script|Itka|114 { mes "[Itka]"; mes "\"This bakery is the best!\""; 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/north_shops.txt b/world/map/npc/021-1/north_shops.txt index 81a05a20..db6dea50 100644 --- a/world/map/npc/021-1/north_shops.txt +++ b/world/map/npc/021-1/north_shops.txt @@ -3,16 +3,16 @@ // More high-end stuff to satisfy the richer people in Royal Tulimshar // Some clothing -021-1.gat,135,36,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,CottonHeadband :-1 +021-1.gat,135,36,0|shop|Inar|108,CottonShirt:*1,CottonShorts:*1,CottonBoots:*1,CottonHeadband:*1 -021-1.gat,129,40,0|script|Well|400, +021-1.gat,129,40,0|script|Well|400 { callfunc "WaterBottle"; end; } // An officer (for security) -021-1.gat,128,37,0|script|Officer|150, +021-1.gat,128,37,0|script|Officer|150 { mes "[Officer]"; mes "I'm here for extra security for this market."; 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/_mobs.txt b/world/map/npc/021-2/_mobs.txt index 5b7d3384..6feaf1ea 100644 --- a/world/map/npc/021-2/_mobs.txt +++ b/world/map/npc/021-2/_mobs.txt @@ -3,7 +3,7 @@ -021-2.gat,0,0,0|script|Mob021-2|-1, +021-2.gat,0,0,0|script|Mob021-2|-1 { end; } diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt index 9a494a7a..0dd303f1 100644 --- a/world/map/npc/021-2/bakery.txt +++ b/world/map/npc/021-2/bakery.txt @@ -1,7 +1,7 @@ // The bakery // The chef -021-2.gat,95,21,0|script|Riskim|148, +021-2.gat,95,21,0|script|Riskim|148 { mes "[Riskim]"; mes ""; @@ -120,7 +120,7 @@ L_End: } // Server -021-2.gat,82,23,0|script|Sara|108, +021-2.gat,82,23,0|script|Sara|108 { mes "[Sara]"; mes ""; @@ -129,10 +129,10 @@ L_End: } // The cashier -021-2.gat,89,21,0|shop|Drabur|112,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,Cake :-1,CherryCake :-1,OrangeCupcake :-3,Milk :-5,XmasCake :-1 +021-2.gat,89,21,0|shop|Drabur|112,WhiteCake:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,Cake:*1,CherryCake:*1,OrangeCupcake:*3,Milk:*5,XmasCake:*1 // Stockroom boy -021-2.gat,133,21,0|script|Iormo|160, +021-2.gat,133,21,0|script|Iormo|160 { mes "[Iormo]"; mes ""; @@ -141,7 +141,7 @@ L_End: } // An old couple eating at the bakery -021-2.gat,71,22,0|script|Rynoh|159, +021-2.gat,71,22,0|script|Rynoh|159 { mes "[Rynoh]"; mes ""; @@ -149,7 +149,7 @@ L_End: close; } -021-2.gat,73,22,0|script|Ontas|154, +021-2.gat,73,22,0|script|Ontas|154 { mes "[Ontas]"; mes ""; 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/forge_shops.txt b/world/map/npc/021-2/forge_shops.txt index 2ffa556b..608ce082 100644 --- a/world/map/npc/021-2/forge_shops.txt +++ b/world/map/npc/021-2/forge_shops.txt @@ -1,4 +1,4 @@ // Forge Shops -021-2.gat,77,134,0|shop|Gungnir|311,SlingShot :-1,SlingBullet :-1,ShortBow :-1,Arrow :1,IronArrow :3 -021-2.gat,71,133,0|shop|Mjolnir|377,Knife :-1,SharpKnife :-1,Dagger :-1,LeatherShirt :-2,LeatherShield :-2 +021-2.gat,77,134,0|shop|Gungnir|311,SlingShot:*1,SlingBullet:*1,ShortBow:*1,Arrow:*1,IronArrow:*3 +021-2.gat,71,133,0|shop|Mjolnir|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*2,LeatherShield:*2 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); diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt index 860dfe45..78b2ad47 100644 --- a/world/map/npc/021-3/_mobs.txt +++ b/world/map/npc/021-3/_mobs.txt @@ -1,17 +1,17 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Central Tulimshar Sewers mobs -021-3.gat,120,38,11,8|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056 -021-3.gat,103,58,8,3|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056 -021-3.gat,80,98,34,31|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056 -021-3.gat,129,82,8,3|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056 -021-3.gat,140,38,16,8|monster|AngryFireGoblin|1108,3,100000,30000,Mob021-3::On1108 -021-3.gat,79,98,33,31|monster|BlackScorpion|1009,4,100000,1800000,Mob021-3::On1009 -021-3.gat,52,53,2,17|monster|Snake|1010,2,40000,50000,Mob021-3::On1010 -021-3.gat,93,31,28,22|monster|SeaSlime|1033,6,100000,30000,Mob021-3::On1033 +021-3.gat,120,38,11,8|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056 +021-3.gat,103,58,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056 +021-3.gat,80,98,34,31|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056 +021-3.gat,129,82,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056 +021-3.gat,140,38,16,8|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob021-3::On1108 +021-3.gat,79,98,33,31|monster|BlackScorpion|1009,4,100000ms,1800000ms,Mob021-3::On1009 +021-3.gat,52,53,2,17|monster|Snake|1010,2,40000ms,50000ms,Mob021-3::On1010 +021-3.gat,93,31,28,22|monster|SeaSlime|1033,6,100000ms,30000ms,Mob021-3::On1033 -021-3.gat,0,0,0|script|Mob021-3|-1, +021-3.gat,0,0,0|script|Mob021-3|-1 { end; diff --git a/world/map/npc/022-1/_mobs.txt b/world/map/npc/022-1/_mobs.txt index ceea5fc7..51ade3ee 100644 --- a/world/map/npc/022-1/_mobs.txt +++ b/world/map/npc/022-1/_mobs.txt @@ -3,7 +3,7 @@ -022-1.gat,0,0,0|script|Mob022-1|-1, +022-1.gat,0,0,0|script|Mob022-1|-1 { end; } diff --git a/world/map/npc/022-1/adrian.txt b/world/map/npc/022-1/adrian.txt index 978c537e..7d76cf9d 100644 --- a/world/map/npc/022-1/adrian.txt +++ b/world/map/npc/022-1/adrian.txt @@ -5,7 +5,7 @@ // state 2: Adrian gave the luggage to the player // state 3: player gave luggage to Kylian and Kylian asks who to talk to for the shop license -022-1.gat,58,54,0|script|Adrian|213, +022-1.gat,58,54,0|script|Adrian|213 { set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); diff --git a/world/map/npc/022-1/anwar.txt b/world/map/npc/022-1/anwar.txt index 7c031d9c..5de4532e 100644 --- a/world/map/npc/022-1/anwar.txt +++ b/world/map/npc/022-1/anwar.txt @@ -16,7 +16,7 @@ // state 13: Anwar asked to bring present to Eomie // state 14: gave present to Eomie // state 15: reported back to Anwar and done -022-1.gat,41,46,0|script|Anwar|156, +022-1.gat,41,46,0|script|Anwar|156 { set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/022-1/dock.txt b/world/map/npc/022-1/dock.txt index ce8d2785..8da5b8aa 100644 --- a/world/map/npc/022-1/dock.txt +++ b/world/map/npc/022-1/dock.txt @@ -2,25 +2,25 @@ // Author: Wushin // Ferry Sign -022-1.gat,62,36,0|script|Ferry Schedule#2|396, +022-1.gat,62,36,0|script|Ferry Schedule#2|396 { callfunc "FerryManifest"; end; } -022-1.gat,65,71,0|script|Ferry Schedule#3|396, +022-1.gat,65,71,0|script|Ferry Schedule#3|396 { callfunc "FerryManifest"; end; } -022-1.gat,85,71,0|script|Tulimshar South Koga|395,6,2, +022-1.gat,85,71,0|script|Tulimshar South Koga|395,6,2 { callfunc "BoardFerry"; close; } -022-1.gat,80,62,0|script|#Tulimshar SouthDock|127, +022-1.gat,80,62,0|script|#Tulimshar SouthDock|127 { end; OnCommandArrive: @@ -32,13 +32,13 @@ OnCommandWarp: end; } -022-1.gat,60,24,0|script|Tulimshar North Koga|395,4,4, +022-1.gat,60,24,0|script|Tulimshar North Koga|395,4,4 { callfunc "BoardCandorFerry"; close; } -022-1.gat,65,25,0|script|#Tulimshar NorthDock|127, +022-1.gat,65,25,0|script|#Tulimshar NorthDock|127 { end; OnCommandArrive: diff --git a/world/map/npc/022-1/ferry_master.txt b/world/map/npc/022-1/ferry_master.txt index 5c78dc77..d9594bcd 100644 --- a/world/map/npc/022-1/ferry_master.txt +++ b/world/map/npc/022-1/ferry_master.txt @@ -1,6 +1,6 @@ // -022-1.gat,71,71,0|script|Ferry Master|138, +022-1.gat,71,71,0|script|Ferry Master|138 { mes "[Ferry Master]"; mes "\"Hello! Do you need something?\""; diff --git a/world/map/npc/022-1/npcs.txt b/world/map/npc/022-1/npcs.txt index dbbc8784..b94f790e 100644 --- a/world/map/npc/022-1/npcs.txt +++ b/world/map/npc/022-1/npcs.txt @@ -1,6 +1,6 @@ // Talk NPCs to help make trek interesting between Tutorial and Bazaar. -022-1.gat,35,36,0|script|Marikel|211, +022-1.gat,35,36,0|script|Marikel|211 { set @npcname$, "Marikel"; @@ -27,7 +27,7 @@ L_Marikel_2: close; } -022-1.gat,65,46,0|script|Joelin|212, +022-1.gat,65,46,0|script|Joelin|212 { set @npcname$, "Joelin"; @@ -38,7 +38,7 @@ L_Marikel_2: close; } -022-1.gat,67,46,0|script|Harper|213, +022-1.gat,67,46,0|script|Harper|213 { set @npcname$, "Harper"; @@ -47,7 +47,7 @@ L_Marikel_2: close; } -022-1.gat,75,99,0|script|Swezanne|206, +022-1.gat,75,99,0|script|Swezanne|206 { set @npcname$, "Swezanne"; diff --git a/world/map/npc/023-1/_mobs.txt b/world/map/npc/023-1/_mobs.txt index 33a97f12..c892d844 100644 --- a/world/map/npc/023-1/_mobs.txt +++ b/world/map/npc/023-1/_mobs.txt @@ -1,22 +1,22 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Lighthouse Beach mobs -023-1.gat,70,41,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119 -023-1.gat,84,33,11,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-1::On1120 -023-1.gat,58,28,6,6|monster|Grenadier|1121,1,100000,30000,Mob023-1::On1121 -023-1.gat,80,99,11,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-1::On1120 -023-1.gat,86,117,19,2|monster|Grenadier|1121,1,100000,30000,Mob023-1::On1121 -023-1.gat,55,126,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119 -023-1.gat,47,86,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119 -023-1.gat,102,67,11,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-1::On1120 -023-1.gat,105,90,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119 -023-1.gat,62,60,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119 -023-1.gat,93,49,13,11|monster|Grenadier|1121,1,100000,30000,Mob023-1::On1121 -023-1.gat,64,95,1,46|monster|AngrySeaSlime|1109,3,150000,100000,Mob023-1::On1109 -023-1.gat,45,54,5,38|monster|AngrySeaSlime|1109,3,150000,100000,Mob023-1::On1109 +023-1.gat,70,41,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119 +023-1.gat,84,33,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-1::On1120 +023-1.gat,58,28,6,6|monster|Grenadier|1121,1,100000ms,30000ms,Mob023-1::On1121 +023-1.gat,80,99,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-1::On1120 +023-1.gat,86,117,19,2|monster|Grenadier|1121,1,100000ms,30000ms,Mob023-1::On1121 +023-1.gat,55,126,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119 +023-1.gat,47,86,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119 +023-1.gat,102,67,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-1::On1120 +023-1.gat,105,90,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119 +023-1.gat,62,60,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119 +023-1.gat,93,49,13,11|monster|Grenadier|1121,1,100000ms,30000ms,Mob023-1::On1121 +023-1.gat,64,95,1,46|monster|AngrySeaSlime|1109,3,150000ms,100000ms,Mob023-1::On1109 +023-1.gat,45,54,5,38|monster|AngrySeaSlime|1109,3,150000ms,100000ms,Mob023-1::On1109 -023-1.gat,0,0,0|script|Mob023-1|-1, +023-1.gat,0,0,0|script|Mob023-1|-1 { end; diff --git a/world/map/npc/023-2/_mobs.txt b/world/map/npc/023-2/_mobs.txt index 2f4ee765..89768e20 100644 --- a/world/map/npc/023-2/_mobs.txt +++ b/world/map/npc/023-2/_mobs.txt @@ -3,7 +3,7 @@ -023-2.gat,0,0,0|script|Mob023-2|-1, +023-2.gat,0,0,0|script|Mob023-2|-1 { end; } diff --git a/world/map/npc/023-3/_mobs.txt b/world/map/npc/023-3/_mobs.txt index f5965e1d..26b0f4f8 100644 --- a/world/map/npc/023-3/_mobs.txt +++ b/world/map/npc/023-3/_mobs.txt @@ -1,15 +1,15 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Beach Caves mobs -023-3.gat,91,77,7,7|monster|Thug|1119,1,100000,30000,Mob023-3::On1119 -023-3.gat,127,85,7,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-3::On1120 -023-3.gat,98,28,7,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-3::On1120 -023-3.gat,120,45,7,7|monster|Thug|1119,1,100000,30000,Mob023-3::On1119 -023-3.gat,51,107,12,5|monster|Swashbuckler|1120,1,100000,30000,Mob023-3::On1120 -023-3.gat,69,52,66,8|monster|Thug|1119,1,100000,30000,Mob023-3::On1119 +023-3.gat,91,77,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-3::On1119 +023-3.gat,127,85,7,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-3::On1120 +023-3.gat,98,28,7,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-3::On1120 +023-3.gat,120,45,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-3::On1119 +023-3.gat,51,107,12,5|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-3::On1120 +023-3.gat,69,52,66,8|monster|Thug|1119,1,100000ms,30000ms,Mob023-3::On1119 -023-3.gat,0,0,0|script|Mob023-3|-1, +023-3.gat,0,0,0|script|Mob023-3|-1 { end; diff --git a/world/map/npc/024-1/_mobs.txt b/world/map/npc/024-1/_mobs.txt index fe80f335..7df01305 100644 --- a/world/map/npc/024-1/_mobs.txt +++ b/world/map/npc/024-1/_mobs.txt @@ -1,16 +1,16 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Canyon mobs -024-1.gat,89,52,3,2|monster|Maggot|1002,2,100000,30000,Mob024-1::On1002 -024-1.gat,40,45,3,2|monster|Maggot|1002,2,100000,30000,Mob024-1::On1002 -024-1.gat,90,37,10,7|monster|Maggot|1002,4,100000,30000,Mob024-1::On1002 -024-1.gat,96,25,3,10|monster|SeaSlime|1033,1,100000,30000,Mob024-1::On1033 -024-1.gat,33,45,24,20|monster|BlackScorpion|1009,3,100000,30000,Mob024-1::On1009 -024-1.gat,93,35,5,6|monster|GiantMaggot|1006,1,100000,30000,Mob024-1::On1006 -024-1.gat,63,54,3,6|monster|Maggot|1002,1,100000,30000,Mob024-1::On1002 +024-1.gat,89,52,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob024-1::On1002 +024-1.gat,40,45,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob024-1::On1002 +024-1.gat,90,37,10,7|monster|Maggot|1002,4,100000ms,30000ms,Mob024-1::On1002 +024-1.gat,96,25,3,10|monster|SeaSlime|1033,1,100000ms,30000ms,Mob024-1::On1033 +024-1.gat,33,45,24,20|monster|BlackScorpion|1009,3,100000ms,30000ms,Mob024-1::On1009 +024-1.gat,93,35,5,6|monster|GiantMaggot|1006,1,100000ms,30000ms,Mob024-1::On1006 +024-1.gat,63,54,3,6|monster|Maggot|1002,1,100000ms,30000ms,Mob024-1::On1002 -024-1.gat,0,0,0|script|Mob024-1|-1, +024-1.gat,0,0,0|script|Mob024-1|-1 { end; diff --git a/world/map/npc/024-1/ched.txt b/world/map/npc/024-1/ched.txt index 6e82b58b..0137ed55 100644 --- a/world/map/npc/024-1/ched.txt +++ b/world/map/npc/024-1/ched.txt @@ -1,6 +1,6 @@ // Student at Tulimshar's magic academy -024-1.gat,69,56,0|script|Ched|113, +024-1.gat,69,56,0|script|Ched|113 { if (isin("024-1.gat", 62, 52, 65, 57)) goto L_Garden; if (isin("024-1.gat", 66, 43, 80, 54)) goto L_Canyon; diff --git a/world/map/npc/024-1/david.txt b/world/map/npc/024-1/david.txt index e4f78a38..b3a56dc4 100644 --- a/world/map/npc/024-1/david.txt +++ b/world/map/npc/024-1/david.txt @@ -1,4 +1,4 @@ -024-1.gat,70,70,0|script|David|120, +024-1.gat,70,70,0|script|David|120 { set @Potion_EXP, 2000; diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt index e14a323c..35d9acae 100644 --- a/world/map/npc/024-1/eomie.txt +++ b/world/map/npc/024-1/eomie.txt @@ -18,7 +18,7 @@ // state 14: gave present to Eomie // state 15: reported back to Anwar and done -024-1.gat,72,94,0|script|Eomie|164, +024-1.gat,72,94,0|script|Eomie|164 { set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/024-1/tinris.txt b/world/map/npc/024-1/tinris.txt index c1d969fd..e4465cd3 100644 --- a/world/map/npc/024-1/tinris.txt +++ b/world/map/npc/024-1/tinris.txt @@ -17,7 +17,7 @@ // state 14: gave present to Eomie // state 15: reported back to Anwar and done -024-1.gat,82,64,0|script|Tinris|160, +024-1.gat,82,64,0|script|Tinris|160 { set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/024-1/tondar.txt b/world/map/npc/024-1/tondar.txt index 462ddc25..473c86e9 100644 --- a/world/map/npc/024-1/tondar.txt +++ b/world/map/npc/024-1/tondar.txt @@ -1,6 +1,6 @@ // A professor at Tulimshar's magic academy -024-1.gat,83,51,0|script|Tondar|168, +024-1.gat,83,51,0|script|Tondar|168 { mes "[Tondar]"; mes "\"We're not accepting any new students right now.\""; diff --git a/world/map/npc/024-2/_mobs.txt b/world/map/npc/024-2/_mobs.txt index b526b00a..14ac77bc 100644 --- a/world/map/npc/024-2/_mobs.txt +++ b/world/map/npc/024-2/_mobs.txt @@ -3,7 +3,7 @@ -024-2.gat,0,0,0|script|Mob024-2|-1, +024-2.gat,0,0,0|script|Mob024-2|-1 { end; } diff --git a/world/map/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt index aef0b938..84405447 100644 --- a/world/map/npc/024-2/barrier.txt +++ b/world/map/npc/024-2/barrier.txt @@ -1,6 +1,6 @@ // A barrier in the magic school to keep less experienced players out of the canyon -024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|127,1,1, +024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|127,1,1 { callfunc "MorganState"; if (@morgan >= 4) diff --git a/world/map/npc/024-2/tyer.txt b/world/map/npc/024-2/tyer.txt index 2b4f8674..21868e96 100644 --- a/world/map/npc/024-2/tyer.txt +++ b/world/map/npc/024-2/tyer.txt @@ -1,6 +1,6 @@ // A man in the magic school -024-2.gat,36,21,0|script|Tyer|157, +024-2.gat,36,21,0|script|Tyer|157 { mes "[Tyer]"; mes "\"Hello. Welcome to the Magic Insitute of Tulimshar.\""; diff --git a/world/map/npc/024-2/tyer_trigger.txt b/world/map/npc/024-2/tyer_trigger.txt index 0feafd99..6c532b62 100644 --- a/world/map/npc/024-2/tyer_trigger.txt +++ b/world/map/npc/024-2/tyer_trigger.txt @@ -1,6 +1,6 @@ // A man in the magic school -024-2.gat,33,24,0|script|#Tyer_Trigger|127,0,1, +024-2.gat,33,24,0|script|#Tyer_Trigger|127,0,1 { callfunc "MorganState"; if (@morgan >= 4) diff --git a/world/map/npc/024-3/_mobs.txt b/world/map/npc/024-3/_mobs.txt index 82bfa7ad..c9456ee3 100644 --- a/world/map/npc/024-3/_mobs.txt +++ b/world/map/npc/024-3/_mobs.txt @@ -3,7 +3,7 @@ -024-3.gat,0,0,0|script|Mob024-3|-1, +024-3.gat,0,0,0|script|Mob024-3|-1 { end; } diff --git a/world/map/npc/024-4/_mobs.txt b/world/map/npc/024-4/_mobs.txt index 36b6da26..bcb4d487 100644 --- a/world/map/npc/024-4/_mobs.txt +++ b/world/map/npc/024-4/_mobs.txt @@ -3,7 +3,7 @@ -024-4.gat,0,0,0|script|Mob024-4|-1, +024-4.gat,0,0,0|script|Mob024-4|-1 { end; } diff --git a/world/map/npc/025-1/_mobs.txt b/world/map/npc/025-1/_mobs.txt index 85c9c093..fa66668a 100644 --- a/world/map/npc/025-1/_mobs.txt +++ b/world/map/npc/025-1/_mobs.txt @@ -1,19 +1,19 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Swamp mobs -025-1.gat,100,60,56,79|monster|CloverPatch|1037,3,30000,10000,Mob025-1::On1037 -025-1.gat,56,96,13,5|monster|CloverPatch|1037,1,1200000,10000,Mob025-1::On1037 -025-1.gat,56,35,77,33|monster|AlizarinPlant|1032,2,240000,12000,Mob025-1::On1032 -025-1.gat,55,62,24,13|monster|Snail|1041,7,30000,12000,Mob025-1::On1041 -025-1.gat,38,84,37,31|monster|Silkworm|1035,18,40000,300,Mob025-1::On1035 -025-1.gat,96,47,63,55|monster|LogHead|1025,14,18000,3000,Mob025-1::On1025 -025-1.gat,0,0,0,0|monster|PinkFlower|1014,34,20000,5000,Mob025-1::On1014 -025-1.gat,0,0,0,0|monster|SpikyMushroom|1019,40,90000,500,Mob025-1::On1019 -025-1.gat,101,53,55,65|monster|Squirrel|1038,18,60000,9000,Mob025-1::On1038 -025-1.gat,26,61,15,85|monster|Scorpion|1003,12,100000,50000,Mob025-1::On1003 +025-1.gat,100,60,56,79|monster|CloverPatch|1037,3,30000ms,10000ms,Mob025-1::On1037 +025-1.gat,56,96,13,5|monster|CloverPatch|1037,1,1200000ms,10000ms,Mob025-1::On1037 +025-1.gat,56,35,77,33|monster|AlizarinPlant|1032,2,240000ms,12000ms,Mob025-1::On1032 +025-1.gat,55,62,24,13|monster|Snail|1041,7,30000ms,12000ms,Mob025-1::On1041 +025-1.gat,38,84,37,31|monster|Silkworm|1035,18,40000ms,300ms,Mob025-1::On1035 +025-1.gat,96,47,63,55|monster|LogHead|1025,14,18000ms,3000ms,Mob025-1::On1025 +025-1.gat,0,0,0,0|monster|PinkFlower|1014,34,20000ms,5000ms,Mob025-1::On1014 +025-1.gat,0,0,0,0|monster|SpikyMushroom|1019,40,90000ms,500ms,Mob025-1::On1019 +025-1.gat,101,53,55,65|monster|Squirrel|1038,18,60000ms,9000ms,Mob025-1::On1038 +025-1.gat,26,61,15,85|monster|Scorpion|1003,12,100000ms,50000ms,Mob025-1::On1003 -025-1.gat,0,0,0|script|Mob025-1|-1, +025-1.gat,0,0,0|script|Mob025-1|-1 { end; diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt index f06ca610..8259c2ff 100644 --- a/world/map/npc/025-1/barrier.txt +++ b/world/map/npc/025-1/barrier.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -025-1.gat,42,79,0|script|#JuliaBarrier|45,1,1, +025-1.gat,42,79,0|script|#JuliaBarrier|45,1,1 { if (Rossy_Quest > 14 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Warp; if (Rossy_Quest <= 13) goto L_Block; diff --git a/world/map/npc/025-1/reset.txt b/world/map/npc/025-1/reset.txt index 5084d905..c1b38021 100644 --- a/world/map/npc/025-1/reset.txt +++ b/world/map/npc/025-1/reset.txt @@ -1,12 +1,12 @@ //To enable: sed 's_^// __' -i npc/025-1/reset.txt -// 025-1.gat,47,84,0|script|reset|145, +// 025-1.gat,47,84,0|script|reset|145 // { // mes "Do you want to reset Rossy Quest?"; // menu // "Reset every variable of the quest.", -, // "Set Rossy_Quest.", L_Set, -// "Pass cave quest.", L_Pass2, +// "Pass cave quest.", L_Pass2 // "Pass all caves except boss cave.", L_Pass, // "Do not reset.", L_No; // set Rossy_Quest, 0; diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt index e9a58afa..412f3f48 100644 --- a/world/map/npc/025-1/rossy.txt +++ b/world/map/npc/025-1/rossy.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -025-1.gat,80,88,0|script|Rossy|114, +025-1.gat,80,88,0|script|Rossy|114 { set @child_number, 6; callfunc "XmasList"; diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt index 708f755f..0b4f179a 100644 --- a/world/map/npc/025-3/_mobs.txt +++ b/world/map/npc/025-3/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Rossy Main Hall mobs -025-3.gat,0,0,0,0|monster|CaveMaggot|1056,100,0,100,Mob025-3::On1056 -025-3.gat,0,0,0,0|monster|Archant|1060,20,0,100,Mob025-3::On1060 -025-3.gat,0,0,0,0|monster|AngryScorpion|1057,25,0,100,Mob025-3::On1057 -025-3.gat,69,153,13,1|monster|Skeleton|1043,1,0,30000,Mob025-3::On1043 +025-3.gat,0,0,0,0|monster|CaveMaggot|1056,100,0ms,100ms,Mob025-3::On1056 +025-3.gat,0,0,0,0|monster|Archant|1060,20,0ms,100ms,Mob025-3::On1060 +025-3.gat,0,0,0,0|monster|AngryScorpion|1057,25,0ms,100ms,Mob025-3::On1057 +025-3.gat,69,153,13,1|monster|Skeleton|1043,1,0ms,30000ms,Mob025-3::On1043 -025-3.gat,0,0,0|script|Mob025-3|-1, +025-3.gat,0,0,0|script|Mob025-3|-1 { end; diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt index 7e452316..dac14128 100644 --- a/world/map/npc/025-3/barriers.txt +++ b/world/map/npc/025-3/barriers.txt @@ -2,7 +2,7 @@ // -----------------------------------Warp to Cave 1 --------------------------------------- -025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1, +025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -129,7 +129,7 @@ L_AlreadyClean: // ---------------------------- Warp to Cave 2 ---------------------------- -025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1, +025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -255,7 +255,7 @@ L_AlreadyClean: // --------------------------------- Warp to Cave 3 ---------------------------------------- -025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1, +025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -381,7 +381,7 @@ L_AlreadyClean: // --------------------------- Warp to Cave 4 -------------------------------------- -025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1, +025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -507,7 +507,7 @@ L_AlreadyClean: // --------------------------- Warp to Cave 5 ---------------------------------------- -025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1, +025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -633,7 +633,7 @@ L_AlreadyClean: // -------------------------------- Warp to Cave 6 ----------------------------------------- -025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1, +025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -759,7 +759,7 @@ L_AlreadyClean: // ---------------------------- Warp to Cave 7 ------------------------------------------ -025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1, +025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -885,7 +885,7 @@ L_AlreadyClean: // -----------------------------------------------Warp to Cave 8------------------------------------------------------------- -025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1, +025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -1011,7 +1011,7 @@ L_AlreadyClean: // ------------------------------ Warp to Cave 9 ---------------------------------------- -025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1, +025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; @@ -1137,7 +1137,7 @@ L_AlreadyClean: // ----------------------------- Warp to Boss Cave ------------------------------- -025-3.gat,77,170,0|script|#WarpBossCave|45,1,1, +025-3.gat,77,170,0|script|#WarpBossCave|45,1,1 { if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED) end; diff --git a/world/map/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt index 57cdd0a1..67d12610 100644 --- a/world/map/npc/025-4/_mobs.txt +++ b/world/map/npc/025-4/_mobs.txt @@ -1,11 +1,11 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Rossy Battle Caves mobs -025-4.gat,29,31,20,14|monster|CaveMaggot|1056,3,0,100,Mob025-4::On1056 -025-4.gat,94,24,20,21|monster|CaveMaggot|1056,5,0,100,Mob025-4::On1056 +025-4.gat,29,31,20,14|monster|CaveMaggot|1056,3,0ms,100ms,Mob025-4::On1056 +025-4.gat,94,24,20,21|monster|CaveMaggot|1056,5,0ms,100ms,Mob025-4::On1056 -025-4.gat,0,0,0|script|Mob025-4|-1, +025-4.gat,0,0,0|script|Mob025-4|-1 { end; diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt index 18f32602..142f1282 100644 --- a/world/map/npc/025-4/battlecaves.txt +++ b/world/map/npc/025-4/battlecaves.txt @@ -2,7 +2,7 @@ // --------------------------------- Cave 1 ----------------------------------- -025-4.gat,41,85,0|script|#StartCaveFight1|324, +025-4.gat,41,85,0|script|#StartCaveFight1|324 { if ($@battlecave1 == 2 && $@cave1fighter$ == strcharinfo(0)) end; @@ -79,7 +79,7 @@ L_no_root: // --------------------- Cave 1 Checker ---------------------------- -025-4.gat,41,97,0|script|#CheckCaveFight1|45,1,1, +025-4.gat,41,97,0|script|#CheckCaveFight1|45,1,1 { if (cavefights & BATTLE_CAVE1 || $@battlecave1 == 1) goto L_Done; @@ -94,7 +94,7 @@ L_Done: // --------------------------------- Cave 2 --------------------------------------- -025-4.gat,115,77,0|script|#StartCaveFight2|324, +025-4.gat,115,77,0|script|#StartCaveFight2|324 { if ($@battlecave2 == 2 && $@cave2fighter$ == strcharinfo(0)) end; @@ -171,7 +171,7 @@ L_no_root: // --------------------- Cave 2 Checker ---------------------------- -025-4.gat,110,96,0|script|#CheckCaveFight2|45,1,1, +025-4.gat,110,96,0|script|#CheckCaveFight2|45,1,1 { if (cavefights & BATTLE_CAVE2 || $@battlecave2 == 1) goto L_Done; @@ -184,7 +184,7 @@ L_Done: } // ------------------------------------ Cave 3 -------------------------------------- -025-4.gat,164,103,0|script|#StartCaveFight3|324, +025-4.gat,164,103,0|script|#StartCaveFight3|324 { if ($@battlecave3 == 2 && $@cave3fighter$ == strcharinfo(0)) end; @@ -262,7 +262,7 @@ L_no_root: // --------------------- Cave 3 Checker ---------------------------- -025-4.gat,168,117,0|script|#CheckCaveFight3|45,1,1, +025-4.gat,168,117,0|script|#CheckCaveFight3|45,1,1 { if (cavefights & BATTLE_CAVE3 || $@battlecave3 == 1) goto L_Done; @@ -275,7 +275,7 @@ L_Done: } // --------------------------- Cave 4 -------------------------------- -025-4.gat,39,143,0|script|#StartCaveFight4|324, +025-4.gat,39,143,0|script|#StartCaveFight4|324 { if ($@battlecave4 == 2 && $@cave4fighter$ == strcharinfo(0)) end; @@ -355,7 +355,7 @@ L_no_root: // --------------------- Cave 4 Checker ---------------------------- -025-4.gat,32,156,0|script|#CheckCaveFight4|45,1,1, +025-4.gat,32,156,0|script|#CheckCaveFight4|45,1,1 { if (cavefights & BATTLE_CAVE4 || $@battlecave4 == 1) goto L_Done; @@ -369,7 +369,7 @@ L_Done: // ---------------------------- Cave 5 ------------------------------ -025-4.gat,109,143,0|script|#StartCaveFight5|324, +025-4.gat,109,143,0|script|#StartCaveFight5|324 { if ($@battlecave5 == 2 && $@cave5fighter$ == strcharinfo(0)) end; @@ -449,7 +449,7 @@ L_no_root: // --------------------- Cave 5 Checker ---------------------------- -025-4.gat,100,160,0|script|#CheckCaveFight5|45,1,1, +025-4.gat,100,160,0|script|#CheckCaveFight5|45,1,1 { if (cavefights & BATTLE_CAVE5 || $@battlecave5 == 1) goto L_Done; @@ -463,7 +463,7 @@ L_Done: // -------------------------------- Cave 6 ----------------------------------------- -025-4.gat,162,162,0|script|#StartCaveFight6|324, +025-4.gat,162,162,0|script|#StartCaveFight6|324 { if ($@battlecave6 == 2 && $@cave6fighter$ == strcharinfo(0)) end; @@ -543,7 +543,7 @@ L_no_root: // --------------------- Cave 6 Checker ---------------------------- -025-4.gat,159,174,0|script|#CheckCaveFight6|45,1,1, +025-4.gat,159,174,0|script|#CheckCaveFight6|45,1,1 { if (cavefights & BATTLE_CAVE6 || $@battlecave6 == 1) goto L_Done; @@ -557,7 +557,7 @@ L_Done: // -------------------------------- Cave 7 ----------------------------------- -025-4.gat,44,202,0|script|#StartCaveFight7|324, +025-4.gat,44,202,0|script|#StartCaveFight7|324 { if ($@battlecave7 == 2 && $@cave7fighter$ == strcharinfo(0)) end; @@ -639,7 +639,7 @@ L_no_root: // --------------------- Cave 7 Checker ---------------------------- -025-4.gat,42,219,0|script|#CheckCaveFight7|45,1,1, +025-4.gat,42,219,0|script|#CheckCaveFight7|45,1,1 { if (cavefights & BATTLE_CAVE7 || $@battlecave7 == 1) goto L_Done; @@ -653,7 +653,7 @@ L_Done: // --------------------------- Cave 8 ------------------------------- -025-4.gat,105,210,0|script|#StartCaveFight8|324, +025-4.gat,105,210,0|script|#StartCaveFight8|324 { if ($@battlecave8 == 2 && $@cave8fighter$ == strcharinfo(0)) end; @@ -735,7 +735,7 @@ L_no_root: // --------------------- Cave 8 Checker ---------------------------- -025-4.gat,105,216,0|script|#CheckCaveFight8|45,1,1, +025-4.gat,105,216,0|script|#CheckCaveFight8|45,1,1 { if (cavefights & BATTLE_CAVE8 || $@battlecave8 == 1) goto L_Done; @@ -749,7 +749,7 @@ L_Done: // --------------------------- Cave 9 ------------------------------- -025-4.gat,157,220,0|script|#StartCaveFight9|324, +025-4.gat,157,220,0|script|#StartCaveFight9|324 { if ($@battlecave9 == 2 && $@cave9fighter$ == strcharinfo(0)) end; @@ -831,7 +831,7 @@ L_no_root: // --------------------- Cave 9 Checker ---------------------------- -025-4.gat,157,226,0|script|#CheckCaveFight9|45,1,1, +025-4.gat,157,226,0|script|#CheckCaveFight9|45,1,1 { if (cavefights & BATTLE_CAVE9 || $@battlecave9 == 1) goto L_Done; @@ -845,7 +845,7 @@ L_Done: // --------------------- Boss Cave ---------------------------- -025-4.gat,157,30,0|script|#StartBossCaveFight|325, +025-4.gat,157,30,0|script|#StartBossCaveFight|325 { if ($@battlecave10 == 2 && $@cave10fighter$ == strcharinfo(0)) end; @@ -949,7 +949,7 @@ L_no_root: // --------------------- Boss Cave Checker ---------------------------- -025-4.gat,157,48,0|script|#CheckCaveFightBoss|45,1,1, +025-4.gat,157,48,0|script|#CheckCaveFightBoss|45,1,1 { if (Rossy_Quest >= 17) goto L_Done; @@ -976,7 +976,7 @@ L_Out: // --------------------- Julia Cave Checker Outside ---------------------------- -025-4.gat,157,24,0|script|#CheckJuliaCaveOutside|45,1,1, +025-4.gat,157,24,0|script|#CheckJuliaCaveOutside|45,1,1 { if (Rossy_Quest > 15) goto L_Done; @@ -991,7 +991,7 @@ L_Done: // --------------------- Julia Cave Checker Inside ---------------------------- -025-4.gat,93,35,0|script|#CheckJuliaCaveInside|45,1,1, +025-4.gat,93,35,0|script|#CheckJuliaCaveInside|45,1,1 { if (Rossy_Quest >= 17) goto L_Done; diff --git a/world/map/npc/025-4/clauquer.txt b/world/map/npc/025-4/clauquer.txt index 2415f59c..5a805f63 100644 --- a/world/map/npc/025-4/clauquer.txt +++ b/world/map/npc/025-4/clauquer.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -025-4.gat,30,30,0|script|Clauquer|169, +025-4.gat,30,30,0|script|Clauquer|169 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Rescued; if (Rossy_Quest == 15) goto L_Hmmm; diff --git a/world/map/npc/025-4/julia.txt b/world/map/npc/025-4/julia.txt index 6a93285b..bed94c0c 100644 --- a/world/map/npc/025-4/julia.txt +++ b/world/map/npc/025-4/julia.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -025-4.gat,89,21,0|script|Julia|114, +025-4.gat,89,21,0|script|Julia|114 { set @Reward_EXP, 5000; diff --git a/world/map/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt index 08171da8..fc186910 100644 --- a/world/map/npc/026-1/_mobs.txt +++ b/world/map/npc/026-1/_mobs.txt @@ -1,20 +1,20 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Swamp mobs -026-1.gat,0,0,0,0|monster|Wisp|1040,34,120000,40000,Mob026-1::On1040 -026-1.gat,0,0,0,0|monster|Spectre|1042,34,120000,40000,Mob026-1::On1042 -026-1.gat,0,0,0,0|monster|Poltergeist|1047,34,120000,40000,Mob026-1::On1047 -026-1.gat,0,0,0,0|monster|Silkworm|1035,10,300000,60000,Mob026-1::On1035 -026-1.gat,0,0,0,0|monster|Scorpion|1003,15,300000,30000,Mob026-1::On1003 -026-1.gat,0,0,0,0|monster|LogHead|1025,8,300000,40000,Mob026-1::On1025 -026-1.gat,46,74,35,26|monster|GrassSnake|1034,2,100000,50000,Mob026-1::On1034 -026-1.gat,88,36,35,26|monster|GrassSnake|1034,2,100000,50000,Mob026-1::On1034 -026-1.gat,35,36,18,16|monster|GrassSnake|1034,2,100000,50000,Mob026-1::On1034 -026-1.gat,66,33,73,17|monster|GrassSnake|1034,4,100000,50000,Mob026-1::On1034 -026-1.gat,60,76,61,31|monster|GrassSnake|1034,4,100000,50000,Mob026-1::On1034 - - -026-1.gat,0,0,0|script|Mob026-1|-1, +026-1.gat,0,0,0,0|monster|Wisp|1040,34,120000ms,40000ms,Mob026-1::On1040 +026-1.gat,0,0,0,0|monster|Spectre|1042,34,120000ms,40000ms,Mob026-1::On1042 +026-1.gat,0,0,0,0|monster|Poltergeist|1047,34,120000ms,40000ms,Mob026-1::On1047 +026-1.gat,0,0,0,0|monster|Silkworm|1035,10,300000ms,60000ms,Mob026-1::On1035 +026-1.gat,0,0,0,0|monster|Scorpion|1003,15,300000ms,30000ms,Mob026-1::On1003 +026-1.gat,0,0,0,0|monster|LogHead|1025,8,300000ms,40000ms,Mob026-1::On1025 +026-1.gat,46,74,35,26|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034 +026-1.gat,88,36,35,26|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034 +026-1.gat,35,36,18,16|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034 +026-1.gat,66,33,73,17|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034 +026-1.gat,60,76,61,31|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034 + + +026-1.gat,0,0,0|script|Mob026-1|-1 { end; diff --git a/world/map/npc/026-1/sign.txt b/world/map/npc/026-1/sign.txt index 05a1939e..5eb342fb 100644 --- a/world/map/npc/026-1/sign.txt +++ b/world/map/npc/026-1/sign.txt @@ -1,6 +1,6 @@ // -026-1.gat,64,16,0|script|Sign|400, +026-1.gat,64,16,0|script|Sign|400 { mes "Hurnscald's Graveyard is north of here."; mes "BEWARE!"; diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt index 9982b965..4972c857 100644 --- a/world/map/npc/027-1/_mobs.txt +++ b/world/map/npc/027-1/_mobs.txt @@ -1,26 +1,26 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Graveyard mobs -027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000,60000,Mob027-1::On1047 -027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000,60000,Mob027-1::On1042 -027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000,60000,Mob027-1::On1040 -027-1.gat,37,64,32,20|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043 -027-1.gat,37,64,32,20|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044 -027-1.gat,71,41,31,22|monster|Skeleton|1043,1,175000,20000,Mob027-1::On1043 -027-1.gat,71,41,31,22|monster|LadySkeleton|1044,1,175000,20000,Mob027-1::On1044 -027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000,20000,Mob027-1::On1043 -027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000,20000,Mob027-1::On1044 -027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000,20000,Mob027-1::On1043 -027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000,25000,Mob027-1::On1044 -027-1.gat,70,64,31,20|monster|Skeleton|1043,1,60000,8000,Mob027-1::On1043 -027-1.gat,70,64,31,21|monster|LadySkeleton|1044,1,60000,8000,Mob027-1::On1044 -027-1.gat,104,64,31,20|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043 -027-1.gat,104,64,31,21|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044 -027-1.gat,70,40,100,20|monster|VampireBat|1066,15,100000,30000,Mob027-1::On1066 -027-1.gat,99,90,34,16|monster|GrassSnake|1034,3,100000,50000,Mob027-1::On1034 - - -027-1.gat,0,0,0|script|Mob027-1|-1, +027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000ms,60000ms,Mob027-1::On1047 +027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000ms,60000ms,Mob027-1::On1042 +027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000ms,60000ms,Mob027-1::On1040 +027-1.gat,37,64,32,20|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-1::On1043 +027-1.gat,37,64,32,20|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-1::On1044 +027-1.gat,71,41,31,22|monster|Skeleton|1043,1,175000ms,20000ms,Mob027-1::On1043 +027-1.gat,71,41,31,22|monster|LadySkeleton|1044,1,175000ms,20000ms,Mob027-1::On1044 +027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000ms,20000ms,Mob027-1::On1043 +027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000ms,20000ms,Mob027-1::On1044 +027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000ms,20000ms,Mob027-1::On1043 +027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000ms,25000ms,Mob027-1::On1044 +027-1.gat,70,64,31,20|monster|Skeleton|1043,1,60000ms,8000ms,Mob027-1::On1043 +027-1.gat,70,64,31,21|monster|LadySkeleton|1044,1,60000ms,8000ms,Mob027-1::On1044 +027-1.gat,104,64,31,20|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-1::On1043 +027-1.gat,104,64,31,21|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-1::On1044 +027-1.gat,70,40,100,20|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-1::On1066 +027-1.gat,99,90,34,16|monster|GrassSnake|1034,3,100000ms,50000ms,Mob027-1::On1034 + + +027-1.gat,0,0,0|script|Mob027-1|-1 { end; diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt index b32b862c..ea19db7b 100644 --- a/world/map/npc/027-1/golbenez.txt +++ b/world/map/npc/027-1/golbenez.txt @@ -1,4 +1,4 @@ -027-1.gat,68,89,0|script|#Golbenez#_M|204, +027-1.gat,68,89,0|script|#Golbenez#_M|204 { set @fee, 666; diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt index 5f522e15..cd2d137a 100644 --- a/world/map/npc/027-1/graves.txt +++ b/world/map/npc/027-1/graves.txt @@ -1,6 +1,6 @@ // Easter egg graves -function|script|GraveTooFar|, +function|script|GraveTooFar { if (isin("027-1.gat",89,54,122,76)) goto L_Return; @@ -11,7 +11,7 @@ L_Return: return; } -027-1.gat,89,62,0|script|Grave#1|400, +027-1.gat,89,62,0|script|Grave#1|400 { callfunc "GraveTooFar"; mes "~ FotherJ ~"; @@ -19,7 +19,7 @@ L_Return: close; } -027-1.gat,118,54,0|script|Grave#2|400, +027-1.gat,118,54,0|script|Grave#2|400 { callfunc "GraveTooFar"; mes "~ Yosuhara ~"; @@ -27,7 +27,7 @@ L_Return: close; } -027-1.gat,111,62,0|script|Grave#3|400, +027-1.gat,111,62,0|script|Grave#3|400 { callfunc "GraveTooFar"; mes "~ Feline Monstrosity ~"; @@ -35,7 +35,7 @@ L_Return: close; } -027-1.gat,112,76,0|script|Grave#4|400, +027-1.gat,112,76,0|script|Grave#4|400 { callfunc "GraveTooFar"; mes "~ Superkoop ~"; @@ -43,7 +43,7 @@ L_Return: close; } -027-1.gat,120,76,0|script|Grave#5|400, +027-1.gat,120,76,0|script|Grave#5|400 { callfunc "GraveTooFar"; mes "~ Aroleon ~"; @@ -51,7 +51,7 @@ L_Return: close; } -027-1.gat,100,68,0|script|Grave#6|400, +027-1.gat,100,68,0|script|Grave#6|400 { callfunc "GraveTooFar"; mes "~ John P ~"; @@ -59,7 +59,7 @@ L_Return: close; } -027-1.gat,94,70,0|script|Grave#7|400, +027-1.gat,94,70,0|script|Grave#7|400 { callfunc "GraveTooFar"; mes "~ Spit23 ~"; @@ -67,7 +67,7 @@ L_Return: close; } -027-1.gat,106,60,0|script|Grave#8|400, +027-1.gat,106,60,0|script|Grave#8|400 { callfunc "GraveTooFar"; mes "~ Black Don ~"; @@ -75,7 +75,7 @@ L_Return: close; } -027-1.gat,92,54,0|script|Grave#9|400, +027-1.gat,92,54,0|script|Grave#9|400 { callfunc "GraveTooFar"; mes "~ Jaxad0127 ~"; @@ -83,7 +83,7 @@ L_Return: close; } -027-1.gat,122,64,0|script|Grave#10|400, +027-1.gat,122,64,0|script|Grave#10|400 { callfunc "GraveTooFar"; mes "~ Ces Vargavind ~"; @@ -91,7 +91,7 @@ L_Return: close; } -027-1.gat,102,62,0|script|Grave#11|400, +027-1.gat,102,62,0|script|Grave#11|400 { callfunc "GraveTooFar"; mes "~ Crush ~"; @@ -99,7 +99,7 @@ L_Return: close; } -027-1.gat,104,76,0|script|Grave#12|400, +027-1.gat,104,76,0|script|Grave#12|400 { callfunc "GraveTooFar"; mes "~ Freeyorp ~"; diff --git a/world/map/npc/027-1/traveler.txt b/world/map/npc/027-1/traveler.txt index b2c1b6ee..d07e952e 100644 --- a/world/map/npc/027-1/traveler.txt +++ b/world/map/npc/027-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -027-1.gat,83,84,0|script|Styx the Traveler|103, +027-1.gat,83,84,0|script|Styx the Traveler|103 { set @NpcName$, "Styx"; set @NpcTravelBit, $@graveyard_bit; diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt index f2c20606..0ba82765 100644 --- a/world/map/npc/027-2/_mobs.txt +++ b/world/map/npc/027-2/_mobs.txt @@ -1,19 +1,19 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Graveyard Indoor mobs -027-2.gat,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077 -027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078 -027-2.gat,110,26,11,11|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078 -027-2.gat,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077 -027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079 -027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079 -027-2.gat,112,88,28,39|monster|VampireBat|1066,15,100000,30000,Mob027-2::On1066 -027-2.gat,102,99,9,19|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077 -027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078 -027-2.gat,89,34,11,9|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078 +027-2.gat,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077 +027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078 +027-2.gat,110,26,11,11|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078 +027-2.gat,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077 +027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000ms,30000ms,Mob027-2::On1079 +027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000ms,30000ms,Mob027-2::On1079 +027-2.gat,112,88,28,39|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-2::On1066 +027-2.gat,102,99,9,19|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077 +027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078 +027-2.gat,89,34,11,9|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078 -027-2.gat,0,0,0|script|Mob027-2|-1, +027-2.gat,0,0,0|script|Mob027-2|-1 { end; diff --git a/world/map/npc/027-2/alacrius.txt b/world/map/npc/027-2/alacrius.txt index c29e2758..2ca331a4 100644 --- a/world/map/npc/027-2/alacrius.txt +++ b/world/map/npc/027-2/alacrius.txt @@ -1,7 +1,7 @@ // Author: wushin //Starts Crypt Quest -027-2.gat,122,105,0|script|Alacrius|313, +027-2.gat,122,105,0|script|Alacrius|313 { mes "[Alacrius]"; mes "\"Hello, I'm Alacrius. \""; diff --git a/world/map/npc/027-2/barman.txt b/world/map/npc/027-2/barman.txt index a3ad69c2..de367df3 100644 --- a/world/map/npc/027-2/barman.txt +++ b/world/map/npc/027-2/barman.txt @@ -1,4 +1,4 @@ -027-2.gat,103,22,0|script|Bennet|310, +027-2.gat,103,22,0|script|Bennet|310 { mes "[Bennet]"; mes "\"Hi there, stranger! My name is Bennet, the bartender here.\""; diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt index c10db6fe..b4e3eee5 100644 --- a/world/map/npc/027-2/caretaker.txt +++ b/world/map/npc/027-2/caretaker.txt @@ -2,7 +2,7 @@ // TODO: add dialog/code for giving more letters // Airlia supports receiving an infinate number of letters -027-2.gat,24,25,0|script|Caretaker|159, +027-2.gat,24,25,0|script|Caretaker|159 { set @halloween_npc_id, $@halloween_npc_caretaker; callfunc "TrickOrTreat"; @@ -109,7 +109,7 @@ L_Give_New_Letter_Real: L_Close: close; } -027-2.gat,28,22,0|script|Joan|409, +027-2.gat,28,22,0|script|Joan|409 { mes "[Joan]"; mes "..."; diff --git a/world/map/npc/027-2/cerhan.txt b/world/map/npc/027-2/cerhan.txt index fa6c9ebc..3abe2e2f 100644 --- a/world/map/npc/027-2/cerhan.txt +++ b/world/map/npc/027-2/cerhan.txt @@ -1,6 +1,6 @@ // Author: Jenalya -027-2.gat,70,77,0|script|Cerhan|311, +027-2.gat,70,77,0|script|Cerhan|311 { mes "[Cerhan]"; mes "\"Ah, hello! It's good to see another normal human at this strange place!\""; diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt index d84432cc..7428cb1f 100644 --- a/world/map/npc/027-2/crying_child.txt +++ b/world/map/npc/027-2/crying_child.txt @@ -2,7 +2,7 @@ // love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez // Jenalya: some changes about variables (setting to zero if only used locally, naming) -027-2.gat,50,92,0|script|Aldred|314, +027-2.gat,50,92,0|script|Aldred|314 { // Crying Child subquest // Variable states: diff --git a/world/map/npc/027-2/diary.txt b/world/map/npc/027-2/diary.txt index d4f4b4ab..4fb2716d 100644 --- a/world/map/npc/027-2/diary.txt +++ b/world/map/npc/027-2/diary.txt @@ -1,6 +1,6 @@ // Author: Jenalya -027-2.gat,26,97,0|script|#Diary|400, +027-2.gat,26,97,0|script|#Diary|400 { set @Graveyard_Inn_MASK, NIBBLE_0_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT; diff --git a/world/map/npc/027-2/door.txt b/world/map/npc/027-2/door.txt index 08513582..146b4940 100644 --- a/world/map/npc/027-2/door.txt +++ b/world/map/npc/027-2/door.txt @@ -1,4 +1,4 @@ -027-2.gat,25,100,0|script|#DoorIn|45,1,1, +027-2.gat,25,100,0|script|#DoorIn|45,1,1 { set @Graveyard_Inn_MASK, NIBBLE_0_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT; @@ -16,7 +16,7 @@ L_Warp: } // TODO replace this with a plain warp -027-2.gat,26,99,0|script|#DoorOut-gyinn|45,1,1, +027-2.gat,26,99,0|script|#DoorOut-gyinn|45,1,1 { warp "027-2.gat", 23, 98; end; diff --git a/world/map/npc/027-2/evil_guard.txt b/world/map/npc/027-2/evil_guard.txt index c7aeae98..aa4ee55e 100644 --- a/world/map/npc/027-2/evil_guard.txt +++ b/world/map/npc/027-2/evil_guard.txt @@ -1,4 +1,4 @@ -027-2.gat,100,43,0|script|Blackwin|316, +027-2.gat,100,43,0|script|Blackwin|316 { mes "..."; next; @@ -12,7 +12,7 @@ close; } -027-2.gat,112,37,0|script|Forwin|316, +027-2.gat,112,37,0|script|Forwin|316 { mes "[Evil Guard]"; mes "\"" + strcharinfo(0) + "...\""; diff --git a/world/map/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt index 9d7bdb3a..2f93ea33 100644 --- a/world/map/npc/027-2/golbenez.txt +++ b/world/map/npc/027-2/golbenez.txt @@ -9,7 +9,7 @@ // state 6: wants jackOsouls, random chance of 1/50 to success, small amount of exp for fail // state 7: done -027-2.gat,39,91,0|script|Golbenez|307, +027-2.gat,39,91,0|script|Golbenez|307 { set @Graveyard_Inn_MASK, NIBBLE_4_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_4_SHIFT; diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt index 2a829ec1..c51ca747 100644 --- a/world/map/npc/027-2/gy_inn_shops.txt +++ b/world/map/npc/027-2/gy_inn_shops.txt @@ -7,12 +7,12 @@ // banker: function -027-2.gat,75,22,0|shop|Chef#graveyard|300,ZombieNachos :-1,LadyFingers :-1,JellAhh :-1,Snapple :-1 -027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice :-1,GutBuster :-1,BloodWine :-1 -027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows :-1,ShockSweet :-1 -027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink :-1,CactusPotion :-1,BugLeg :-1,SmallMushroom :-1,IronPotion :-1,ConcentrationPotion :-1,HardSpike :-1,DarkCrystal :-1,Root :-1,WispPowder :-1,SpectrePowder :-1,PoltergeistPowder :-1 +027-2.gat,75,22,0|shop|Chef#graveyard|300,ZombieNachos:*1,LadyFingers:*1,JellAhh:*1,Snapple:*1 +027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice:*1,GutBuster:*1,BloodWine:*1 +027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows:*1,ShockSweet:*1 +027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1 -027-2.gat,106,22,0|script|Edwin|309, +027-2.gat,106,22,0|script|Edwin|309 { set @npcname$, "Edwin"; @@ -24,7 +24,7 @@ } // Inn -027-2.gat,107,39,0|script|Barbara Grey|320, +027-2.gat,107,39,0|script|Barbara Grey|320 { set @npcname$, "Barbara Grey"; set @cost, 1000; @@ -38,7 +38,7 @@ } // Bank and Storage -027-2.gat,88,22,0|script|J.P. Morbid|321, +027-2.gat,88,22,0|script|J.P. Morbid|321 { callfunc "ClearVariables"; set @npcname$, "J.P. Morbid"; diff --git a/world/map/npc/027-2/headless_man.txt b/world/map/npc/027-2/headless_man.txt index 747b6c2d..9bc60192 100644 --- a/world/map/npc/027-2/headless_man.txt +++ b/world/map/npc/027-2/headless_man.txt @@ -5,7 +5,7 @@ // state 2: items delivered, return for reward and followup story // state 3: quest completed -027-2.gat,22,76,0|script|Thurstan|318, +027-2.gat,22,76,0|script|Thurstan|318 { if (Sex == 0) set @madamsir$, "Madam"; if (Sex == 1) set @madamsir$, "Sir"; diff --git a/world/map/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt index 8f0236b1..01524a84 100644 --- a/world/map/npc/027-2/husband.txt +++ b/world/map/npc/027-2/husband.txt @@ -9,7 +9,7 @@ // state 6: is set in reid, gives as reward a special bowler hat // state 7: done -027-2.gat,22,84,0|script|Hamond|319, +027-2.gat,22,84,0|script|Hamond|319 { set @Graveyard_Inn_MASK, NIBBLE_3_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_3_SHIFT; diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt index 81feae3b..a1b4c7a5 100644 --- a/world/map/npc/027-2/innkeeper.txt +++ b/world/map/npc/027-2/innkeeper.txt @@ -13,7 +13,7 @@ // state 10: she spoke with hamond and savaric, gives reward mylarin dust (needed for a crafting quest in thermin) // state 11: done, can ask about mylarin dust again -027-2.gat,104,39,0|script|Reid's Ghost|315, +027-2.gat,104,39,0|script|Reid's Ghost|315 { set @Graveyard_Inn_MASK, NIBBLE_0_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT; diff --git a/world/map/npc/027-2/lover.txt b/world/map/npc/027-2/lover.txt index 7105dfab..17714b71 100644 --- a/world/map/npc/027-2/lover.txt +++ b/world/map/npc/027-2/lover.txt @@ -9,7 +9,7 @@ // state 6: waiting for youl, if @golbanez >= 7 got it, giving sorcerer robe // state 7: done -027-2.gat,43,73,0|script|Savaric|317, +027-2.gat,43,73,0|script|Savaric|317 { set @Graveyard_Inn_MASK, NIBBLE_1_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_1_SHIFT; diff --git a/world/map/npc/027-2/testnpcs.txt b/world/map/npc/027-2/testnpcs.txt index 88d762e3..bed6f3be 100644 --- a/world/map/npc/027-2/testnpcs.txt +++ b/world/map/npc/027-2/testnpcs.txt @@ -1,6 +1,6 @@ //several NPCs in the Reid's Inn -027-2.gat,80,34,0|script|Lovers|303, +027-2.gat,80,34,0|script|Lovers|303 { mes "You see a man and a woman holding each other very tight."; next; @@ -12,7 +12,7 @@ close; } -027-2.gat,75,29,0|script|Archibald|306, +027-2.gat,75,29,0|script|Archibald|306 { //the broken grammar is intentional mes "[Archibald]"; @@ -22,7 +22,7 @@ close; } -027-2.gat,77,40,0|script|Darnel|308, +027-2.gat,77,40,0|script|Darnel|308 { set @drunker, rand(4); if (@drunker == 0) goto L_0; @@ -52,7 +52,7 @@ L_Close: close; } -027-2.gat,110,23,0|script|Nigel|312, +027-2.gat,110,23,0|script|Nigel|312 { mes "[Nigel]"; mes "\"Ohh... My head is killing me! I have to stop " diff --git a/world/map/npc/027-2/thurston.txt b/world/map/npc/027-2/thurston.txt index 0778c7ec..3dfcffd7 100644 --- a/world/map/npc/027-2/thurston.txt +++ b/world/map/npc/027-2/thurston.txt @@ -1,6 +1,6 @@ // Vampire Bat Wings Daily -027-2.gat,100,105,0|script|Thurston|302, +027-2.gat,100,105,0|script|Thurston|302 { set @dq_level, 60; set @dq_cost, 45; diff --git a/world/map/npc/027-2/werewolf.txt b/world/map/npc/027-2/werewolf.txt index 1438393a..94790afd 100644 --- a/world/map/npc/027-2/werewolf.txt +++ b/world/map/npc/027-2/werewolf.txt @@ -1,6 +1,6 @@ // author: Jenalya -027-2.gat,118,23,0|script|Wolfgang|305, +027-2.gat,118,23,0|script|Wolfgang|305 { set @Graveyard_Inn_MASK, NIBBLE_5_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/027-3/_mobs.txt b/world/map/npc/027-3/_mobs.txt index 6256db5e..57088677 100644 --- a/world/map/npc/027-3/_mobs.txt +++ b/world/map/npc/027-3/_mobs.txt @@ -1,17 +1,17 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Crypt Basement mobs -027-3.gat,34,63,29,69|monster|Skeleton|1043,6,60000,8000,Mob027-3::On1043 -027-3.gat,97,43,59,30|monster|Skeleton|1043,6,60000,8000,Mob027-3::On1043 -027-3.gat,34,63,29,69|monster|LadySkeleton|1044,4,60000,8000,Mob027-3::On1044 -027-3.gat,113,78,28,26|monster|LadySkeleton|1044,4,60000,8000,Mob027-3::On1044 -027-3.gat,113,78,27,27|monster|Skeleton|1043,4,60000,8000,Mob027-3::On1043 -027-3.gat,81,87,29,22|monster|VampireBat|1066,15,100000,30000,Mob027-3::On1066 -027-3.gat,74,45,106,33|monster|PoisonSkull|1024,1,60000,20000,Mob027-3::On1024 -027-3.gat,98,84,60,14|monster|FireSkull|1023,2,60000,20000,Mob027-3::On1023 +027-3.gat,34,63,29,69|monster|Skeleton|1043,6,60000ms,8000ms,Mob027-3::On1043 +027-3.gat,97,43,59,30|monster|Skeleton|1043,6,60000ms,8000ms,Mob027-3::On1043 +027-3.gat,34,63,29,69|monster|LadySkeleton|1044,4,60000ms,8000ms,Mob027-3::On1044 +027-3.gat,113,78,28,26|monster|LadySkeleton|1044,4,60000ms,8000ms,Mob027-3::On1044 +027-3.gat,113,78,27,27|monster|Skeleton|1043,4,60000ms,8000ms,Mob027-3::On1043 +027-3.gat,81,87,29,22|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-3::On1066 +027-3.gat,74,45,106,33|monster|PoisonSkull|1024,1,60000ms,20000ms,Mob027-3::On1024 +027-3.gat,98,84,60,14|monster|FireSkull|1023,2,60000ms,20000ms,Mob027-3::On1023 -027-3.gat,0,0,0|script|Mob027-3|-1, +027-3.gat,0,0,0|script|Mob027-3|-1 { end; diff --git a/world/map/npc/027-3/monsters.txt b/world/map/npc/027-3/monsters.txt index 7aaa7fd5..96edc6be 100644 --- a/world/map/npc/027-3/monsters.txt +++ b/world/map/npc/027-3/monsters.txt @@ -1,12 +1,12 @@ // 027-3 Graveyard zombies and fallens // they need to be in an extra file because of the crying child quest -027-3.gat,21,76,51,100|monster|Zombie|1036,2,300000,120000,specialMob027-3::On1036 -027-3.gat,21,30,51,63|monster|Zombie|1036,2,200000,10000,specialMob027-3::On1036 -027-3.gat,67,29,129,64|monster|Zombie|1036,3,140000,30000,specialMob027-3::On1036 -027-3.gat,101,65,128,93|monster|Fallen|1045,3,120000,30000,specialMob027-3::On1045 +027-3.gat,21,76,51,100|monster|Zombie|1036,2,300000ms,120000ms,specialMob027-3::On1036 +027-3.gat,21,30,51,63|monster|Zombie|1036,2,200000ms,10000ms,specialMob027-3::On1036 +027-3.gat,67,29,129,64|monster|Zombie|1036,3,140000ms,30000ms,specialMob027-3::On1036 +027-3.gat,101,65,128,93|monster|Fallen|1045,3,120000ms,30000ms,specialMob027-3::On1045 -027-3.gat,0,0,0|script|specialMob027-3|-1, +027-3.gat,0,0,0|script|specialMob027-3|-1 { end; @@ -64,8 +64,6 @@ L_Return: return; S_Update_Mask: - set QUEST_Graveyard_Inn, - (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK)) - | (@state << @Graveyard_Inn_SHIFT); + set QUEST_Graveyard_Inn, (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK)) | (@state << @Graveyard_Inn_SHIFT); return; } diff --git a/world/map/npc/027-4/_mobs.txt b/world/map/npc/027-4/_mobs.txt index 8feb1baa..a8d345b4 100644 --- a/world/map/npc/027-4/_mobs.txt +++ b/world/map/npc/027-4/_mobs.txt @@ -1,14 +1,14 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Crypt Sub-Basement One mobs -027-4.gat,39,84,38,22|monster|Skeleton|1043,2,60000,8000,Mob027-4::On1043 -027-4.gat,27,57,15,22|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044 -027-4.gat,108,77,39,14|monster|Skeleton|1043,2,60000,8000,Mob027-4::On1043 -027-4.gat,61,37,38,30|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044 -027-4.gat,101,36,38,30|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044 +027-4.gat,39,84,38,22|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-4::On1043 +027-4.gat,27,57,15,22|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044 +027-4.gat,108,77,39,14|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-4::On1043 +027-4.gat,61,37,38,30|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044 +027-4.gat,101,36,38,30|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044 -027-4.gat,0,0,0|script|Mob027-4|-1, +027-4.gat,0,0,0|script|Mob027-4|-1 { end; diff --git a/world/map/npc/027-4/monsters.txt b/world/map/npc/027-4/monsters.txt index c575f056..2ed72f87 100644 --- a/world/map/npc/027-4/monsters.txt +++ b/world/map/npc/027-4/monsters.txt @@ -1,13 +1,13 @@ // 027-4 Graveyard zombies and fallens // they need to be in an extra file because of the crying child quest -027-4.gat,39,84,38,22|monster|Fallen|1045,3,60000,8000,specialMob027-4::On1045 -027-4.gat,27,57,15,22|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036 -027-4.gat,108,77,39,14|monster|Fallen|1045,3,60000,8000,specialMob027-4::On1045 -027-4.gat,61,37,38,30|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036 -027-4.gat,101,36,38,30|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036 +027-4.gat,39,84,38,22|monster|Fallen|1045,3,60000ms,8000ms,specialMob027-4::On1045 +027-4.gat,27,57,15,22|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 +027-4.gat,108,77,39,14|monster|Fallen|1045,3,60000ms,8000ms,specialMob027-4::On1045 +027-4.gat,61,37,38,30|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 +027-4.gat,101,36,38,30|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 -027-4.gat,0,0,0|script|specialMob027-4|-1, +027-4.gat,0,0,0|script|specialMob027-4|-1 { end; @@ -65,8 +65,6 @@ L_Return: return; S_Update_Mask: - set QUEST_Graveyard_Inn, - (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK)) - | (@state << @Graveyard_Inn_SHIFT); + set QUEST_Graveyard_Inn, (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK)) | (@state << @Graveyard_Inn_SHIFT); return; } diff --git a/world/map/npc/027-5/_mobs.txt b/world/map/npc/027-5/_mobs.txt index a1cd354a..1dae44dc 100644 --- a/world/map/npc/027-5/_mobs.txt +++ b/world/map/npc/027-5/_mobs.txt @@ -1,16 +1,16 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Crypt Sub-Basement Two mobs -027-5.gat,69,42,97,41|monster|Wight|1124,6,60000,8000,Mob027-5::On1124 -027-5.gat,69,56,97,69|monster|VampireBat|1066,30,100000,30000,Mob027-5::On1066 -027-5.gat,69,42,98,40|monster|Skeleton|1043,8,60000,8000,Mob027-5::On1043 -027-5.gat,69,41,98,39|monster|LadySkeleton|1044,8,60000,8000,Mob027-5::On1044 -027-5.gat,68,42,97,40|monster|RedBone|1074,6,60000,8000,Mob027-5::On1074 -027-5.gat,70,80,98,34|monster|Skeleton|1043,8,60000,8000,Mob027-5::On1043 -027-5.gat,69,80,99,36|monster|LadySkeleton|1044,8,60000,8000,Mob027-5::On1044 +027-5.gat,69,42,97,41|monster|Wight|1124,6,60000ms,8000ms,Mob027-5::On1124 +027-5.gat,69,56,97,69|monster|VampireBat|1066,30,100000ms,30000ms,Mob027-5::On1066 +027-5.gat,69,42,98,40|monster|Skeleton|1043,8,60000ms,8000ms,Mob027-5::On1043 +027-5.gat,69,41,98,39|monster|LadySkeleton|1044,8,60000ms,8000ms,Mob027-5::On1044 +027-5.gat,68,42,97,40|monster|RedBone|1074,6,60000ms,8000ms,Mob027-5::On1074 +027-5.gat,70,80,98,34|monster|Skeleton|1043,8,60000ms,8000ms,Mob027-5::On1043 +027-5.gat,69,80,99,36|monster|LadySkeleton|1044,8,60000ms,8000ms,Mob027-5::On1044 -027-5.gat,0,0,0|script|Mob027-5|-1, +027-5.gat,0,0,0|script|Mob027-5|-1 { end; diff --git a/world/map/npc/027-6/_mobs.txt b/world/map/npc/027-6/_mobs.txt index aee5ddd9..1c3ffde6 100644 --- a/world/map/npc/027-6/_mobs.txt +++ b/world/map/npc/027-6/_mobs.txt @@ -3,7 +3,7 @@ -027-6.gat,0,0,0|script|Mob027-6|-1, +027-6.gat,0,0,0|script|Mob027-6|-1 { end; } diff --git a/world/map/npc/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt index ea37051c..b42345d0 100644 --- a/world/map/npc/027-6/general_krukan.txt +++ b/world/map/npc/027-6/general_krukan.txt @@ -2,7 +2,7 @@ // Based off Cindy Fight // General Krukan Fight -027-6.gat,39,25,0|script|General Krukan|400, +027-6.gat,39,25,0|script|General Krukan|400 { if ($@CRYPT_FIGHT1 != 0) end; @@ -215,17 +215,17 @@ L_End: OnInit: setarray $@CRYPT_FIGHT1_MESSAGES$, - "General Krukan : Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!", - "General Krukan : Ha, Looks like your tougher then I thought.", - "General Krukan : and here I thought I wasn't going to enjoy this.", - "General Krukan : More of them are coming!", - "General Krukan : Minions! Kill them already!", - "General Krukan : *facepalm* I knew I should have hired better help.", - "General Krukan : Well at least you will make a good addition to my army.", - "General Krukan : To the Abyss with you already!", - "General Krukan : How about you try a different approach and kill them already!", - "General Krukan : Minions! Last chance or it's back to being part of an ossuary for you!", - "General Krukan : Looks like if you want something done right you have to do it yourself.", - "General Krukan : Charge!."; + "General Krukan:* Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!", + "General Krukan:* Ha, Looks like your tougher then I thought.", + "General Krukan:* and here I thought I wasn't going to enjoy this.", + "General Krukan:* More of them are coming!", + "General Krukan:* Minions! Kill them already!", + "General Krukan:* *facepalm* I knew I should have hired better help.", + "General Krukan:* Well at least you will make a good addition to my army.", + "General Krukan:* To the Abyss with you already!", + "General Krukan:* How about you try a different approach and kill them already!", + "General Krukan:* Minions! Last chance or it's back to being part of an ossuary for you!", + "General Krukan:* Looks like if you want something done right you have to do it yourself.", + "General Krukan:* Charge!."; end; } diff --git a/world/map/npc/027-7/_mobs.txt b/world/map/npc/027-7/_mobs.txt index 4c40b389..da029343 100644 --- a/world/map/npc/027-7/_mobs.txt +++ b/world/map/npc/027-7/_mobs.txt @@ -3,7 +3,7 @@ -027-7.gat,0,0,0|script|Mob027-7|-1, +027-7.gat,0,0,0|script|Mob027-7|-1 { end; } diff --git a/world/map/npc/027-7/general_razha.txt b/world/map/npc/027-7/general_razha.txt index 869c4684..cad3e4cb 100644 --- a/world/map/npc/027-7/general_razha.txt +++ b/world/map/npc/027-7/general_razha.txt @@ -2,7 +2,7 @@ // Based off Cindy Fight // General Razha Fight -027-7.gat,39,25,0|script|General Razha|400, +027-7.gat,39,25,0|script|General Razha|400 { if ($@CRYPT_FIGHT2 != 0) end; @@ -169,7 +169,7 @@ OnPetDeath: end; L_CleanUpLosers: - mapannounce "027-7.gat", "General Razha : Oh where did you all go, I was beginning to have fun here.", 0; + mapannounce "027-7.gat", "General Razha:* Oh where did you all go, I was beginning to have fun here.", 0; mapannounce "027-4.gat", "The battle is lost.", 0; set $@CRYPT_FIGHT2, 0; set $@CRYPT_FIGHT2_PLAYER_COUNT, 0; @@ -184,7 +184,7 @@ L_CleanUpLosers: end; L_CleanUp: - mapannounce "027-7.gat", "General Razha : How in all hells could that happen? I am lost forever.", 0; + mapannounce "027-7.gat", "General Razha:* How in all hells could that happen? I am lost forever.", 0; mapannounce "027-4.gat", "General Razha is defeated.", 0; areatimer "027-7.gat", 0, 0, 79, 84, 10, "General Razha::OnReward"; set $@CRYPT_FIGHT2, 0; @@ -219,17 +219,17 @@ L_End: OnInit: setarray $@CRYPT_FIGHT2_MESSAGES$, - "General Razha : Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!", - "General Razha : Ha, Looks like your tougher then I thought.", - "General Razha : and here I thought I wasn't going to enjoy this.", - "General Razha : More of them are coming!", - "General Razha : Minions! Kill them already!", - "General Razha : *facepalm* I knew I should have hired better help.", - "General Razha : Well at least you will make a good addition to my army.", - "General Razha : To the Abyss with you already!", - "General Razha : How about you try a different approach and kill them already!", - "General Razha : Minions! Last chance or it's back to being part of an ossuary for you!", - "General Razha : Looks like if you want something done right you have to do it yourself.", - "General Razha : Charge!."; + "General Razha:* Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!", + "General Razha:* Ha, Looks like your tougher then I thought.", + "General Razha:* and here I thought I wasn't going to enjoy this.", + "General Razha:* More of them are coming!", + "General Razha:* Minions! Kill them already!", + "General Razha:* *facepalm* I knew I should have hired better help.", + "General Razha:* Well at least you will make a good addition to my army.", + "General Razha:* To the Abyss with you already!", + "General Razha:* How about you try a different approach and kill them already!", + "General Razha:* Minions! Last chance or it's back to being part of an ossuary for you!", + "General Razha:* Looks like if you want something done right you have to do it yourself.", + "General Razha:* Charge!."; end; } diff --git a/world/map/npc/027-8/_mobs.txt b/world/map/npc/027-8/_mobs.txt index 220fdf19..00f40413 100644 --- a/world/map/npc/027-8/_mobs.txt +++ b/world/map/npc/027-8/_mobs.txt @@ -3,7 +3,7 @@ -027-8.gat,0,0,0|script|Mob027-8|-1, +027-8.gat,0,0,0|script|Mob027-8|-1 { end; } diff --git a/world/map/npc/027-8/general_terogan.txt b/world/map/npc/027-8/general_terogan.txt index 5d420599..3bf89d35 100644 --- a/world/map/npc/027-8/general_terogan.txt +++ b/world/map/npc/027-8/general_terogan.txt @@ -2,7 +2,7 @@ // Based off Cindy Fight // General Terogan Fight -027-8.gat,39,24,0|script|General Terogan#Main|400, +027-8.gat,39,24,0|script|General Terogan#Main|400 { if ($@CRYPT_FIGHT3 != 0) end; @@ -233,7 +233,7 @@ L_Failure: goto L_NextWave; L_CleanUpLosers: - mapannounce "027-8.gat", "General Terogan : You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0; + mapannounce "027-8.gat", "General Terogan:* You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0; set $@CRYPT_FIGHT3, 0; set $@CRYPT_FIGHT3_PLAYER_COUNT, 0; set $@CRYPT_FIGHT3_WAVE, 0; @@ -284,22 +284,22 @@ L_End: OnInit: setarray $@CRYPT_FIGHT3_MESSAGES$, - "General Terogan : Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!", - "General Terogan : Ha, Looks like your tougher then I thought.", - "General Terogan : and here I thought I wasn't going to enjoy this.", - "General Terogan : More of them are coming!", - "General Terogan : Minions! Kill them already!", - "General Terogan : *facepalm* I knew I should have hired better help.", - "General Terogan : Well at least you will make a good addition to my army.", - "General Terogan : To the Abyss with you already!", - "General Terogan : How about you try a different approach and kill them already!", - "General Terogan : Minions! Last chance or it's back to being part of an ossuary for you!", - "General Terogan : Looks like if you want something done right you have to do it yourself.", - "General Terogan : Charge!."; + "General Terogan:* Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!", + "General Terogan:* Ha, Looks like your tougher then I thought.", + "General Terogan:* and here I thought I wasn't going to enjoy this.", + "General Terogan:* More of them are coming!", + "General Terogan:* Minions! Kill them already!", + "General Terogan:* *facepalm* I knew I should have hired better help.", + "General Terogan:* Well at least you will make a good addition to my army.", + "General Terogan:* To the Abyss with you already!", + "General Terogan:* How about you try a different approach and kill them already!", + "General Terogan:* Minions! Last chance or it's back to being part of an ossuary for you!", + "General Terogan:* Looks like if you want something done right you have to do it yourself.", + "General Terogan:* Charge!."; end; } -027-8.gat,27,41,0|script|General Terogan#Exit1|400, +027-8.gat,27,41,0|script|General Terogan#Exit1|400 { if ($@CRYPT_FIGHT3 != 0) message strcharinfo(0), "You are way too busy to check this book right now"; @@ -310,7 +310,7 @@ OnInit: warp "027-8", 38, 29; end; } -027-8.gat,51,41,0|script|General Terogan#Exit2|400, +027-8.gat,51,41,0|script|General Terogan#Exit2|400 { if ($@CRYPT_FIGHT3 != 0) message strcharinfo(0), "You are way too busy to check this book right now"; diff --git a/world/map/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt index c6d333a2..60a951e5 100644 --- a/world/map/npc/028-1/_mobs.txt +++ b/world/map/npc/028-1/_mobs.txt @@ -1,21 +1,21 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // GM Island mobs -028-1.gat,121,75,27,25|monster|SpikyMushroom|1019,18,20000,15000,Mob028-1::On1019 -028-1.gat,89,72,25,19|monster|Bat|1017,18,100000,10000,Mob028-1::On1017 -028-1.gat,99,36,48,32|monster|Wisp|1040,8,200000,15000,Mob028-1::On1040 -028-1.gat,99,36,46,34|monster|Spectre|1042,8,200000,15000,Mob028-1::On1042 -028-1.gat,99,36,44,36|monster|Poltergeist|1047,8,200000,15000,Mob028-1::On1047 -028-1.gat,41,67,38,9|monster|SeaSlime|1033,18,100000,25000,Mob028-1::On1033 -028-1.gat,51,78,22,10|monster|SeaSlime|1033,15,100000,25000,Mob028-1::On1033 -028-1.gat,29,104,1,1|monster|Squirrel|1038,1,300000,50000,Mob028-1::On1038 -028-1.gat,74,98,71,18|monster|Wisp|1040,8,200000,15000,Mob028-1::On1040 -028-1.gat,82,103,93,16|monster|Spectre|1042,8,200000,15000,Mob028-1::On1042 -028-1.gat,110,117,61,14|monster|Poltergeist|1047,8,200000,15000,Mob028-1::On1047 -028-1.gat,60,45,1,1|monster|Fallen|1045,1,700000,300000,Mob028-1::On1045 - - -028-1.gat,0,0,0|script|Mob028-1|-1, +028-1.gat,121,75,27,25|monster|SpikyMushroom|1019,18,20000ms,15000ms,Mob028-1::On1019 +028-1.gat,89,72,25,19|monster|Bat|1017,18,100000ms,10000ms,Mob028-1::On1017 +028-1.gat,99,36,48,32|monster|Wisp|1040,8,200000ms,15000ms,Mob028-1::On1040 +028-1.gat,99,36,46,34|monster|Spectre|1042,8,200000ms,15000ms,Mob028-1::On1042 +028-1.gat,99,36,44,36|monster|Poltergeist|1047,8,200000ms,15000ms,Mob028-1::On1047 +028-1.gat,41,67,38,9|monster|SeaSlime|1033,18,100000ms,25000ms,Mob028-1::On1033 +028-1.gat,51,78,22,10|monster|SeaSlime|1033,15,100000ms,25000ms,Mob028-1::On1033 +028-1.gat,29,104,1,1|monster|Squirrel|1038,1,300000ms,50000ms,Mob028-1::On1038 +028-1.gat,74,98,71,18|monster|Wisp|1040,8,200000ms,15000ms,Mob028-1::On1040 +028-1.gat,82,103,93,16|monster|Spectre|1042,8,200000ms,15000ms,Mob028-1::On1042 +028-1.gat,110,117,61,14|monster|Poltergeist|1047,8,200000ms,15000ms,Mob028-1::On1047 +028-1.gat,60,45,1,1|monster|Fallen|1045,1,700000ms,300000ms,Mob028-1::On1045 + + +028-1.gat,0,0,0|script|Mob028-1|-1 { end; diff --git a/world/map/npc/028-1/portal.txt b/world/map/npc/028-1/portal.txt index 0b510214..15b783ff 100644 --- a/world/map/npc/028-1/portal.txt +++ b/world/map/npc/028-1/portal.txt @@ -1,5 +1,5 @@ //Leave GM Island -028-1,98,37,0|script|Exit|400,0,0, +028-1,98,37,0|script|Exit|400,0,0 { mes "[Exit]"; mes "Would you like to leave this place?"; diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt index 150ac53e..27b7d91e 100644 --- a/world/map/npc/028-3/_mobs.txt +++ b/world/map/npc/028-3/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // GM Island Cave mobs -028-3.gat,51,49,22,15|monster|Silkworm|1035,10,30000,3000,Mob028-3::On1035 -028-3.gat,43,35,1,1|monster|EvilMushroom|1013,3,40000,5000,Mob028-3::On1013 -028-3.gat,27,31,1,1|monster|EvilMushroom|1013,3,40000,5000,Mob028-3::On1013 -028-3.gat,50,49,61,60|monster|Bat|1017,10,60000,10000,Mob028-3::On1017 +028-3.gat,51,49,22,15|monster|Silkworm|1035,10,30000ms,3000ms,Mob028-3::On1035 +028-3.gat,43,35,1,1|monster|EvilMushroom|1013,3,40000ms,5000ms,Mob028-3::On1013 +028-3.gat,27,31,1,1|monster|EvilMushroom|1013,3,40000ms,5000ms,Mob028-3::On1013 +028-3.gat,50,49,61,60|monster|Bat|1017,10,60000ms,10000ms,Mob028-3::On1017 -028-3.gat,0,0,0|script|Mob028-3|-1, +028-3.gat,0,0,0|script|Mob028-3|-1 { end; diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt index 2836830c..e7ebba61 100644 --- a/world/map/npc/029-1/_mobs.txt +++ b/world/map/npc/029-1/_mobs.txt @@ -1,15 +1,15 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Candor Island mobs -029-1.gat,69,65,12,13|monster|EvilMushroom|1013,4,20000,60000,Mob029-1::On1013 -029-1.gat,32,33,12,13|monster|Squirrel|1038,3,30000,60000,Mob029-1::On1038 -029-1.gat,46,48,4,1|monster|CloverPatch|1037,1,10000,120000,Mob029-1::On1037 -029-1.gat,37,60,22,20|monster|SpikyMushroom|1019,5,10000,30000,Mob029-1::On1019 -029-1.gat,54,36,17,18|monster|Bat|1017,4,25000,30000,Mob029-1::On1017 -029-1.gat,59,51,13,9|monster|LogHead|1025,2,25000,30000,Mob029-1::On1025 +029-1.gat,69,65,12,13|monster|EvilMushroom|1013,4,20000ms,60000ms,Mob029-1::On1013 +029-1.gat,32,33,12,13|monster|Squirrel|1038,3,30000ms,60000ms,Mob029-1::On1038 +029-1.gat,46,48,4,1|monster|CloverPatch|1037,1,10000ms,120000ms,Mob029-1::On1037 +029-1.gat,37,60,22,20|monster|SpikyMushroom|1019,5,10000ms,30000ms,Mob029-1::On1019 +029-1.gat,54,36,17,18|monster|Bat|1017,4,25000ms,30000ms,Mob029-1::On1017 +029-1.gat,59,51,13,9|monster|LogHead|1025,2,25000ms,30000ms,Mob029-1::On1025 -029-1.gat,0,0,0|script|Mob029-1|-1, +029-1.gat,0,0,0|script|Mob029-1|-1 { end; diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt index 35347e59..b7d6b62c 100644 --- a/world/map/npc/029-1/barrier.txt +++ b/world/map/npc/029-1/barrier.txt @@ -1,4 +1,4 @@ -029-1.gat,54,37,0|script|#CandorBarrier|45,0,0, +029-1.gat,54,37,0|script|#CandorBarrier|45,0,0 { if ($@FIGHT_CAVE_STATUS == 1) goto L_Block; warp "029-3.gat", 46, 23; diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt index 8ab529e6..6f195f36 100644 --- a/world/map/npc/029-1/dock.txt +++ b/world/map/npc/029-1/dock.txt @@ -1,19 +1,19 @@ // The ferry dock // Ferry Sign -029-1.gat,27,36,0|script|Ferry Schedule#8|397, +029-1.gat,27,36,0|script|Ferry Schedule#8|397 { callfunc "FerryManifest"; end; } -029-1.gat,16,36,0|script|Candor Koga|395,6,2, +029-1.gat,16,36,0|script|Candor Koga|395,6,2 { callfunc "BoardCandorFerry"; close; } -029-1.gat,22,37,0|script|#CandorDock|127, +029-1.gat,22,37,0|script|#CandorDock|127 { end; OnCommandArrive: diff --git a/world/map/npc/029-1/traveler.txt b/world/map/npc/029-1/traveler.txt index 972d2506..9de43b14 100644 --- a/world/map/npc/029-1/traveler.txt +++ b/world/map/npc/029-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -029-1.gat,69,67,0|script|Knitra the Traveler|103, +029-1.gat,69,67,0|script|Knitra the Traveler|103 { set @NpcName$, "Knitra"; set @NpcTravelBit, $@candor_bit; diff --git a/world/map/npc/029-3/_mobs.txt b/world/map/npc/029-3/_mobs.txt index f321a294..0a4ee06e 100644 --- a/world/map/npc/029-3/_mobs.txt +++ b/world/map/npc/029-3/_mobs.txt @@ -3,7 +3,7 @@ -029-3.gat,0,0,0|script|Mob029-3|-1, +029-3.gat,0,0,0|script|Mob029-3|-1 { end; } diff --git a/world/map/npc/029-3/barrier.txt b/world/map/npc/029-3/barrier.txt index 454e59fe..27b472cf 100644 --- a/world/map/npc/029-3/barrier.txt +++ b/world/map/npc/029-3/barrier.txt @@ -1,4 +1,4 @@ -029-3.gat,46,21,0|script|#FightCaveBarrier|45,0,0, +029-3.gat,46,21,0|script|#FightCaveBarrier|45,0,0 { if ($@FIGHT_CAVE_STATUS == 1) goto L_Block; warp "029-1.gat", 54, 39; diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt index 90211d30..3047396e 100644 --- a/world/map/npc/029-3/parua.txt +++ b/world/map/npc/029-3/parua.txt @@ -1,5 +1,5 @@ // Parua's fight -029-3.gat,50,25,0|script|Parua|183, +029-3.gat,50,25,0|script|Parua|183 { set @FIGHT_CAVE_COST, 20000; set @FIGHT_CAVE_COST$, "20,000"; @@ -189,8 +189,8 @@ L_NextRound: areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnNewRound"; - mapannounce "029-1.gat", "Parua : The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; - mapannounce "029-3.gat", "Parua : The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; + mapannounce "029-1.gat", "Parua:* The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; + mapannounce "029-3.gat", "Parua:* The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; set $@MOB_1_SUMMON, 0; set $@MOB_2_SUMMON, 0; @@ -235,19 +235,19 @@ L_GlobalAnnounce: L_Five_Minutes: if ($@ANNOUNCE_TIME - gettimetick(2) > 300) end; - announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; + announce "Parua:* " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 2; end; L_Ten_Minutes: if ($@ANNOUNCE_TIME - gettimetick(2) > 600) end; - announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 10 minutes. Right now, there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; + announce "Parua:* " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 10 minutes. Right now, there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 3; end; L_Fifteen_Minutes: - announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 15 minutes, so prepare yourself and call your friends. At the moment there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; + announce "Parua:* " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 15 minutes, so prepare yourself and call your friends. At the moment there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 4; end; @@ -322,7 +322,7 @@ OnInit: L_CleanUp: npctalk "Game Over"; - mapannounce "029-1.gat", "Parua : The dungeon is now ready for its next victims.", 0; + mapannounce "029-1.gat", "Parua:* The dungeon is now ready for its next victims.", 0; areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnReward"; set $@FIGHT_CAVE_STATUS, 0; set $@FIGHT_CAVE_PLAYER_COUNT, 0; diff --git a/world/map/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt index ead52c98..45b7d067 100644 --- a/world/map/npc/030-1/_mobs.txt +++ b/world/map/npc/030-1/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Romantic Place mobs -030-1.gat,0,0,0,0|monster|Pollett|1113,7,100000,30000,Mob030-1::On1113 -030-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000,30000,Mob030-1::On1095 -030-1.gat,71,67,0,0|monster|Santaboo|1112,2,100000,30000,Mob030-1::On1112 -030-1.gat,71,67,0,0|monster|Reinboo|1094,2,100000,30000,Mob030-1::On1094 +030-1.gat,0,0,0,0|monster|Pollett|1113,7,100000ms,30000ms,Mob030-1::On1113 +030-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob030-1::On1095 +030-1.gat,71,67,0,0|monster|Santaboo|1112,2,100000ms,30000ms,Mob030-1::On1112 +030-1.gat,71,67,0,0|monster|Reinboo|1094,2,100000ms,30000ms,Mob030-1::On1094 -030-1.gat,0,0,0|script|Mob030-1|-1, +030-1.gat,0,0,0|script|Mob030-1|-1 { end; diff --git a/world/map/npc/030-2/_mobs.txt b/world/map/npc/030-2/_mobs.txt index 3a475565..98e36e84 100644 --- a/world/map/npc/030-2/_mobs.txt +++ b/world/map/npc/030-2/_mobs.txt @@ -3,7 +3,7 @@ -030-2.gat,0,0,0|script|Mob030-2|-1, +030-2.gat,0,0,0|script|Mob030-2|-1 { end; } diff --git a/world/map/npc/030-2/avalia.txt b/world/map/npc/030-2/avalia.txt index 970197a0..d3322b89 100644 --- a/world/map/npc/030-2/avalia.txt +++ b/world/map/npc/030-2/avalia.txt @@ -1,7 +1,7 @@ // Annual Xmas // Author: cinderweb, wushin -030-2.gat,198,61,0|script|Avalia|356, +030-2.gat,198,61,0|script|Avalia|356 { callfunc "XmasStates"; @@ -189,7 +189,7 @@ L_Close: close; } -030-2.gat,190,64,0|script|Milis|330, +030-2.gat,190,64,0|script|Milis|330 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/basic_npcs.txt b/world/map/npc/030-2/basic_npcs.txt index b8573912..9e78162f 100644 --- a/world/map/npc/030-2/basic_npcs.txt +++ b/world/map/npc/030-2/basic_npcs.txt @@ -3,7 +3,7 @@ // In the office -030-2.gat,37,81,0|script|Oswal|328, +030-2.gat,37,81,0|script|Oswal|328 { mes "[Oswal]"; mes "\"Welcome. I hope you enjoy your visit in Santa's residence. You already saw the workshop where the Christmas presents are crafted, right?\""; @@ -13,14 +13,14 @@ close; } -030-2.gat,37,85,0|script|Taito|328, +030-2.gat,37,85,0|script|Taito|328 { mes "[Taito]"; mes "\"Hello. I'm sorry, but I'm very busy at the moment and want to concentrate. If you have any questions, ask one of the other helpers.\""; close; } -030-2.gat,31,77,0|script|Rikhard|329, +030-2.gat,31,77,0|script|Rikhard|329 { mes "[Rikhard]"; mes "\"I'm really glad that this year's Christmas preparations are going well. You know, last year nearly everything went wrong, so we all had to work really hard on that, and the everyday issues had to be neglected.\""; @@ -35,7 +35,7 @@ close; } -030-2.gat,31,85,0|script|Akseli|329, +030-2.gat,31,85,0|script|Akseli|329 { mes "[Akseli]"; mes "\"Ah, a visitor! Do you enjoy your time in Santa's residence?\""; @@ -65,7 +65,7 @@ L_Close: // In the workshop -030-2.gat,78,34,0|script|Aaron|328, +030-2.gat,78,34,0|script|Aaron|328 { mes "[Aaron]"; mes "\"Welcome to Santa's famous Christmas workshop. Feel free to have a look around and talk to the craftsmen.\""; @@ -74,7 +74,7 @@ L_Close: close; } -030-2.gat,154,33,0|script|Iivo|329, +030-2.gat,154,33,0|script|Iivo|329 { mes "You see a helper cutting some leather pieces. He looks very focused on his work. Then he notices you."; mes "[Iivo]"; diff --git a/world/map/npc/030-2/bedding_helper.txt b/world/map/npc/030-2/bedding_helper.txt index 62fa6b34..c07105f0 100644 --- a/world/map/npc/030-2/bedding_helper.txt +++ b/world/map/npc/030-2/bedding_helper.txt @@ -3,7 +3,7 @@ // Osmo asks for some White Fur which is used for bedding some presents in the boxes // can be sabotaged by given Cloth instead -030-2.gat,37,77,0|script|Osmo|328, +030-2.gat,37,77,0|script|Osmo|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/chief_helper.txt b/world/map/npc/030-2/chief_helper.txt index 3c63ac14..0f361872 100644 --- a/world/map/npc/030-2/chief_helper.txt +++ b/world/map/npc/030-2/chief_helper.txt @@ -2,7 +2,7 @@ // author: Jenalya, wushin // Warrick is the Chief of Santa's helpers -030-2.gat,127,42,0|script|Chief Warrick|329, +030-2.gat,127,42,0|script|Chief Warrick|329 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt index 33c54bf6..96119fe4 100644 --- a/world/map/npc/030-2/eljas.txt +++ b/world/map/npc/030-2/eljas.txt @@ -1,7 +1,7 @@ // Annual Xmas and Year round info // Author: Jenalya, wushin -030-2.gat,87,41,0|script|Eljas|328,5,1, +030-2.gat,87,41,0|script|Eljas|328,5,1 { callfunc "XmasStates"; callfunc "ThrowOutTheBum"; diff --git a/world/map/npc/030-2/empty_boxes_helper.txt b/world/map/npc/030-2/empty_boxes_helper.txt index 248fb9d1..aabf07a2 100644 --- a/world/map/npc/030-2/empty_boxes_helper.txt +++ b/world/map/npc/030-2/empty_boxes_helper.txt @@ -3,7 +3,7 @@ // Urmas asks for raw logs to make empty presents boxes // later he can be asked for those boxes to put toys in -030-2.gat,140,41,0|script|Urmas|328, +030-2.gat,140,41,0|script|Urmas|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/gaurds.txt b/world/map/npc/030-2/gaurds.txt index c0f30e76..3fdc1ffa 100644 --- a/world/map/npc/030-2/gaurds.txt +++ b/world/map/npc/030-2/gaurds.txt @@ -1,6 +1,6 @@ // Annual Xmas Bouncers -030-2.gat,85,43,0|script|Valjas|330, +030-2.gat,85,43,0|script|Valjas|330 { callfunc "XmasStates"; callfunc "ThrowOutTheBum"; @@ -9,7 +9,7 @@ close; } -030-2.gat,89,43,0|script|Halas|330, +030-2.gat,89,43,0|script|Halas|330 { callfunc "XmasStates"; callfunc "ThrowOutTheBum"; @@ -18,7 +18,7 @@ close; } -030-2.gat,89,84,0|script|Kilis|330,5,2, +030-2.gat,89,84,0|script|Kilis|330,5,2 { callfunc "XmasStates"; callfunc "ThrowOutTheBum"; diff --git a/world/map/npc/030-2/glitter_helper.txt b/world/map/npc/030-2/glitter_helper.txt index c4ee84bb..e0637675 100644 --- a/world/map/npc/030-2/glitter_helper.txt +++ b/world/map/npc/030-2/glitter_helper.txt @@ -3,7 +3,7 @@ // Veneri asks for Diamond Powder and Ruby Powder for decoration // can be sabotaged with Red Powder and Yellow Powder, Saboteur can make that out of Wisp and Spectre Powder -030-2.gat,31,81,0|script|Veneri|328, +030-2.gat,31,81,0|script|Veneri|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/present_helper.txt b/world/map/npc/030-2/present_helper.txt index ca4246e2..248c296a 100644 --- a/world/map/npc/030-2/present_helper.txt +++ b/world/map/npc/030-2/present_helper.txt @@ -2,7 +2,7 @@ // Author: wushin // Present Reclaimation -030-2.gat,47,82,0|script|Jonanthan|328, +030-2.gat,47,82,0|script|Jonanthan|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/roasted_acrons_helper.txt b/world/map/npc/030-2/roasted_acrons_helper.txt index 2c901153..f942c118 100644 --- a/world/map/npc/030-2/roasted_acrons_helper.txt +++ b/world/map/npc/030-2/roasted_acrons_helper.txt @@ -1,7 +1,7 @@ // Annual Xmas // author: Jenalya, wushin -030-2.gat,89,23,0|script|Verneri|334, +030-2.gat,89,23,0|script|Verneri|334 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/shipping_helper.txt b/world/map/npc/030-2/shipping_helper.txt index 29a0ae26..e7f7b2f0 100644 --- a/world/map/npc/030-2/shipping_helper.txt +++ b/world/map/npc/030-2/shipping_helper.txt @@ -1,28 +1,28 @@ // Annual Xmas // Author: Jenalya, wushin -030-2.gat,30,88,0|script|Mo|328, +030-2.gat,30,88,0|script|Mo|328 { set $@npc_name$, "Mo"; callfunc "helpersPacking"; close; } -030-2.gat,33,88,0|script|Lorrie|329, +030-2.gat,33,88,0|script|Lorrie|329 { set $@npc_name$, "Lorrie"; callfunc "helpersPacking"; close; } -030-2.gat,37,88,0|script|Curlee|329, +030-2.gat,37,88,0|script|Curlee|329 { set $@npc_name$, "Curlee"; callfunc "helpersPacking"; close; } -function|script|helpersPacking|, +function|script|helpersPacking { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/storage_helper.txt b/world/map/npc/030-2/storage_helper.txt index 092d9a7d..1767ceaf 100644 --- a/world/map/npc/030-2/storage_helper.txt +++ b/world/map/npc/030-2/storage_helper.txt @@ -1,7 +1,7 @@ // Annual Christmas // author: Jenalya, wushin -030-2.gat,25,35,0|script|Vellamo|328, +030-2.gat,25,35,0|script|Vellamo|328 { set @halloween_npc_id, $@halloween_npc_vellamo; callfunc "TrickOrTreat"; @@ -50,7 +50,7 @@ L_Close: close; } -030-2.gat,33,29,0|script|Ismo|329, +030-2.gat,33,29,0|script|Ismo|329 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/wrapping_paper_helper.txt b/world/map/npc/030-2/wrapping_paper_helper.txt index dcd5a36e..75198417 100644 --- a/world/map/npc/030-2/wrapping_paper_helper.txt +++ b/world/map/npc/030-2/wrapping_paper_helper.txt @@ -3,7 +3,7 @@ // also for some dyes to make them colorful // later he can be asked for those papers to wrap boxes -030-2.gat,140,31,0|script|Reino|328, +030-2.gat,140,31,0|script|Reino|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-3/_mobs.txt b/world/map/npc/030-3/_mobs.txt index 813981c6..34271cbf 100644 --- a/world/map/npc/030-3/_mobs.txt +++ b/world/map/npc/030-3/_mobs.txt @@ -3,7 +3,7 @@ -030-3.gat,0,0,0|script|Mob030-3|-1, +030-3.gat,0,0,0|script|Mob030-3|-1 { end; } diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt index 85e825a9..ee325875 100644 --- a/world/map/npc/030-3/orum_homunculus.txt +++ b/world/map/npc/030-3/orum_homunculus.txt @@ -1,7 +1,7 @@ // Annual Xmas // Authors: Wushin, Chayenne -019-3.gat,79,30,0|script|#OrumTelepathy1|45,3,3, +019-3.gat,79,30,0|script|#OrumTelepathy1|45,3,3 { callfunc "XmasStates"; @@ -24,7 +24,7 @@ L_End: end; } -019-3.gat,104,67,0|script|#OrumTelepathy2|45,1,1, +019-3.gat,104,67,0|script|#OrumTelepathy2|45,1,1 { callfunc "XmasStates"; @@ -47,7 +47,7 @@ L_End: end; } -019-3.gat,102,95,0|script|#OrumTelepathy3|45,3,3, +019-3.gat,102,95,0|script|#OrumTelepathy3|45,3,3 { callfunc "XmasStates"; @@ -70,7 +70,7 @@ L_End: end; } -019-3.gat,81,61,0|script|#OrumTelepathy4|45,3,3, +019-3.gat,81,61,0|script|#OrumTelepathy4|45,3,3 { callfunc "XmasStates"; @@ -93,7 +93,7 @@ L_End: end; } -030-3.gat,62,74,0|script|#OrumTelepathy5|45,1,1, +030-3.gat,62,74,0|script|#OrumTelepathy5|45,1,1 { callfunc "XmasStates"; @@ -116,7 +116,7 @@ L_End: end; } -030-3.gat,48,73,0|script|#OrumTelepathy6|45,1,1, +030-3.gat,48,73,0|script|#OrumTelepathy6|45,1,1 { callfunc "XmasStates"; @@ -139,7 +139,7 @@ L_End: end; } -030-3.gat,55,52,0|script|#OrumTelepathy7|45,1,1, +030-3.gat,55,52,0|script|#OrumTelepathy7|45,1,1 { callfunc "XmasStates"; @@ -162,7 +162,7 @@ L_End: end; } -030-3.gat,28,28,0|script|Orum's Homunculus|385, +030-3.gat,28,28,0|script|Orum's Homunculus|385 { callfunc "XmasStates"; diff --git a/world/map/npc/030-4/_mobs.txt b/world/map/npc/030-4/_mobs.txt index 141e900b..e96f8519 100644 --- a/world/map/npc/030-4/_mobs.txt +++ b/world/map/npc/030-4/_mobs.txt @@ -3,7 +3,7 @@ -030-4.gat,0,0,0|script|Mob030-4|-1, +030-4.gat,0,0,0|script|Mob030-4|-1 { end; } diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt index 6f59d10e..ed6101a7 100644 --- a/world/map/npc/030-4/mana_battery.txt +++ b/world/map/npc/030-4/mana_battery.txt @@ -21,7 +21,7 @@ //TODO Add an icreasing particle effect to the chest, move it half a tile right // and make it one of those lab tables from the slime quests -030-4.gat,32,21,0|script|AniManOMat|400, +030-4.gat,32,21,0|script|AniManOMat|400 { set $@XmasBattleStatusClone, 0; callfunc "XmasStates"; @@ -361,33 +361,33 @@ L_Restart: "Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch", "Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch", "Avalia: I am getting a weird sensation ... ", - "Orums Homunculus : I think they know what we are up to!", - "Avalia : Oh no! This is going to blow up", - "Orums Homunculus : The Door is locked you idiot, fight for your life.", - "Avalia : Guards of Honor I demand you: STOP!", - "Orums Homunculus : Okay, this is somewhat funny... why are they coming back?!?", - "Avalia : You brave fighters! Deactivate the nutcrackers! they are out of control!", - "Orums Homunculus : The good news is: if we make it this time we will never have to do that again!", - "Avalia : Oh boy we are so screwed.", - "Orums Homunculus : Report: I am an Idiot", - "Avalia : Quick, we need to kill the nutcrackers, before they ruin everything we've been working for.", - "Orums Homunculus : Strange they are getting more and not less.", - "Avalia : Oh no, they are too powerful. Fight my warriors, Fight for the spirit of Christmas.", - "Orums Homunculus : If I was smart enough to stop talking, it would have happened already..", - "Avalia : I cannot believe it, this is making them stronger. More and more of them are coming.", - "Orums Homunculus : I think we are almost done, the bomb should explode any second.", - "Avalia : Those poor creatures. Just kill them all.", - "Orums Homunculus : A N Y S E C O N D.", - "Avalia : Oh well... just try again, I trust in you.", - "Orum's Homunculus : just lol.", - "Avalia : Wow! You saved christmas.", - "Orum's Homunculus : Yep, it's over... and strange enough you survived."; + "Orums Homunculus:* I think they know what we are up to!", + "Avalia:* Oh no! This is going to blow up", + "Orums Homunculus:* The Door is locked you idiot, fight for your life.", + "Avalia:* Guards of Honor I demand you: STOP!", + "Orums Homunculus:* Okay, this is somewhat funny... why are they coming back?!?", + "Avalia:* You brave fighters! Deactivate the nutcrackers! they are out of control!", + "Orums Homunculus:* The good news is: if we make it this time we will never have to do that again!", + "Avalia:* Oh boy we are so screwed.", + "Orums Homunculus:* Report: I am an Idiot", + "Avalia:* Quick, we need to kill the nutcrackers, before they ruin everything we've been working for.", + "Orums Homunculus:* Strange they are getting more and not less.", + "Avalia:* Oh no, they are too powerful. Fight my warriors, Fight for the spirit of Christmas.", + "Orums Homunculus:* If I was smart enough to stop talking, it would have happened already..", + "Avalia:* I cannot believe it, this is making them stronger. More and more of them are coming.", + "Orums Homunculus:* I think we are almost done, the bomb should explode any second.", + "Avalia:* Those poor creatures. Just kill them all.", + "Orums Homunculus:* A N Y S E C O N D.", + "Avalia:* Oh well... just try again, I trust in you.", + "Orum's Homunculus:* just lol.", + "Avalia:* Wow! You saved christmas.", + "Orum's Homunculus:* Yep, it's over... and strange enough you survived."; setarray $@xmas_final_announce$, - "Avalia : Oh no, not only did you slay half my Guard of Honour, but also the issue was not fixed, try to install the battery again!", - "Orum's Homunculus : Boy are you lame. So what now? The battery is still not placed! Go try again!", - "Avalia : W00t you actually made it through. I think now that the manabattery lost some of its abundant power this seems to have given those nutcrackers that didn't go crazy a good boost of life energy. Thank you for your help all and come see me for a reward.", - "Orum's Homunculus : Good. They are dead. Now GET OUT OF THERE, this bomb is dangerous!"; + "Avalia:* Oh no, not only did you slay half my Guard of Honour, but also the issue was not fixed, try to install the battery again!", + "Orum's Homunculus:* Boy are you lame. So what now? The battery is still not placed! Go try again!", + "Avalia:* W00t you actually made it through. I think now that the manabattery lost some of its abundant power this seems to have given those nutcrackers that didn't go crazy a good boost of life energy. Thank you for your help all and come see me for a reward.", + "Orum's Homunculus:* Good. They are dead. Now GET OUT OF THERE, this bomb is dangerous!"; // Danger Cells to attack sitters // 0: 19,20,29,29 // 1: 30,20,40,29 @@ -438,7 +438,7 @@ S_ClearVariables: return; } -030-4.gat,0,0,0|script|#XmasChamberCooler|-1, +030-4.gat,0,0,0|script|#XmasChamberCooler|-1 { end; OnCommandCoolDown: diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt index e8e6c77b..73ef1579 100644 --- a/world/map/npc/031-1/_mobs.txt +++ b/world/map/npc/031-1/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Nivalis Port mobs -031-1.gat,0,0,0,0|monster|Fluffy|1020,10,100000,30000,Mob031-1::On1020 -031-1.gat,0,0,0,0|monster|Pollett|1113,7,100000,30000,Mob031-1::On1113 -031-1.gat,76,26,10,5|monster|WhiteSlime|1093,7,100000,30000,Mob031-1::On1093 -031-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000,30000,Mob031-1::On1095 +031-1.gat,0,0,0,0|monster|Fluffy|1020,10,100000ms,30000ms,Mob031-1::On1020 +031-1.gat,0,0,0,0|monster|Pollett|1113,7,100000ms,30000ms,Mob031-1::On1113 +031-1.gat,76,26,10,5|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-1::On1093 +031-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob031-1::On1095 -031-1.gat,0,0,0|script|Mob031-1|-1, +031-1.gat,0,0,0|script|Mob031-1|-1 { end; diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt index 60e156f0..bec0988b 100644 --- a/world/map/npc/031-1/angelaOutside.txt +++ b/world/map/npc/031-1/angelaOutside.txt @@ -4,7 +4,7 @@ // state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward // state greater than 3: Angela invites and asks you to bring present boxes -031-1.gat,79,24,0|script|Angela|195, +031-1.gat,79,24,0|script|Angela|195 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt index a8711403..48d32d8e 100644 --- a/world/map/npc/031-1/dock.txt +++ b/world/map/npc/031-1/dock.txt @@ -1,19 +1,19 @@ // The ferry dock // Ferry Sign -031-1.gat,95,107,0|script|Ferry Schedule#6|398, +031-1.gat,95,107,0|script|Ferry Schedule#6|398 { callfunc "FerryManifest"; end; } -031-1.gat,110,108,0|script|Nivalis Koga|395,6,2, +031-1.gat,110,108,0|script|Nivalis Koga|395,6,2 { callfunc "BoardFerry"; close; } -031-1.gat,100,100,0|script|#NivalisDock|127, +031-1.gat,100,100,0|script|#NivalisDock|127 { end; diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt index 6a62a104..e05b3d67 100644 --- a/world/map/npc/031-1/frozenbeard.txt +++ b/world/map/npc/031-1/frozenbeard.txt @@ -1,6 +1,6 @@ // -031-1.gat,96,113,0|script|Frozenbeard|138, +031-1.gat,96,113,0|script|Frozenbeard|138 { mes "[Frozenbeard]"; diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt index 3d250e4e..e9bd33c0 100644 --- a/world/map/npc/031-1/house.txt +++ b/world/map/npc/031-1/house.txt @@ -2,7 +2,7 @@ // player can enter, if Cindy is already saved and the player has been invited, quest status > 2 // author: Jenalya -031-1.gat,95,80,0|script|#Door|45,0,0, +031-1.gat,95,80,0|script|#Door|45,0,0 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-2/_mobs.txt b/world/map/npc/031-2/_mobs.txt index d942f137..cbae1df2 100644 --- a/world/map/npc/031-2/_mobs.txt +++ b/world/map/npc/031-2/_mobs.txt @@ -3,7 +3,7 @@ -031-2.gat,0,0,0|script|Mob031-2|-1, +031-2.gat,0,0,0|script|Mob031-2|-1 { end; } diff --git a/world/map/npc/031-2/angelaHouse.txt b/world/map/npc/031-2/angelaHouse.txt index 1b3ccb0a..24759211 100644 --- a/world/map/npc/031-2/angelaHouse.txt +++ b/world/map/npc/031-2/angelaHouse.txt @@ -3,7 +3,7 @@ // state3: it's your first visit, you can choose a reward // state4: you can do daily quests with white and yellow presents boxes -031-2.gat,29,28,0|script|Angela#house|196, +031-2.gat,29,28,0|script|Angela#house|196 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt index 277d2380..34e84863 100644 --- a/world/map/npc/031-2/cindyHouse.txt +++ b/world/map/npc/031-2/cindyHouse.txt @@ -2,7 +2,7 @@ // state0,1,2: you shouldn't be able to reach this place // state3 and greater: Cindy is saved, she says one of some random phrases -031-2.gat,27,26,0|script|Cindy#house|197, +031-2.gat,27,26,0|script|Cindy#house|197 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt index 324df76e..95977bee 100644 --- a/world/map/npc/031-3/_mobs.txt +++ b/world/map/npc/031-3/_mobs.txt @@ -1,98 +1,98 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Ice Labyrinth mobs -031-3.gat,230,279,25,26|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058 -031-3.gat,195,277,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058 -031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017 -031-3.gat,37,213,27,23|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072 -031-3.gat,35,212,27,23|monster|Bat|1017,11,100000,30000,Mob031-3::On1017 -031-3.gat,38,147,44,68|monster|Moggun|1061,19,100000,30000,Mob031-3::On1061 -031-3.gat,97,261,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061 -031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061 -031-3.gat,36,148,64,43|monster|Bat|1017,11,100000,30000,Mob031-3::On1017 -031-3.gat,97,277,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017 -031-3.gat,148,282,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017 -031-3.gat,145,293,25,26|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058 -031-3.gat,98,214,39,44|monster|IceElement|1071,2,100000,30000,Mob031-3::On1071 -031-3.gat,99,214,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058 -031-3.gat,198,144,29,53|monster|IceGoblin|1058,4,100000,30000,Mob031-3::On1058 -031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061 -031-3.gat,278,282,33,14|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058 -031-3.gat,98,214,39,44|monster|IceElement|1071,2,100000,30000,Mob031-3::On1071 -031-3.gat,285,218,8,75|monster|IceElement|1071,2,100000,30000,Mob031-3::On1071 -031-3.gat,283,217,41,64|monster|Bat|1017,15,100000,30000,Mob031-3::On1017 -031-3.gat,282,237,63,20|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061 -031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061 -031-3.gat,229,226,27,34|monster|Yeti|1072,3,100000,30000,Mob031-3::On1072 -031-3.gat,230,227,12,42|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058 -031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072 -031-3.gat,193,216,12,17|monster|Yeti|1072,1,100000,30000,Mob031-3::On1072 -031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017 -031-3.gat,213,282,66,43|monster|Pollett|1113,5,100000,30000,Mob031-3::On1113 -031-3.gat,199,200,45,14|monster|Bat|1017,13,100000,30000,Mob031-3::On1017 -031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072 -031-3.gat,234,141,18,19|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072 -031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061 -031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061 -031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061 -031-3.gat,212,130,62,16|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061 -031-3.gat,284,143,40,48|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061 -031-3.gat,283,84,36,31|monster|Bat|1017,15,100000,30000,Mob031-3::On1017 -031-3.gat,283,84,36,31|monster|Bat|1017,15,100000,30000,Mob031-3::On1017 -031-3.gat,274,81,15,32|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072 -031-3.gat,40,53,44,68|monster|Moggun|1061,10,100000,30000,Mob031-3::On1061 -031-3.gat,120,160,85,30|monster|Yeti|1072,4,100000,30000,Mob031-3::On1072 -031-3.gat,121,131,82,24|monster|Yeti|1072,8,100000,30000,Mob031-3::On1072 -031-3.gat,107,130,25,26|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058 -031-3.gat,145,160,25,24|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058 -031-3.gat,94,167,25,24|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058 -031-3.gat,282,37,31,28|monster|IceElement|1071,5,100000,30000,Mob031-3::On1071 -031-3.gat,213,36,64,32|monster|IceElement|1071,5,100000,30000,Mob031-3::On1071 -031-3.gat,228,83,31,28|monster|IceElement|1071,3,100000,30000,Mob031-3::On1071 -031-3.gat,283,138,15,13|monster|IceElement|1071,1,100000,30000,Mob031-3::On1071 -031-3.gat,198,83,31,28|monster|IceElement|1071,3,100000,30000,Mob031-3::On1071 -031-3.gat,214,75,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058 -031-3.gat,217,37,66,43|monster|Bat|1017,10,100000,30000,Mob031-3::On1017 -031-3.gat,39,52,64,56|monster|Bat|1017,5,100000,30000,Mob031-3::On1017 -031-3.gat,39,274,64,56|monster|Bat|1017,10,100000,30000,Mob031-3::On1017 -031-3.gat,119,51,39,64|monster|Bat|1017,10,100000,30000,Mob031-3::On1017 -031-3.gat,119,50,57,51|monster|IceElement|1071,5,100000,30000,Mob031-3::On1071 -031-3.gat,120,79,20,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072 -031-3.gat,37,284,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,28,255,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091 -031-3.gat,212,277,14,9|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,289,295,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,292,288,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091 -031-3.gat,296,233,7,6|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,271,222,7,6|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,281,215,55,21|monster|BlueSlime|1091,5,100000,30000,Mob031-3::On1091 -031-3.gat,126,35,6,5|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,143,124,34,22|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091 -031-3.gat,48,65,14,9|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,37,113,5,13|monster|BlueSlime|1091,1,100000,30000,Mob031-3::On1091 -031-3.gat,136,227,14,9|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,152,218,13,17|monster|BlueSlime|1091,4,100000,30000,Mob031-3::On1091 -031-3.gat,135,206,9,6|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,154,202,7,7|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,136,216,6,4|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091 -031-3.gat,112,276,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,143,294,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,149,268,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,136,264,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,157,283,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,139,264,25,19|monster|BlueSlime|1091,4,100000,30000,Mob031-3::On1091 -031-3.gat,24,265,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,52,280,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,37,254,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,24,290,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,48,298,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,53,260,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093 -031-3.gat,23,275,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091 -031-3.gat,37,272,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091 -031-3.gat,52,285,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091 +031-3.gat,230,279,25,26|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,195,277,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,213,282,66,43|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,37,213,27,23|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,35,212,27,23|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,38,147,44,68|monster|Moggun|1061,19,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,97,261,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,36,148,64,43|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,97,277,22,42|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,148,282,22,42|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,145,293,25,26|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,98,214,39,44|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,99,214,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,198,144,29,53|monster|IceGoblin|1058,4,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,278,282,33,14|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,98,214,39,44|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,285,218,8,75|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,283,217,41,64|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,282,237,63,20|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,229,226,27,34|monster|Yeti|1072,3,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,230,227,12,42|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,193,216,12,17|monster|Yeti|1072,1,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,213,282,66,43|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,213,282,66,43|monster|Pollett|1113,5,100000ms,30000ms,Mob031-3::On1113 +031-3.gat,199,200,45,14|monster|Bat|1017,13,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,234,141,18,19|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,212,130,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,284,143,40,48|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,283,84,36,31|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,283,84,36,31|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,274,81,15,32|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,40,53,44,68|monster|Moggun|1061,10,100000ms,30000ms,Mob031-3::On1061 +031-3.gat,120,160,85,30|monster|Yeti|1072,4,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,121,131,82,24|monster|Yeti|1072,8,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,107,130,25,26|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,145,160,25,24|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,94,167,25,24|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,282,37,31,28|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,213,36,64,32|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,228,83,31,28|monster|IceElement|1071,3,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,283,138,15,13|monster|IceElement|1071,1,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,198,83,31,28|monster|IceElement|1071,3,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,214,75,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058 +031-3.gat,217,37,66,43|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,39,52,64,56|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,39,274,64,56|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,119,51,39,64|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017 +031-3.gat,119,50,57,51|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071 +031-3.gat,120,79,20,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072 +031-3.gat,37,284,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,28,255,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,212,277,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,289,295,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,292,288,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,296,233,7,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,271,222,7,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,281,215,55,21|monster|BlueSlime|1091,5,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,126,35,6,5|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,143,124,34,22|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,48,65,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,37,113,5,13|monster|BlueSlime|1091,1,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,136,227,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,152,218,13,17|monster|BlueSlime|1091,4,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,135,206,9,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,154,202,7,7|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,136,216,6,4|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,112,276,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,143,294,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,149,268,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,136,264,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,157,283,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,139,264,25,19|monster|BlueSlime|1091,4,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,24,265,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,52,280,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,37,254,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,24,290,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,48,298,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,53,260,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093 +031-3.gat,23,275,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,37,272,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091 +031-3.gat,52,285,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091 -031-3.gat,0,0,0|script|Mob031-3|-1, +031-3.gat,0,0,0|script|Mob031-3|-1 { end; diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt index 6fc31fad..465ba55a 100644 --- a/world/map/npc/031-3/labyrinth.txt +++ b/world/map/npc/031-3/labyrinth.txt @@ -1,7 +1,7 @@ // Conditional warp for yeti cave // Authors: Jenalya -031-3.gat,46,24,0|script|#YetiBarrier-outside|45,0,0, +031-3.gat,46,24,0|script|#YetiBarrier-outside|45,0,0 { if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked; warp "031-4.gat", 40, 70; diff --git a/world/map/npc/031-4/_mobs.txt b/world/map/npc/031-4/_mobs.txt index 5bc52ad0..830f461a 100644 --- a/world/map/npc/031-4/_mobs.txt +++ b/world/map/npc/031-4/_mobs.txt @@ -3,7 +3,7 @@ -031-4.gat,0,0,0|script|Mob031-4|-1, +031-4.gat,0,0,0|script|Mob031-4|-1 { end; } diff --git a/world/map/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt index 460a3985..49157e6f 100644 --- a/world/map/npc/031-4/barrier.txt +++ b/world/map/npc/031-4/barrier.txt @@ -1,4 +1,4 @@ -031-4.gat,40,71,0|script|#YetiBarrier-inside|45,0,0, +031-4.gat,40,71,0|script|#YetiBarrier-inside|45,0,0 { if ($@FIGHT_YETI_STATUS == 1) goto L_Block; warp "031-3.gat", 46, 25; diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index d7d16155..de9062fd 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -4,7 +4,7 @@ // state2: Cindy is saved, she gives you a reward (wizard hat or wooden staff) // state3: and greater: Cindy is saved, she asks you to visit them -031-4.gat,42,42,0|script|Cindy|198, +031-4.gat,42,42,0|script|Cindy|198 { if ($@FIGHT_YETI_STATUS != 0) goto L_Yeti; @@ -238,17 +238,17 @@ L_End: OnInit: setarray $@FIGHT_YETI_MESSAGES$, "", // unused - // " : " is magic so that it says "global announcement from" - "Cindy : Yetis!", - "Cindy : Watch out!", - "Cindy : More of them are coming!", - "Cindy : Be careful! More of them!", - "Cindy : Attention! There is another bunch of them!", - "Cindy : Hang on! More of them!", - "Cindy : More Yetis! Will this never end?", - "Cindy : There are coming more and more!", - "Cindy : Watch your back! There are so many of them!", - "Cindy : This seems to be their final attack! I believe in you!"; + // ":* " is magic so that it says "global announcement from" + "Cindy:* Yetis!", + "Cindy:* Watch out!", + "Cindy:* More of them are coming!", + "Cindy:* Be careful! More of them!", + "Cindy:* Attention! There is another bunch of them!", + "Cindy:* Hang on! More of them!", + "Cindy:* More Yetis! Will this never end?", + "Cindy:* There are coming more and more!", + "Cindy:* Watch your back! There are so many of them!", + "Cindy:* This seems to be their final attack! I believe in you!"; end; ///////// diff --git a/world/map/npc/032-1/_mobs.txt b/world/map/npc/032-1/_mobs.txt index 7aa84870..5c41b90a 100644 --- a/world/map/npc/032-1/_mobs.txt +++ b/world/map/npc/032-1/_mobs.txt @@ -1,14 +1,14 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Outback mobs -032-1.gat,47,64,27,15|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009 -032-1.gat,24,72,27,24|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009 -032-1.gat,24,48,25,21|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009 -032-1.gat,57,44,23,18|monster|Snake|1010,13,30000,100000,Mob032-1::On1010 -032-1.gat,77,76,34,27|monster|Snake|1010,13,30000,100000,Mob032-1::On1010 +032-1.gat,47,64,27,15|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-1::On1009 +032-1.gat,24,72,27,24|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-1::On1009 +032-1.gat,24,48,25,21|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-1::On1009 +032-1.gat,57,44,23,18|monster|Snake|1010,13,30000ms,100000ms,Mob032-1::On1010 +032-1.gat,77,76,34,27|monster|Snake|1010,13,30000ms,100000ms,Mob032-1::On1010 -032-1.gat,0,0,0|script|Mob032-1|-1, +032-1.gat,0,0,0|script|Mob032-1|-1 { end; diff --git a/world/map/npc/032-1/miriam.txt b/world/map/npc/032-1/miriam.txt index 531c9d56..d4daaafd 100644 --- a/world/map/npc/032-1/miriam.txt +++ b/world/map/npc/032-1/miriam.txt @@ -18,7 +18,7 @@ // after you gained the speed skill, all variables are reset to zero. //############################################# -032-1.gat,55,20,0|script|Miriam|175, +032-1.gat,55,20,0|script|Miriam|175 { if (getskilllv(SKILL_SPEED)) goto L_fast; if (getequipid(equip_torso) < 0) goto L_naked; diff --git a/world/map/npc/032-3/_mobs.txt b/world/map/npc/032-3/_mobs.txt index 2836eba7..07120f5a 100644 --- a/world/map/npc/032-3/_mobs.txt +++ b/world/map/npc/032-3/_mobs.txt @@ -1,19 +1,19 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Outback Cave mobs -032-3.gat,90,44,9,10|monster|Skeleton|1043,3,30000,100000,Mob032-3::On1043 -032-3.gat,44,23,29,22|monster|MountainSnake|1026,7,30000,100000,Mob032-3::On1026 -032-3.gat,125,46,35,75|monster|Snake|1010,13,30000,100000,Mob032-3::On1010 -032-3.gat,80,44,9,10|monster|BlackScorpion|1009,5,30000,100000,Mob032-3::On1009 -032-3.gat,85,33,9,10|monster|Spider|1012,5,30000,100000,Mob032-3::On1012 -032-3.gat,83,18,37,9|monster|Archant|1060,8,30000,100000,Mob032-3::On1060 -032-3.gat,78,76,24,21|monster|Archant|1060,8,30000,100000,Mob032-3::On1060 -032-3.gat,25,76,24,21|monster|YellowSlime|1007,11,300000,1000000,Mob032-3::On1007 -032-3.gat,46,51,34,18|monster|CaveMaggot|1056,11,30000,100000,Mob032-3::On1056 -032-3.gat,0,0,0,0|monster|Bat|1017,25,30000,100000,Mob032-3::On1017 +032-3.gat,90,44,9,10|monster|Skeleton|1043,3,30000ms,100000ms,Mob032-3::On1043 +032-3.gat,44,23,29,22|monster|MountainSnake|1026,7,30000ms,100000ms,Mob032-3::On1026 +032-3.gat,125,46,35,75|monster|Snake|1010,13,30000ms,100000ms,Mob032-3::On1010 +032-3.gat,80,44,9,10|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-3::On1009 +032-3.gat,85,33,9,10|monster|Spider|1012,5,30000ms,100000ms,Mob032-3::On1012 +032-3.gat,83,18,37,9|monster|Archant|1060,8,30000ms,100000ms,Mob032-3::On1060 +032-3.gat,78,76,24,21|monster|Archant|1060,8,30000ms,100000ms,Mob032-3::On1060 +032-3.gat,25,76,24,21|monster|YellowSlime|1007,11,300000ms,1000000ms,Mob032-3::On1007 +032-3.gat,46,51,34,18|monster|CaveMaggot|1056,11,30000ms,100000ms,Mob032-3::On1056 +032-3.gat,0,0,0,0|monster|Bat|1017,25,30000ms,100000ms,Mob032-3::On1017 -032-3.gat,0,0,0|script|Mob032-3|-1, +032-3.gat,0,0,0|script|Mob032-3|-1 { end; diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt index d60f0663..909d6bc3 100644 --- a/world/map/npc/033-1/_mobs.txt +++ b/world/map/npc/033-1/_mobs.txt @@ -1,13 +1,13 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // snow Path mobs -033-1.gat,73,49,10,18|monster|Wolvern|1090,2,100000,30000,Mob033-1::On1090 -033-1.gat,33,38,15,49|monster|Reinboo|1094,3,100000,30000,Mob033-1::On1094 -033-1.gat,56,87,50,42|monster|Squirrel|1038,15,100000,30000,Mob033-1::On1038 -033-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000,30000,Mob033-1::On1095 +033-1.gat,73,49,10,18|monster|Wolvern|1090,2,100000ms,30000ms,Mob033-1::On1090 +033-1.gat,33,38,15,49|monster|Reinboo|1094,3,100000ms,30000ms,Mob033-1::On1094 +033-1.gat,56,87,50,42|monster|Squirrel|1038,15,100000ms,30000ms,Mob033-1::On1038 +033-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob033-1::On1095 -033-1.gat,0,0,0|script|Mob033-1|-1, +033-1.gat,0,0,0|script|Mob033-1|-1 { end; diff --git a/world/map/npc/033-1/backDoor.txt b/world/map/npc/033-1/backDoor.txt index 9f40bb5c..425e4db5 100644 --- a/world/map/npc/033-1/backDoor.txt +++ b/world/map/npc/033-1/backDoor.txt @@ -1,4 +1,4 @@ -033-1.gat,86,28,0|script|#KimarrBackDoor|45,0,0, +033-1.gat,86,28,0|script|#KimarrBackDoor|45,0,0 { if ($@Fluffy_Hunting == 0) goto L_Warp; diff --git a/world/map/npc/033-1/barbarianinit.txt b/world/map/npc/033-1/barbarianinit.txt index f8a1423a..bf044bab 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|-1 { end; diff --git a/world/map/npc/033-1/birrod.txt b/world/map/npc/033-1/birrod.txt index 2437101a..d24c6387 100644 --- a/world/map/npc/033-1/birrod.txt +++ b/world/map/npc/033-1/birrod.txt @@ -1,4 +1,4 @@ -033-1.gat,72,27,0|script|Birrod|217, +033-1.gat,72,27,0|script|Birrod|217 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt index a5a066bd..776f22bd 100644 --- a/world/map/npc/033-1/kimarr.txt +++ b/world/map/npc/033-1/kimarr.txt @@ -32,7 +32,7 @@ // that's the only reason I didn't make that one a local variable like it really is -033-1.gat,74,32,0|script|Kimarr|218, +033-1.gat,74,32,0|script|Kimarr|218 { set @halloween_npc_id, $@halloween_npc_kimarr; callfunc "TrickOrTreat"; diff --git a/world/map/npc/033-1/traveler.txt b/world/map/npc/033-1/traveler.txt index 569114f8..c89a8985 100644 --- a/world/map/npc/033-1/traveler.txt +++ b/world/map/npc/033-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -033-1.gat,63,30,0|script|Khoenan the Traveler|103, +033-1.gat,63,30,0|script|Khoenan the Traveler|103 { set @NpcName$, "Khoenan"; set @NpcTravelBit, $@barbarians_bit; diff --git a/world/map/npc/033-1/yerrnk.txt b/world/map/npc/033-1/yerrnk.txt index e04a8610..f69f3aac 100644 --- a/world/map/npc/033-1/yerrnk.txt +++ b/world/map/npc/033-1/yerrnk.txt @@ -1,4 +1,4 @@ -033-1.gat,66,28,0|script|Yerrnk|216, +033-1.gat,66,28,0|script|Yerrnk|216 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); diff --git a/world/map/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt index 0ecdbf8e..70d6e061 100644 --- a/world/map/npc/034-1/_mobs.txt +++ b/world/map/npc/034-1/_mobs.txt @@ -1,14 +1,14 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Snow Forest mobs -034-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000,30000,Mob034-1::On1094 -034-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000,30000,Mob034-1::On1020 -034-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob034-1::On1095 -034-1.gat,0,0,0,0|monster|Squirrel|1038,50,100000,30000,Mob034-1::On1038 -034-1.gat,0,0,0,0|monster|Santaboo|1112,4,100000,30000,Mob034-1::On1112 +034-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000ms,30000ms,Mob034-1::On1094 +034-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob034-1::On1020 +034-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob034-1::On1095 +034-1.gat,0,0,0,0|monster|Squirrel|1038,50,100000ms,30000ms,Mob034-1::On1038 +034-1.gat,0,0,0,0|monster|Santaboo|1112,4,100000ms,30000ms,Mob034-1::On1112 -034-1.gat,0,0,0|script|Mob034-1|-1, +034-1.gat,0,0,0|script|Mob034-1|-1 { end; diff --git a/world/map/npc/034-1/ambushs.txt b/world/map/npc/034-1/ambushs.txt index f309b61b..9296ec29 100644 --- a/world/map/npc/034-1/ambushs.txt +++ b/world/map/npc/034-1/ambushs.txt @@ -1,7 +1,7 @@ // This file belongs to the wolvern hunting quest given by 033-1/birrod.txt // Author: Jenalya, cody, PjotrOrial -034-1.gat,118,59,0|script|#Ambush0Trigger|32767,2,2, +034-1.gat,118,59,0|script|#Ambush0Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -21,7 +21,7 @@ end; } -034-1.gat,118,59,0|script|#Ambush0|32767, +034-1.gat,118,59,0|script|#Ambush0|32767 { end; @@ -61,7 +61,7 @@ L_Count: } -034-1.gat,94,91,0|script|#Ambush1Trigger|32767,2,2, +034-1.gat,94,91,0|script|#Ambush1Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -81,7 +81,7 @@ L_Count: end; } -034-1.gat,94,91,0|script|#Ambush1|32767, +034-1.gat,94,91,0|script|#Ambush1|32767 { end; @@ -121,7 +121,7 @@ L_Count: } -034-1.gat,122,35,0|script|#Ambush2Trigger|32767,2,2, +034-1.gat,122,35,0|script|#Ambush2Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -141,7 +141,7 @@ L_Count: end; } -034-1.gat,122,35,0|script|#Ambush2|32767, +034-1.gat,122,35,0|script|#Ambush2|32767 { end; @@ -181,7 +181,7 @@ L_Count: } -034-1.gat,83,44,0|script|#Ambush3Trigger|32767,2,2, +034-1.gat,83,44,0|script|#Ambush3Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -201,7 +201,7 @@ L_Count: end; } -034-1.gat,83,44,0|script|#Ambush3|32767, +034-1.gat,83,44,0|script|#Ambush3|32767 { end; @@ -241,7 +241,7 @@ L_Count: } -034-1.gat,74,28,0|script|#Ambush4Trigger|32767,2,2, +034-1.gat,74,28,0|script|#Ambush4Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -261,7 +261,7 @@ L_Count: end; } -034-1.gat,74,28,0|script|#Ambush4|32767, +034-1.gat,74,28,0|script|#Ambush4|32767 { end; @@ -301,7 +301,7 @@ L_Count: } -034-1.gat,26,44,0|script|#Ambush5Trigger|32767,2,2, +034-1.gat,26,44,0|script|#Ambush5Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -321,7 +321,7 @@ L_Count: end; } -034-1.gat,26,44,0|script|#Ambush5|32767, +034-1.gat,26,44,0|script|#Ambush5|32767 { end; @@ -361,7 +361,7 @@ L_Count: } -034-1.gat,50,47,0|script|#Ambush6Trigger|32767,2,2, +034-1.gat,50,47,0|script|#Ambush6Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -381,7 +381,7 @@ L_Count: end; } -034-1.gat,50,47,0|script|#Ambush6|32767, +034-1.gat,50,47,0|script|#Ambush6|32767 { end; @@ -421,7 +421,7 @@ L_Count: } -034-1.gat,36,62,0|script|#Ambush7Trigger|32767,2,2, +034-1.gat,36,62,0|script|#Ambush7Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -441,7 +441,7 @@ L_Count: end; } -034-1.gat,36,62,0|script|#Ambush7|32767, +034-1.gat,36,62,0|script|#Ambush7|32767 { end; @@ -481,7 +481,7 @@ L_Count: } -034-1.gat,26,95,0|script|#Ambush8Trigger|32767,2,2, +034-1.gat,26,95,0|script|#Ambush8Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -501,7 +501,7 @@ L_Count: end; } -034-1.gat,26,95,0|script|#Ambush8|32767, +034-1.gat,26,95,0|script|#Ambush8|32767 { end; @@ -541,7 +541,7 @@ L_Count: } -034-1.gat,56,91,0|script|#Ambush9Trigger|32767,2,2, +034-1.gat,56,91,0|script|#Ambush9Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -561,7 +561,7 @@ L_Count: end; } -034-1.gat,56,91,0|script|#Ambush9|32767, +034-1.gat,56,91,0|script|#Ambush9|32767 { end; @@ -601,7 +601,7 @@ L_Count: } -034-1.gat,65,66,0|script|#Ambush10Trigger|32767,2,2, +034-1.gat,65,66,0|script|#Ambush10Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -621,7 +621,7 @@ L_Count: end; } -034-1.gat,65,66,0|script|#Ambush10|32767, +034-1.gat,65,66,0|script|#Ambush10|32767 { end; @@ -661,7 +661,7 @@ L_Count: } -034-1.gat,86,68,0|script|#Ambush11Trigger|32767,2,2, +034-1.gat,86,68,0|script|#Ambush11Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -681,7 +681,7 @@ L_Count: end; } -034-1.gat,86,68,0|script|#Ambush11|32767, +034-1.gat,86,68,0|script|#Ambush11|32767 { end; @@ -721,7 +721,7 @@ L_Count: } -034-1.gat,101,79,0|script|#Ambush12Trigger|32767,2,2, +034-1.gat,101,79,0|script|#Ambush12Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -741,7 +741,7 @@ L_Count: end; } -034-1.gat,101,79,0|script|#Ambush12|32767, +034-1.gat,101,79,0|script|#Ambush12|32767 { end; @@ -781,7 +781,7 @@ L_Count: } -034-1.gat,124,88,0|script|#Ambush13Trigger|32767,2,2, +034-1.gat,124,88,0|script|#Ambush13Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -801,7 +801,7 @@ L_Count: end; } -034-1.gat,124,88,0|script|#Ambush13|32767, +034-1.gat,124,88,0|script|#Ambush13|32767 { end; @@ -841,7 +841,7 @@ L_Count: } -034-1.gat,117,103,0|script|#Ambush14Trigger|32767,2,2, +034-1.gat,117,103,0|script|#Ambush14Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -861,7 +861,7 @@ L_Count: end; } -034-1.gat,117,103,0|script|#Ambush14|32767, +034-1.gat,117,103,0|script|#Ambush14|32767 { end; diff --git a/world/map/npc/034-1/yetiSpawn.txt b/world/map/npc/034-1/yetiSpawn.txt index 3bcbe658..72c331e6 100644 --- a/world/map/npc/034-1/yetiSpawn.txt +++ b/world/map/npc/034-1/yetiSpawn.txt @@ -1,7 +1,7 @@ // This file belongs to the yeti hunting quest given by 033-1/yerrnk.txt // Author: Jenalya -034-1.gat,79,98,0|script|#Yerrnk_YetiTrigger|32767,1,3, +034-1.gat,79,98,0|script|#Yerrnk_YetiTrigger|32767,1,3 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 7) @@ -15,7 +15,7 @@ end; } -034-1.gat,78,98,0|script|#Yerrnk_Yeti|32767, +034-1.gat,78,98,0|script|#Yerrnk_Yeti|32767 { end; diff --git a/world/map/npc/034-2/_mobs.txt b/world/map/npc/034-2/_mobs.txt index 81fca6aa..0b254951 100644 --- a/world/map/npc/034-2/_mobs.txt +++ b/world/map/npc/034-2/_mobs.txt @@ -3,7 +3,7 @@ -034-2.gat,0,0,0|script|Mob034-2|-1, +034-2.gat,0,0,0|script|Mob034-2|-1 { end; } diff --git a/world/map/npc/035-2/_mobs.txt b/world/map/npc/035-2/_mobs.txt index f1c490ea..69851091 100644 --- a/world/map/npc/035-2/_mobs.txt +++ b/world/map/npc/035-2/_mobs.txt @@ -3,7 +3,7 @@ -035-2.gat,0,0,0|script|Mob035-2|-1, +035-2.gat,0,0,0|script|Mob035-2|-1 { end; } diff --git a/world/map/npc/035-2/casino.txt b/world/map/npc/035-2/casino.txt index 83759787..47351085 100644 --- a/world/map/npc/035-2/casino.txt +++ b/world/map/npc/035-2/casino.txt @@ -1,11 +1,11 @@ // Casino -035-2.gat,34,37,0|script|Slots#4|400, +035-2.gat,34,37,0|script|Slots#4|400 { callfunc "SlotMachine"; close; } -035-2.gat,36,37,0|script|Slots#5|400, +035-2.gat,36,37,0|script|Slots#5|400 { callfunc "SlotMachine"; close; diff --git a/world/map/npc/035-2/emblems.txt b/world/map/npc/035-2/emblems.txt index 895909a3..9e888fd4 100644 --- a/world/map/npc/035-2/emblems.txt +++ b/world/map/npc/035-2/emblems.txt @@ -1,40 +1,40 @@ -035-2.gat,28,27,0|script|#k1city1e|410, +035-2.gat,28,27,0|script|#k1city1e|410 { end; OnInit: disablenpc "#k1city1e"; end; } -035-2.gat,28,27,0|script|#k1city1d|411, +035-2.gat,28,27,0|script|#k1city1d|411 { end; } -035-2.gat,30,27,0|script|#k1city2e|412, +035-2.gat,30,27,0|script|#k1city2e|412 { end; OnInit: disablenpc "#k1city2e"; end; } -035-2.gat,30,27,0|script|#k1city2d|413, +035-2.gat,30,27,0|script|#k1city2d|413 { end; } -035-2.gat,32,27,0|script|#k1city3e|414, +035-2.gat,32,27,0|script|#k1city3e|414 { end; OnInit: disablenpc "#k1city3e"; end; } -035-2.gat,32,27,0|script|#k1city3d|415, +035-2.gat,32,27,0|script|#k1city3d|415 { end; } -035-2.gat,32,27,0|script|#k1sound|127, +035-2.gat,32,27,0|script|#k1sound|127 { end; OnCommandDing: diff --git a/world/map/npc/035-2/koga.txt b/world/map/npc/035-2/koga.txt index b9e0969d..c38221a4 100644 --- a/world/map/npc/035-2/koga.txt +++ b/world/map/npc/035-2/koga.txt @@ -1,6 +1,6 @@ // Dock -035-2.gat,39,29,0|script|#KogaExit|45,0,1, +035-2.gat,39,29,0|script|#KogaExit|45,0,1 { mes "Disembark the ferry for "+$@MainDocks$[$@MainCurrentDock]+"?"; menu diff --git a/world/map/npc/035-2/shops.txt b/world/map/npc/035-2/shops.txt index ddf0f09c..7d7d656a 100644 --- a/world/map/npc/035-2/shops.txt +++ b/world/map/npc/035-2/shops.txt @@ -1,8 +1,8 @@ // -035-2.gat,23,38,0|shop|Cooky|213,Beer :-1,Orange :-1,CasinoCoins :-1 +035-2.gat,23,38,0|shop|Cooky|213,Beer:*1,Orange:*1,CasinoCoins:*1 -035-2.gat,23,35,0|script|Bunkmaster Phict|212, +035-2.gat,23,35,0|script|Bunkmaster Phict|212 { set @npcname$, "Bunkmaster Phict"; set @cost, 100; diff --git a/world/map/npc/036-2/_mobs.txt b/world/map/npc/036-2/_mobs.txt index 38c33e56..c4826c4b 100644 --- a/world/map/npc/036-2/_mobs.txt +++ b/world/map/npc/036-2/_mobs.txt @@ -3,7 +3,7 @@ -036-2.gat,0,0,0|script|Mob036-2|-1, +036-2.gat,0,0,0|script|Mob036-2|-1 { end; } diff --git a/world/map/npc/036-2/casino.txt b/world/map/npc/036-2/casino.txt index e7120f5d..bfd56a67 100644 --- a/world/map/npc/036-2/casino.txt +++ b/world/map/npc/036-2/casino.txt @@ -1,11 +1,11 @@ // Casino -036-2.gat,34,37,0|script|Slots#6|400, +036-2.gat,34,37,0|script|Slots#6|400 { callfunc "SlotMachine"; close; } -036-2.gat,36,37,0|script|Slots#7|400, +036-2.gat,36,37,0|script|Slots#7|400 { callfunc "SlotMachine"; close; diff --git a/world/map/npc/036-2/emblems.txt b/world/map/npc/036-2/emblems.txt index c3fbc18a..ed73729b 100644 --- a/world/map/npc/036-2/emblems.txt +++ b/world/map/npc/036-2/emblems.txt @@ -1,28 +1,28 @@ -036-2.gat,29,27,0|script|#k2city1e|410, +036-2.gat,29,27,0|script|#k2city1e|410 { end; OnInit: disablenpc "#k2city1e"; end; } -036-2.gat,29,27,0|script|#k2city1d|411, +036-2.gat,29,27,0|script|#k2city1d|411 { end; } -036-2.gat,31,27,0|script|#k2city2e|416, +036-2.gat,31,27,0|script|#k2city2e|416 { end; OnInit: disablenpc "#k2city2e"; end; } -036-2.gat,31,27,0|script|#k2city2d|417, +036-2.gat,31,27,0|script|#k2city2d|417 { end; } -036-2.gat,32,27,0|script|#k2sound|127, +036-2.gat,32,27,0|script|#k2sound|127 { end; OnCommandDing: diff --git a/world/map/npc/036-2/koga-candor.txt b/world/map/npc/036-2/koga-candor.txt index 3aa24417..555fbec5 100644 --- a/world/map/npc/036-2/koga-candor.txt +++ b/world/map/npc/036-2/koga-candor.txt @@ -1,6 +1,6 @@ // Dock -036-2.gat,39,29,0|script|#KogaCandorExit|45,0,1, +036-2.gat,39,29,0|script|#KogaCandorExit|45,0,1 { mes "Disembark the ferry for "+$@CandorDocks$[$@CandorCurrentDock]+"?"; menu diff --git a/world/map/npc/036-2/shops.txt b/world/map/npc/036-2/shops.txt index b25d0a46..4d60d6cf 100644 --- a/world/map/npc/036-2/shops.txt +++ b/world/map/npc/036-2/shops.txt @@ -1,9 +1,9 @@ // -036-2.gat,23,38,0|shop|Chef Armand|211,Beer :-1,Steak :-2,CasinoCoins :-1 -036-2.gat,35,22,0|shop|Gunney|138,Arrow :-2,IronArrow :-2 +036-2.gat,23,38,0|shop|Chef Armand|211,Beer:*1,Steak:*2,CasinoCoins:*1 +036-2.gat,35,22,0|shop|Gunney|138,Arrow:*2,IronArrow:*2 -036-2.gat,23,35,0|script|Bunkmaster Daban|212, +036-2.gat,23,35,0|script|Bunkmaster Daban|212 { set @npcname$, "Bunkmaster Daban"; set @cost, 100; diff --git a/world/map/npc/041-1/_mobs.txt b/world/map/npc/041-1/_mobs.txt index 5b74c6bb..85362452 100644 --- a/world/map/npc/041-1/_mobs.txt +++ b/world/map/npc/041-1/_mobs.txt @@ -1,20 +1,20 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Beach mobs -041-1.gat,81,55,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003 -041-1.gat,101,67,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003 -041-1.gat,100,84,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003 -041-1.gat,61,34,13,20|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003 -041-1.gat,55,30,10,48|monster|SeaSlime|1033,3,100000,30000,Mob041-1::On1033 -041-1.gat,59,13,10,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003 -041-1.gat,60,7,3,2|monster|TameScorpion|1046,1,100000,30000,Mob041-1::On1046 -041-1.gat,66,49,3,2|monster|TameScorpion|1046,1,100000,30000,Mob041-1::On1046 -041-1.gat,95,75,21,9|monster|TameScorpion|1046,1,100000,30000,Mob041-1::On1046 -041-1.gat,100,57,18,9|monster|RedScorpion|1004,3,100000,30000,Mob041-1::On1004 -041-1.gat,83,64,18,9|monster|RedScorpion|1004,3,100000,30000,Mob041-1::On1004 +041-1.gat,81,55,18,9|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003 +041-1.gat,101,67,18,9|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003 +041-1.gat,100,84,18,9|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003 +041-1.gat,61,34,13,20|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003 +041-1.gat,55,30,10,48|monster|SeaSlime|1033,3,100000ms,30000ms,Mob041-1::On1033 +041-1.gat,59,13,10,9|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003 +041-1.gat,60,7,3,2|monster|TameScorpion|1046,1,100000ms,30000ms,Mob041-1::On1046 +041-1.gat,66,49,3,2|monster|TameScorpion|1046,1,100000ms,30000ms,Mob041-1::On1046 +041-1.gat,95,75,21,9|monster|TameScorpion|1046,1,100000ms,30000ms,Mob041-1::On1046 +041-1.gat,100,57,18,9|monster|RedScorpion|1004,3,100000ms,30000ms,Mob041-1::On1004 +041-1.gat,83,64,18,9|monster|RedScorpion|1004,3,100000ms,30000ms,Mob041-1::On1004 -041-1.gat,0,0,0|script|Mob041-1|-1, +041-1.gat,0,0,0|script|Mob041-1|-1 { end; diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt index a8175a1f..1482fefa 100644 --- a/world/map/npc/042-1/_mobs.txt +++ b/world/map/npc/042-1/_mobs.txt @@ -1,19 +1,19 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Suburbs mobs -042-1.gat,101,69,31,15|monster|Maggot|1002,5,100000,30000,Mob042-1::On1002 -042-1.gat,65,59,27,15|monster|Maggot|1002,7,100000,30000,Mob042-1::On1002 -042-1.gat,68,102,7,8|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009 -042-1.gat,98,88,5,8|monster|Scorpion|1003,4,100000,30000,Mob042-1::On1003 -042-1.gat,63,63,37,30|monster|TameScorpion|1046,6,100000,30000,Mob042-1::On1046 -042-1.gat,85,102,5,8|monster|Scorpion|1003,5,100000,30000,Mob042-1::On1003 -042-1.gat,98,99,5,5|monster|Scorpion|1003,3,100000,30000,Mob042-1::On1003 -042-1.gat,82,87,6,3|monster|Scorpion|1003,2,100000,30000,Mob042-1::On1003 -042-1.gat,70,88,5,8|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009 -042-1.gat,80,35,11,5|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009 +042-1.gat,101,69,31,15|monster|Maggot|1002,5,100000ms,30000ms,Mob042-1::On1002 +042-1.gat,65,59,27,15|monster|Maggot|1002,7,100000ms,30000ms,Mob042-1::On1002 +042-1.gat,68,102,7,8|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009 +042-1.gat,98,88,5,8|monster|Scorpion|1003,4,100000ms,30000ms,Mob042-1::On1003 +042-1.gat,63,63,37,30|monster|TameScorpion|1046,6,100000ms,30000ms,Mob042-1::On1046 +042-1.gat,85,102,5,8|monster|Scorpion|1003,5,100000ms,30000ms,Mob042-1::On1003 +042-1.gat,98,99,5,5|monster|Scorpion|1003,3,100000ms,30000ms,Mob042-1::On1003 +042-1.gat,82,87,6,3|monster|Scorpion|1003,2,100000ms,30000ms,Mob042-1::On1003 +042-1.gat,70,88,5,8|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009 +042-1.gat,80,35,11,5|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009 -042-1.gat,0,0,0|script|Mob042-1|-1, +042-1.gat,0,0,0|script|Mob042-1|-1 { end; diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt index 39e549cd..734e0df0 100644 --- a/world/map/npc/042-1/hasan.txt +++ b/world/map/npc/042-1/hasan.txt @@ -6,7 +6,7 @@ // They respond by asking play for help // Hasan tells them to but out of it. -042-1.gat,104,49,0|script|Scared Man|160, +042-1.gat,104,49,0|script|Scared Man|160 { setarray @npc_loc, 104, 49, 4; callfunc "PCtoNPCRange"; @@ -24,7 +24,7 @@ L_TutDone: L_End: end; } -042-1.gat,102,49,0|script|Hasan|189,2,2, +042-1.gat,102,49,0|script|Hasan|189,2,2 { setarray @npc_loc, 102, 49, 4; callfunc "PCtoNPCRange"; @@ -172,7 +172,7 @@ OnTouch: end; goto L_Main; } -042-1.gat,0,0,0|script|#ScorpionTrigger|35, +042-1.gat,0,0,0|script|#ScorpionTrigger|35 { end; diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt index 1444cd67..92067c41 100644 --- a/world/map/npc/042-1/kaan.txt +++ b/world/map/npc/042-1/kaan.txt @@ -1,7 +1,7 @@ // This file is part of the Tutorial // Author: Jenalya -042-1.gat,109,87,0|script|Kaan|160, +042-1.gat,109,87,0|script|Kaan|160 { setarray @npc_loc, 109, 87, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/042-1/liana.txt b/world/map/npc/042-1/liana.txt index f1e5a4f9..c6df63a9 100644 --- a/world/map/npc/042-1/liana.txt +++ b/world/map/npc/042-1/liana.txt @@ -1,6 +1,6 @@ // Talk NPCs to help make trek interesting between Tutorial and Bazaar. -042-1.gat,82,96,0|script|Liana|205, +042-1.gat,82,96,0|script|Liana|205 { setarray @npc_loc, 82, 96, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/042-1/tutorial.txt b/world/map/npc/042-1/tutorial.txt index d51c30be..bed98436 100644 --- a/world/map/npc/042-1/tutorial.txt +++ b/world/map/npc/042-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|-1 { end; @@ -12,20 +12,20 @@ OnInit: set $@SpokeToKaan, (1 << 31); end; } -function|script|TutorialState|, +function|script|TutorialState { callfunc "ClearVariables"; set @tutorial, ((STARTAREA & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); set @kaan_talked, (STARTAREA & $@SpokeToKaan); return; } -function|script|SetTutorialMask|, +function|script|SetTutorialMask { set STARTAREA, (STARTAREA & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT)); set @tutorial_tmp, 0; return; } -042-2.gat,21,26,0|script|TutDebug|154, +042-2.gat,21,26,0|script|TutDebug|154 { mes "[TutDebug]"; mes "Reset?"; diff --git a/world/map/npc/042-1/valon.txt b/world/map/npc/042-1/valon.txt index f4296af9..b50207a3 100644 --- a/world/map/npc/042-1/valon.txt +++ b/world/map/npc/042-1/valon.txt @@ -1,6 +1,6 @@ // This file is part of the Tutorial // Author: Jenalya, Wushin --|script|#ValonConfig|-1, +-|script|#ValonConfig|-1 { end; @@ -10,7 +10,7 @@ OnInit: setarray $@ValonMobCnt, 10,5,3,1; end; } -function|script|ValonState|, +function|script|ValonState { set @valon_state, ((STARTAREA & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); set @valon_mob, 0; @@ -19,18 +19,18 @@ function|script|ValonState|, set @valon_count, ((STARTAREA & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); return; } -function|script|setValonMask|, +function|script|setValonMask { set STARTAREA, (STARTAREA & ~(NIBBLE_1_MASK) | (@valon_tmp << NIBBLE_1_SHIFT)); set @valon_tmp, 0; return; } -function|script|ResetValonCntMask|, +function|script|ResetValonCntMask { set STARTAREA, (STARTAREA & ~(NIBBLE_2_MASK) | (0 << NIBBLE_2_SHIFT)); return; } -function|script|AddValonCntMask|, +function|script|AddValonCntMask { set @valon_tmp, (@valon_count + 1); if (@valon_tmp > $@ValonMobCnt[@valon_mob]) @@ -40,14 +40,14 @@ function|script|AddValonCntMask|, callfunc "ValonProgress"; return; } -function|script|ValonProgress|, +function|script|ValonProgress { callfunc "ValonState"; if ((@valon_state > 1) && (@valon_state < 6)) message strcharinfo(0), $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob]; return; } -042-1.gat,51,111,0|script|ValonDebug|156, +042-1.gat,51,111,0|script|ValonDebug|156 { mes "[Valon Debug]"; mes "Reset?"; @@ -69,7 +69,7 @@ OnInit: disablenpc "ValonDebug"; end; } -042-1.gat,48,111,0|script|Valon|156, +042-1.gat,48,111,0|script|Valon|156 { setarray @npc_loc, 48, 111, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/042-1/zegas.txt b/world/map/npc/042-1/zegas.txt index 36443a91..4a153ebe 100644 --- a/world/map/npc/042-1/zegas.txt +++ b/world/map/npc/042-1/zegas.txt @@ -1,7 +1,7 @@ // Barrels // Author: Wushin // Npc -042-1.gat,97,75,0|script|Zegas|165, +042-1.gat,97,75,0|script|Zegas|165 { setarray @npc_loc, 97, 75, 2; callfunc "PCtoNPCRange"; @@ -78,7 +78,7 @@ L_Thanks: L_Close: close; } -042-1.gat,100,75,0|script|ZegasDebug|165, +042-1.gat,100,75,0|script|ZegasDebug|165 { mes "[Zegas Debug]"; mes "Reset ?"; diff --git a/world/map/npc/042-2/_mobs.txt b/world/map/npc/042-2/_mobs.txt index 60ac26d6..31c54238 100644 --- a/world/map/npc/042-2/_mobs.txt +++ b/world/map/npc/042-2/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Suburbs Indoor mobs -042-2.gat,33,57,24,7|monster|HouseMaggot|1050,7,100000,30000,Mob042-2::On1050 +042-2.gat,33,57,24,7|monster|HouseMaggot|1050,7,100000ms,30000ms,Mob042-2::On1050 -042-2.gat,0,0,0|script|Mob042-2|-1, +042-2.gat,0,0,0|script|Mob042-2|-1 { end; diff --git a/world/map/npc/042-2/barrels.txt b/world/map/npc/042-2/barrels.txt index 8e5b6c49..60a0e163 100644 --- a/world/map/npc/042-2/barrels.txt +++ b/world/map/npc/042-2/barrels.txt @@ -1,6 +1,6 @@ // Barrels // Author: Wushin -042-2.gat,23,86,0|script|Barrel#0|400, +042-2.gat,23,86,0|script|Barrel#0|400 { setarray @npc_loc, 23, 86, 2; set @barrel, 0; @@ -12,49 +12,49 @@ OnMaggotDeath: callfunc "MobPoints"; end; } -042-2.gat,28,86,0|script|Barrel#1|400, +042-2.gat,28,86,0|script|Barrel#1|400 { setarray @npc_loc, 28, 86, 2; set @barrel, 1; callfunc "CheckBarrel"; end; } -042-2.gat,31,91,0|script|Barrel#2|400, +042-2.gat,31,91,0|script|Barrel#2|400 { setarray @npc_loc, 31, 91, 2; set @barrel, 2; callfunc "CheckBarrel"; end; } -042-2.gat,36,85,0|script|Barrel#3|400, +042-2.gat,36,85,0|script|Barrel#3|400 { setarray @npc_loc, 36, 85, 2; set @barrel, 3; callfunc "CheckBarrel"; end; } -042-2.gat,40,89,0|script|Barrel#4|400, +042-2.gat,40,89,0|script|Barrel#4|400 { setarray @npc_loc, 40, 89, 2; set @barrel, 4; callfunc "CheckBarrel"; end; } -042-2.gat,38,91,0|script|Barrel#5|400, +042-2.gat,38,91,0|script|Barrel#5|400 { setarray @npc_loc, 38, 91, 2; set @barrel, 5; callfunc "CheckBarrel"; end; } -042-2.gat,29,92,0|script|Barrel#6|400, +042-2.gat,29,92,0|script|Barrel#6|400 { setarray @npc_loc, 29, 92, 2; set @barrel, 6; callfunc "CheckBarrel"; end; } -042-2.gat,24,91,0|script|Barrel#7|400, +042-2.gat,24,91,0|script|Barrel#7|400 { setarray @npc_loc, 24, 91, 2; set @barrel, 7; diff --git a/world/map/npc/042-2/barrels_config.txt b/world/map/npc/042-2/barrels_config.txt index 0b45af21..d125d9e1 100644 --- a/world/map/npc/042-2/barrels_config.txt +++ b/world/map/npc/042-2/barrels_config.txt @@ -1,7 +1,7 @@ // Barrels // Author: Wushin -042-2.gat,33,88,24,7|monster|HouseMaggot|1050,2,100000,30000,Barrel#0::OnMaggotDeath --|script|#BarrelConfig|-1, +042-2.gat,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath +-|script|#BarrelConfig|-1 { end; @@ -14,19 +14,19 @@ OnInit: set $@BarrelMax, getarraysize($@BarrelBits); end; } -function|script|SetBarrelMask|, +function|script|SetBarrelMask { set STARTAREA, (STARTAREA & ~(NIBBLE_4_MASK) | (@barrel_tmp << NIBBLE_4_SHIFT)); set @barrel_tmp, 0; return; } -function|script|CheckBarrelQuest|, +function|script|CheckBarrelQuest { callfunc "CountBarrels"; set @barrel_quest, ((STARTAREA & NIBBLE_4_MASK) >> NIBBLE_4_SHIFT); return; } -function|script|CountBarrels|, +function|script|CountBarrels { set @barrel_count, 0; set @count_tmp, 0; @@ -50,7 +50,7 @@ L_LoopAgain: L_BarrelTally: return; } -function|script|CheckBarrel|, +function|script|CheckBarrel { callfunc "PCtoNPCRange"; if (@npc_check) diff --git a/world/map/npc/042-2/magic_basement.txt b/world/map/npc/042-2/magic_basement.txt index 2f278a5a..0817375d 100644 --- a/world/map/npc/042-2/magic_basement.txt +++ b/world/map/npc/042-2/magic_basement.txt @@ -1,7 +1,7 @@ // // Author: Wushin -042-2.gat,103,56,0|script|#MagicBasement|400,0,0, +042-2.gat,103,56,0|script|#MagicBasement|400,0,0 { callfunc "MorganState"; if (@morgan < 4) diff --git a/world/map/npc/042-2/morgan.txt b/world/map/npc/042-2/morgan.txt index 20cc34c1..ed6367ff 100644 --- a/world/map/npc/042-2/morgan.txt +++ b/world/map/npc/042-2/morgan.txt @@ -3,19 +3,19 @@ // Gains Access to Magic School // See 024-2 clean that shit up // Morgan, liana -function|script|MorganState|, +function|script|MorganState { callfunc "ClearVariables"; set @morgan, ((STARTAREA & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); return; } -function|script|SetMorganMask|, +function|script|SetMorganMask { set STARTAREA, (STARTAREA & ~(NIBBLE_3_MASK) | (@morgan_tmp << NIBBLE_3_SHIFT)); set @morgan_tmp, 0; return; } -042-2,105,57,0|script|MorganDebug|355, +042-2,105,57,0|script|MorganDebug|355 { mes "[Morgan Debug]"; mes "Reset?"; @@ -35,7 +35,7 @@ OnInit: disablenpc "MorganDebug"; end; } -042-2,101,57,0|script|Morgan|355, +042-2,101,57,0|script|Morgan|355 { setarray @npc_loc, 101, 57, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt index 22216327..92e27f9a 100644 --- a/world/map/npc/042-2/sorfina.txt +++ b/world/map/npc/042-2/sorfina.txt @@ -300,7 +300,7 @@ OnTouch: close; } -042-2.gat,29,23,0|script|Chest#tutorial|111, +042-2.gat,29,23,0|script|Chest#tutorial|111 { callfunc "TutorialState"; if (@tutorial > 2) goto L_Empty; diff --git a/world/map/npc/042-2/stat_reset.txt b/world/map/npc/042-2/stat_reset.txt index a6b61378..43a13f5d 100644 --- a/world/map/npc/042-2/stat_reset.txt +++ b/world/map/npc/042-2/stat_reset.txt @@ -1,6 +1,6 @@ // -042-2.gat,98,91,0|script|Jessie|159, +042-2.gat,98,91,0|script|Jessie|159 { setarray @npc_loc, 98, 91, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt index 77e95ab7..aad93769 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -2,7 +2,7 @@ // Authors: Jenalya, alastrim // Cleanup: o11c -042-2.gat,110,88,0|script|Tanisha|114, +042-2.gat,110,88,0|script|Tanisha|114 { setarray @npc_loc, 110, 88, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/042-3/_mobs.txt b/world/map/npc/042-3/_mobs.txt index 391df0f2..5c2d6d9e 100644 --- a/world/map/npc/042-3/_mobs.txt +++ b/world/map/npc/042-3/_mobs.txt @@ -3,7 +3,7 @@ -042-3.gat,0,0,0|script|Mob042-3|-1, +042-3.gat,0,0,0|script|Mob042-3|-1 { end; } diff --git a/world/map/npc/043-1/_mobs.txt b/world/map/npc/043-1/_mobs.txt index af45a145..3f601fce 100644 --- a/world/map/npc/043-1/_mobs.txt +++ b/world/map/npc/043-1/_mobs.txt @@ -1,12 +1,12 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Beach mobs -043-1.gat,0,0,0,0|monster|SeaSlime|1033,17,40000,30000,Mob043-1::On1033 -043-1.gat,0,0,0,0|monster|YellowSlime|1007,15,60000,60000,Mob043-1::On1007 -043-1.gat,0,0,0,0|monster|GreenSlime|1005,20,60000,60000,Mob043-1::On1005 +043-1.gat,0,0,0,0|monster|SeaSlime|1033,17,40000ms,30000ms,Mob043-1::On1033 +043-1.gat,0,0,0,0|monster|YellowSlime|1007,15,60000ms,60000ms,Mob043-1::On1007 +043-1.gat,0,0,0,0|monster|GreenSlime|1005,20,60000ms,60000ms,Mob043-1::On1005 -043-1.gat,0,0,0|script|Mob043-1|-1, +043-1.gat,0,0,0|script|Mob043-1|-1 { end; diff --git a/world/map/npc/043-1/ryger.txt b/world/map/npc/043-1/ryger.txt index f3178538..d814d0b5 100644 --- a/world/map/npc/043-1/ryger.txt +++ b/world/map/npc/043-1/ryger.txt @@ -1,6 +1,6 @@ // Sandstorm mine guard -043-1.gat,88,60,0|script|Ryger|123, +043-1.gat,88,60,0|script|Ryger|123 { mes "[Ryger]"; mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\""; diff --git a/world/map/npc/043-3/_mobs.txt b/world/map/npc/043-3/_mobs.txt index 67568a24..4b169a07 100644 --- a/world/map/npc/043-3/_mobs.txt +++ b/world/map/npc/043-3/_mobs.txt @@ -1,18 +1,18 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Sandy Dungeon Level 1 mobs -043-3.gat,39,45,24,17|monster|CaveMaggot|1056,6,20000,20000,Mob043-3::On1056 -043-3.gat,44,60,24,17|monster|CaveMaggot|1056,6,20000,20000,Mob043-3::On1056 -043-3.gat,41,96,34,26|monster|CaveMaggot|1056,10,20000,20000,Mob043-3::On1056 -043-3.gat,52,91,6,7|monster|AngryScorpion|1057,5,30000,30000,Mob043-3::On1057 -043-3.gat,102,116,26,19|monster|AngryFireGoblin|1108,10,30000,30000,Mob043-3::On1108 -043-3.gat,33,99,6,7|monster|AngryScorpion|1057,5,30000,30000,Mob043-3::On1057 -043-3.gat,116,78,25,19|monster|AngryFireGoblin|1108,8,30000,30000,Mob043-3::On1108 -043-3.gat,113,47,30,22|monster|RedSlime|1008,15,45000,35000,Mob043-3::On1008 -043-3.gat,94,44,40,18|monster|GreenSlime|1005,5,30000,15000,Mob043-3::On1005 - - -043-3.gat,0,0,0|script|Mob043-3|-1, +043-3.gat,39,45,24,17|monster|CaveMaggot|1056,6,20000ms,20000ms,Mob043-3::On1056 +043-3.gat,44,60,24,17|monster|CaveMaggot|1056,6,20000ms,20000ms,Mob043-3::On1056 +043-3.gat,41,96,34,26|monster|CaveMaggot|1056,10,20000ms,20000ms,Mob043-3::On1056 +043-3.gat,52,91,6,7|monster|AngryScorpion|1057,5,30000ms,30000ms,Mob043-3::On1057 +043-3.gat,102,116,26,19|monster|AngryFireGoblin|1108,10,30000ms,30000ms,Mob043-3::On1108 +043-3.gat,33,99,6,7|monster|AngryScorpion|1057,5,30000ms,30000ms,Mob043-3::On1057 +043-3.gat,116,78,25,19|monster|AngryFireGoblin|1108,8,30000ms,30000ms,Mob043-3::On1108 +043-3.gat,113,47,30,22|monster|RedSlime|1008,15,45000ms,35000ms,Mob043-3::On1008 +043-3.gat,94,44,40,18|monster|GreenSlime|1005,5,30000ms,15000ms,Mob043-3::On1005 + + +043-3.gat,0,0,0|script|Mob043-3|-1 { end; diff --git a/world/map/npc/043-4/_mobs.txt b/world/map/npc/043-4/_mobs.txt index 97a3ea63..d97590cb 100644 --- a/world/map/npc/043-4/_mobs.txt +++ b/world/map/npc/043-4/_mobs.txt @@ -1,31 +1,31 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Sandy Dungeon Level 2 mobs -043-4.gat,139,163,7,6|monster|Terranite|1062,2,240000,120000,Mob043-4::On1062 -043-4.gat,133,45,14,16|monster|UndeadTroll|1117,4,100000,50000,Mob043-4::On1117 -043-4.gat,91,139,11,10|monster|UndeadTroll|1117,2,100000,50000,Mob043-4::On1117 -043-4.gat,35,120,10,11|monster|UndeadTroll|1117,2,100000,50000,Mob043-4::On1117 -043-4.gat,43,143,12,11|monster|UndeadWitch|1116,2,120000,60000,Mob043-4::On1116 -043-4.gat,102,153,9,9|monster|UndeadWitch|1116,2,120000,60000,Mob043-4::On1116 -043-4.gat,142,159,14,12|monster|UndeadWitch|1116,2,120000,60000,Mob043-4::On1116 -043-4.gat,150,33,16,15|monster|UndeadWitch|1116,1,120000,60000,Mob043-4::On1116 -043-4.gat,103,54,8,23|monster|UndeadTroll|1117,3,100000,50000,Mob043-4::On1117 -043-4.gat,47,38,20,10|monster|Troll|1054,7,100000,50000,Mob043-4::On1054 -043-4.gat,98,85,8,15|monster|Snake|1010,5,100000,50000,Mob043-4::On1010 -043-4.gat,104,57,15,27|monster|Troll|1054,7,100000,50000,Mob043-4::On1054 -043-4.gat,89,64,9,11|monster|BlackScorpion|1009,5,100000,50000,Mob043-4::On1009 -043-4.gat,143,46,32,28|monster|Troll|1054,7,100000,50000,Mob043-4::On1054 -043-4.gat,154,106,26,29|monster|BlackScorpion|1009,8,100000,50000,Mob043-4::On1009 -043-4.gat,162,77,15,23|monster|Snake|1010,6,100000,50000,Mob043-4::On1010 -043-4.gat,152,143,11,10|monster|BlackScorpion|1009,6,100000,50000,Mob043-4::On1009 -043-4.gat,159,161,10,8|monster|Snake|1010,6,100000,50000,Mob043-4::On1010 -043-4.gat,98,138,21,21|monster|Troll|1054,5,100000,50000,Mob043-4::On1054 -043-4.gat,45,106,18,25|monster|Troll|1054,5,100000,50000,Mob043-4::On1054 -043-4.gat,39,138,19,17|monster|BlackScorpion|1009,5,100000,50000,Mob043-4::On1009 -043-4.gat,133,123,30,23|monster|Troll|1054,3,100000,50000,Mob043-4::On1054 - - -043-4.gat,0,0,0|script|Mob043-4|-1, +043-4.gat,139,163,7,6|monster|Terranite|1062,2,240000ms,120000ms,Mob043-4::On1062 +043-4.gat,133,45,14,16|monster|UndeadTroll|1117,4,100000ms,50000ms,Mob043-4::On1117 +043-4.gat,91,139,11,10|monster|UndeadTroll|1117,2,100000ms,50000ms,Mob043-4::On1117 +043-4.gat,35,120,10,11|monster|UndeadTroll|1117,2,100000ms,50000ms,Mob043-4::On1117 +043-4.gat,43,143,12,11|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116 +043-4.gat,102,153,9,9|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116 +043-4.gat,142,159,14,12|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116 +043-4.gat,150,33,16,15|monster|UndeadWitch|1116,1,120000ms,60000ms,Mob043-4::On1116 +043-4.gat,103,54,8,23|monster|UndeadTroll|1117,3,100000ms,50000ms,Mob043-4::On1117 +043-4.gat,47,38,20,10|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054 +043-4.gat,98,85,8,15|monster|Snake|1010,5,100000ms,50000ms,Mob043-4::On1010 +043-4.gat,104,57,15,27|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054 +043-4.gat,89,64,9,11|monster|BlackScorpion|1009,5,100000ms,50000ms,Mob043-4::On1009 +043-4.gat,143,46,32,28|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054 +043-4.gat,154,106,26,29|monster|BlackScorpion|1009,8,100000ms,50000ms,Mob043-4::On1009 +043-4.gat,162,77,15,23|monster|Snake|1010,6,100000ms,50000ms,Mob043-4::On1010 +043-4.gat,152,143,11,10|monster|BlackScorpion|1009,6,100000ms,50000ms,Mob043-4::On1009 +043-4.gat,159,161,10,8|monster|Snake|1010,6,100000ms,50000ms,Mob043-4::On1010 +043-4.gat,98,138,21,21|monster|Troll|1054,5,100000ms,50000ms,Mob043-4::On1054 +043-4.gat,45,106,18,25|monster|Troll|1054,5,100000ms,50000ms,Mob043-4::On1054 +043-4.gat,39,138,19,17|monster|BlackScorpion|1009,5,100000ms,50000ms,Mob043-4::On1009 +043-4.gat,133,123,30,23|monster|Troll|1054,3,100000ms,50000ms,Mob043-4::On1054 + + +043-4.gat,0,0,0|script|Mob043-4|-1 { end; diff --git a/world/map/npc/044-1/_mobs.txt b/world/map/npc/044-1/_mobs.txt index 62e35607..471c997c 100644 --- a/world/map/npc/044-1/_mobs.txt +++ b/world/map/npc/044-1/_mobs.txt @@ -1,25 +1,25 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // snow Hills mobs -044-1.gat,37,175,3,2|monster|WhiteSlime|1093,7,100000,30000,Mob044-1::On1093 -044-1.gat,45,75,2,2|monster|BlueSlime|1091,1,100000,30000,Mob044-1::On1091 -044-1.gat,0,0,0,0|monster|Reinboo|1094,50,100000,30000,Mob044-1::On1094 -044-1.gat,0,0,0,0|monster|Fluffy|1020,60,100000,30000,Mob044-1::On1020 -044-1.gat,0,0,0,0|monster|Squirrel|1038,60,100000,30000,Mob044-1::On1038 -044-1.gat,81,125,103,56|monster|Moggun|1061,25,100000,30000,Mob044-1::On1061 -044-1.gat,157,66,25,20|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090 -044-1.gat,160,115,25,20|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090 -044-1.gat,169,163,48,31|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090 -044-1.gat,58,71,48,31|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090 -044-1.gat,113,67,23,62|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090 -044-1.gat,110,173,25,20|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090 -044-1.gat,108,168,3,2|monster|WhiteSlime|1093,7,100000,30000,Mob044-1::On1093 -044-1.gat,108,158,3,2|monster|BlueSlime|1091,1,100000,30000,Mob044-1::On1091 -044-1.gat,101,146,10,5|monster|IceGoblin|1058,4,100000,30000,Mob044-1::On1058 -044-1.gat,0,0,0,0|monster|WhiteBell|1095,10,100000,30000,Mob044-1::On1095 +044-1.gat,37,175,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-1::On1093 +044-1.gat,45,75,2,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob044-1::On1091 +044-1.gat,0,0,0,0|monster|Reinboo|1094,50,100000ms,30000ms,Mob044-1::On1094 +044-1.gat,0,0,0,0|monster|Fluffy|1020,60,100000ms,30000ms,Mob044-1::On1020 +044-1.gat,0,0,0,0|monster|Squirrel|1038,60,100000ms,30000ms,Mob044-1::On1038 +044-1.gat,81,125,103,56|monster|Moggun|1061,25,100000ms,30000ms,Mob044-1::On1061 +044-1.gat,157,66,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090 +044-1.gat,160,115,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090 +044-1.gat,169,163,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090 +044-1.gat,58,71,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090 +044-1.gat,113,67,23,62|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090 +044-1.gat,110,173,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090 +044-1.gat,108,168,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-1::On1093 +044-1.gat,108,158,3,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob044-1::On1091 +044-1.gat,101,146,10,5|monster|IceGoblin|1058,4,100000ms,30000ms,Mob044-1::On1058 +044-1.gat,0,0,0,0|monster|WhiteBell|1095,10,100000ms,30000ms,Mob044-1::On1095 -044-1.gat,0,0,0|script|Mob044-1|-1, +044-1.gat,0,0,0|script|Mob044-1|-1 { end; diff --git a/world/map/npc/044-1/traveler.txt b/world/map/npc/044-1/traveler.txt index 845591c0..36eb4a9a 100644 --- a/world/map/npc/044-1/traveler.txt +++ b/world/map/npc/044-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -044-1.gat,151,17,0|script|Klaus the Traveler|103, +044-1.gat,151,17,0|script|Klaus the Traveler|103 { set @NpcName$, "Klaus"; set @NpcTravelBit, $@nivalis_snow_hills_bit; diff --git a/world/map/npc/044-3/_mobs.txt b/world/map/npc/044-3/_mobs.txt index 901f17fc..61be9266 100644 --- a/world/map/npc/044-3/_mobs.txt +++ b/world/map/npc/044-3/_mobs.txt @@ -1,30 +1,30 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Snow Hills Cave mobs -044-3.gat,56,135,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093 -044-3.gat,35,153,6,6|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093 -044-3.gat,39,104,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093 -044-3.gat,73,153,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093 -044-3.gat,64,104,3,3|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093 -044-3.gat,24,168,6,4|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091 -044-3.gat,87,134,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091 -044-3.gat,55,122,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091 -044-3.gat,35,128,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091 -044-3.gat,53,84,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091 -044-3.gat,75,136,21,26|monster|Moggun|1061,5,100000,30000,Mob044-3::On1061 -044-3.gat,39,31,42,21|monster|Moggun|1061,12,100000,30000,Mob044-3::On1061 -044-3.gat,40,31,5,3|monster|IceGoblin|1058,2,100000,30000,Mob044-3::On1058 -044-3.gat,122,157,21,16|monster|Yeti|1072,2,100000,30000,Mob044-3::On1072 -044-3.gat,102,166,15,13|monster|IceGoblin|1058,5,100000,30000,Mob044-3::On1058 -044-3.gat,109,81,15,13|monster|IceElement|1071,1,100000,30000,Mob044-3::On1071 -044-3.gat,123,90,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091 -044-3.gat,109,97,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093 -044-3.gat,119,41,42,21|monster|Moggun|1061,8,100000,30000,Mob044-3::On1061 -044-3.gat,51,94,39,14|monster|IceGoblin|1058,5,100000,30000,Mob044-3::On1058 -044-3.gat,121,172,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093 - - -044-3.gat,0,0,0|script|Mob044-3|-1, +044-3.gat,56,135,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093 +044-3.gat,35,153,6,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093 +044-3.gat,39,104,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093 +044-3.gat,73,153,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093 +044-3.gat,64,104,3,3|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093 +044-3.gat,24,168,6,4|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091 +044-3.gat,87,134,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091 +044-3.gat,55,122,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091 +044-3.gat,35,128,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091 +044-3.gat,53,84,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091 +044-3.gat,75,136,21,26|monster|Moggun|1061,5,100000ms,30000ms,Mob044-3::On1061 +044-3.gat,39,31,42,21|monster|Moggun|1061,12,100000ms,30000ms,Mob044-3::On1061 +044-3.gat,40,31,5,3|monster|IceGoblin|1058,2,100000ms,30000ms,Mob044-3::On1058 +044-3.gat,122,157,21,16|monster|Yeti|1072,2,100000ms,30000ms,Mob044-3::On1072 +044-3.gat,102,166,15,13|monster|IceGoblin|1058,5,100000ms,30000ms,Mob044-3::On1058 +044-3.gat,109,81,15,13|monster|IceElement|1071,1,100000ms,30000ms,Mob044-3::On1071 +044-3.gat,123,90,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091 +044-3.gat,109,97,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093 +044-3.gat,119,41,42,21|monster|Moggun|1061,8,100000ms,30000ms,Mob044-3::On1061 +044-3.gat,51,94,39,14|monster|IceGoblin|1058,5,100000ms,30000ms,Mob044-3::On1058 +044-3.gat,121,172,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093 + + +044-3.gat,0,0,0|script|Mob044-3|-1 { end; diff --git a/world/map/npc/045-1/_mobs.txt b/world/map/npc/045-1/_mobs.txt index 649ffd07..439c0690 100644 --- a/world/map/npc/045-1/_mobs.txt +++ b/world/map/npc/045-1/_mobs.txt @@ -1,21 +1,21 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Deep Snow Forest mobs -045-1.gat,102,122,23,22|monster|Wolvern|1090,10,100000,30000,Mob045-1::On1090 -045-1.gat,71,69,23,22|monster|Wolvern|1090,5,100000,30000,Mob045-1::On1090 -045-1.gat,147,63,23,22|monster|Wolvern|1090,5,100000,30000,Mob045-1::On1090 -045-1.gat,51,155,23,22|monster|Wolvern|1090,5,100000,30000,Mob045-1::On1090 -045-1.gat,106,44,23,22|monster|Wolvern|1090,5,100000,30000,Mob045-1::On1090 -045-1.gat,135,159,23,22|monster|Wolvern|1090,5,100000,30000,Mob045-1::On1090 -045-1.gat,42,108,18,15|monster|Wolvern|1090,5,100000,30000,Mob045-1::On1090 -045-1.gat,148,111,18,15|monster|Wolvern|1090,5,100000,30000,Mob045-1::On1090 -045-1.gat,0,0,0,0|monster|Squirrel|1038,40,100000,30000,Mob045-1::On1038 -045-1.gat,0,0,0,0|monster|Reinboo|1094,30,100000,30000,Mob045-1::On1094 -045-1.gat,0,0,0,0|monster|Fluffy|1020,40,100000,30000,Mob045-1::On1020 -045-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob045-1::On1095 - - -045-1.gat,0,0,0|script|Mob045-1|-1, +045-1.gat,102,122,23,22|monster|Wolvern|1090,10,100000ms,30000ms,Mob045-1::On1090 +045-1.gat,71,69,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090 +045-1.gat,147,63,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090 +045-1.gat,51,155,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090 +045-1.gat,106,44,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090 +045-1.gat,135,159,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090 +045-1.gat,42,108,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090 +045-1.gat,148,111,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090 +045-1.gat,0,0,0,0|monster|Squirrel|1038,40,100000ms,30000ms,Mob045-1::On1038 +045-1.gat,0,0,0,0|monster|Reinboo|1094,30,100000ms,30000ms,Mob045-1::On1094 +045-1.gat,0,0,0,0|monster|Fluffy|1020,40,100000ms,30000ms,Mob045-1::On1020 +045-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob045-1::On1095 + + +045-1.gat,0,0,0|script|Mob045-1|-1 { end; diff --git a/world/map/npc/046-1/_mobs.txt b/world/map/npc/046-1/_mobs.txt index a875205e..d478ac67 100644 --- a/world/map/npc/046-1/_mobs.txt +++ b/world/map/npc/046-1/_mobs.txt @@ -1,20 +1,20 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Rock Plateau mobs -046-1.gat,0,0,0,0|monster|Reinboo|1094,40,100000,30000,Mob046-1::On1094 -046-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000,30000,Mob046-1::On1020 -046-1.gat,0,0,0,0|monster|Squirrel|1038,50,100000,30000,Mob046-1::On1038 -046-1.gat,44,28,52,20|monster|Moggun|1061,12,100000,30000,Mob046-1::On1061 -046-1.gat,0,0,0,0|monster|Yeti|1072,2,100000,30000,Mob046-1::On1072 -046-1.gat,87,94,23,13|monster|Wolvern|1090,5,100000,30000,Mob046-1::On1090 -046-1.gat,0,0,0,0|monster|WhiteBell|1095,9,100000,30000,Mob046-1::On1095 -046-1.gat,72,52,15,12|monster|Wolvern|1090,2,100000,30000,Mob046-1::On1090 -046-1.gat,36,105,10,9|monster|Wolvern|1090,2,100000,30000,Mob046-1::On1090 -046-1.gat,115,33,45,33|monster|Wolvern|1090,7,100000,30000,Mob046-1::On1090 -046-1.gat,145,60,10,9|monster|Wolvern|1090,2,100000,30000,Mob046-1::On1090 - - -046-1.gat,0,0,0|script|Mob046-1|-1, +046-1.gat,0,0,0,0|monster|Reinboo|1094,40,100000ms,30000ms,Mob046-1::On1094 +046-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob046-1::On1020 +046-1.gat,0,0,0,0|monster|Squirrel|1038,50,100000ms,30000ms,Mob046-1::On1038 +046-1.gat,44,28,52,20|monster|Moggun|1061,12,100000ms,30000ms,Mob046-1::On1061 +046-1.gat,0,0,0,0|monster|Yeti|1072,2,100000ms,30000ms,Mob046-1::On1072 +046-1.gat,87,94,23,13|monster|Wolvern|1090,5,100000ms,30000ms,Mob046-1::On1090 +046-1.gat,0,0,0,0|monster|WhiteBell|1095,9,100000ms,30000ms,Mob046-1::On1095 +046-1.gat,72,52,15,12|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090 +046-1.gat,36,105,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090 +046-1.gat,115,33,45,33|monster|Wolvern|1090,7,100000ms,30000ms,Mob046-1::On1090 +046-1.gat,145,60,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090 + + +046-1.gat,0,0,0|script|Mob046-1|-1 { end; diff --git a/world/map/npc/046-3/_mobs.txt b/world/map/npc/046-3/_mobs.txt index 6e7238a1..07f185cb 100644 --- a/world/map/npc/046-3/_mobs.txt +++ b/world/map/npc/046-3/_mobs.txt @@ -1,24 +1,24 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Frosty Underground mobs -046-3.gat,68,101,12,8|monster|Yeti|1072,2,100000,30000,Mob046-3::On1072 -046-3.gat,0,0,0,0|monster|IceGoblin|1058,20,100000,30000,Mob046-3::On1058 -046-3.gat,55,61,25,26|monster|Moggun|1061,14,100000,30000,Mob046-3::On1061 -046-3.gat,119,104,5,4|monster|IceElement|1071,1,100000,30000,Mob046-3::On1071 -046-3.gat,132,71,9,7|monster|WhiteSlime|1093,4,100000,30000,Mob046-3::On1093 -046-3.gat,107,85,14,9|monster|BlueSlime|1091,2,100000,30000,Mob046-3::On1091 -046-3.gat,98,77,6,4|monster|WhiteSlime|1093,4,100000,30000,Mob046-3::On1093 -046-3.gat,70,82,6,4|monster|WhiteSlime|1093,6,100000,30000,Mob046-3::On1093 -046-3.gat,106,34,6,4|monster|WhiteSlime|1093,4,100000,30000,Mob046-3::On1093 -046-3.gat,33,37,6,4|monster|WhiteSlime|1093,4,100000,30000,Mob046-3::On1093 -046-3.gat,144,105,14,9|monster|BlueSlime|1091,2,100000,30000,Mob046-3::On1091 -046-3.gat,152,55,14,9|monster|BlueSlime|1091,2,100000,30000,Mob046-3::On1091 -046-3.gat,84,53,14,9|monster|BlueSlime|1091,2,100000,30000,Mob046-3::On1091 -046-3.gat,47,23,15,10|monster|IceElement|1071,2,100000,30000,Mob046-3::On1071 -046-3.gat,113,48,12,8|monster|Yeti|1072,2,100000,30000,Mob046-3::On1072 - - -046-3.gat,0,0,0|script|Mob046-3|-1, +046-3.gat,68,101,12,8|monster|Yeti|1072,2,100000ms,30000ms,Mob046-3::On1072 +046-3.gat,0,0,0,0|monster|IceGoblin|1058,20,100000ms,30000ms,Mob046-3::On1058 +046-3.gat,55,61,25,26|monster|Moggun|1061,14,100000ms,30000ms,Mob046-3::On1061 +046-3.gat,119,104,5,4|monster|IceElement|1071,1,100000ms,30000ms,Mob046-3::On1071 +046-3.gat,132,71,9,7|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093 +046-3.gat,107,85,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091 +046-3.gat,98,77,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093 +046-3.gat,70,82,6,4|monster|WhiteSlime|1093,6,100000ms,30000ms,Mob046-3::On1093 +046-3.gat,106,34,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093 +046-3.gat,33,37,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093 +046-3.gat,144,105,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091 +046-3.gat,152,55,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091 +046-3.gat,84,53,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091 +046-3.gat,47,23,15,10|monster|IceElement|1071,2,100000ms,30000ms,Mob046-3::On1071 +046-3.gat,113,48,12,8|monster|Yeti|1072,2,100000ms,30000ms,Mob046-3::On1072 + + +046-3.gat,0,0,0|script|Mob046-3|-1 { end; diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt index 7b0e6f32..28cd5228 100644 --- a/world/map/npc/047-1/_mobs.txt +++ b/world/map/npc/047-1/_mobs.txt @@ -1,18 +1,18 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Highlands mobs -047-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000,30000,Mob047-1::On1094 -047-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000,30000,Mob047-1::On1020 -047-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000,30000,Mob047-1::On1095 -047-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000,30000,Mob047-1::On1038 -047-1.gat,24,57,1,1|monster|Yeti|1072,1,100000,30000,Mob047-1::On1072 -047-1.gat,111,26,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 -047-1.gat,35,79,22,27|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 -047-1.gat,127,65,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 -047-1.gat,61,29,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 - - -047-1.gat,0,0,0|script|Mob047-1|-1, +047-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000ms,30000ms,Mob047-1::On1094 +047-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000ms,30000ms,Mob047-1::On1020 +047-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob047-1::On1095 +047-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000ms,30000ms,Mob047-1::On1038 +047-1.gat,24,57,1,1|monster|Yeti|1072,1,100000ms,30000ms,Mob047-1::On1072 +047-1.gat,111,26,23,13|monster|Wolvern|1090,4,100000ms,30000ms,Mob047-1::On1090 +047-1.gat,35,79,22,27|monster|Wolvern|1090,4,100000ms,30000ms,Mob047-1::On1090 +047-1.gat,127,65,23,13|monster|Wolvern|1090,4,100000ms,30000ms,Mob047-1::On1090 +047-1.gat,61,29,23,13|monster|Wolvern|1090,4,100000ms,30000ms,Mob047-1::On1090 + + +047-1.gat,0,0,0|script|Mob047-1|-1 { end; diff --git a/world/map/npc/048-1/_mobs.txt b/world/map/npc/048-1/_mobs.txt index 2bdf466d..5365a6d2 100644 --- a/world/map/npc/048-1/_mobs.txt +++ b/world/map/npc/048-1/_mobs.txt @@ -1,20 +1,20 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Snow Forest mobs -048-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000,30000,Mob048-1::On1094 -048-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000,30000,Mob048-1::On1020 -048-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000,30000,Mob048-1::On1038 -048-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob048-1::On1095 -048-1.gat,68,40,2,2|monster|WhiteSlime|1093,4,100000,30000,Mob048-1::On1093 -048-1.gat,72,61,4,5|monster|BlueSlime|1091,2,100000,30000,Mob048-1::On1091 -048-1.gat,48,37,2,2|monster|WhiteSlime|1093,4,100000,30000,Mob048-1::On1093 -048-1.gat,72,30,2,2|monster|WhiteSlime|1093,4,100000,30000,Mob048-1::On1093 -048-1.gat,61,50,4,5|monster|BlueSlime|1091,2,100000,30000,Mob048-1::On1091 -048-1.gat,61,35,4,5|monster|BlueSlime|1091,2,100000,30000,Mob048-1::On1091 -048-1.gat,42,25,2,2|monster|WhiteSlime|1093,4,100000,30000,Mob048-1::On1093 - - -048-1.gat,0,0,0|script|Mob048-1|-1, +048-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000ms,30000ms,Mob048-1::On1094 +048-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000ms,30000ms,Mob048-1::On1020 +048-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000ms,30000ms,Mob048-1::On1038 +048-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob048-1::On1095 +048-1.gat,68,40,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob048-1::On1093 +048-1.gat,72,61,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob048-1::On1091 +048-1.gat,48,37,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob048-1::On1093 +048-1.gat,72,30,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob048-1::On1093 +048-1.gat,61,50,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob048-1::On1091 +048-1.gat,61,35,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob048-1::On1091 +048-1.gat,42,25,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob048-1::On1093 + + +048-1.gat,0,0,0|script|Mob048-1|-1 { end; diff --git a/world/map/npc/048-2/_mobs.txt b/world/map/npc/048-2/_mobs.txt index a1f6d8a3..e024fd72 100644 --- a/world/map/npc/048-2/_mobs.txt +++ b/world/map/npc/048-2/_mobs.txt @@ -3,7 +3,7 @@ -048-2.gat,0,0,0|script|Mob048-2|-1, +048-2.gat,0,0,0|script|Mob048-2|-1 { end; } diff --git a/world/map/npc/048-2/bluesageConfig.txt b/world/map/npc/048-2/bluesageConfig.txt index 58c8e27b..0aeda5fc 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|-1 { end; @@ -97,19 +97,19 @@ OnInit: end; } -function|script|updateBlueSageBookPages|, +function|script|updateBlueSageBookPages { set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageBookPages_MASK) | (@bookpages << $@Q_BlueSageBookPages_SHIFT)); return; } -function|script|updateBlueSageInvestigate|, +function|script|updateBlueSageInvestigate { set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageInvestigate_MASK) | (@investigate << $@Q_BlueSageInvestigate_SHIFT)); return; } -function|script|blueSageNumberOfClearedNests|, +function|script|blueSageNumberOfClearedNests { set @slimenests, 0; if (QUEST_BlueSage & $@Q_BlueSageSlime0) diff --git a/world/map/npc/048-2/helperAccused.txt b/world/map/npc/048-2/helperAccused.txt index 96a6060b..ec9b7da4 100644 --- a/world/map/npc/048-2/helperAccused.txt +++ b/world/map/npc/048-2/helperAccused.txt @@ -4,7 +4,7 @@ // Peetu is the person who caused the accident // involved investigation subquest -048-2.gat,25,135,0|script|Peetu|366, +048-2.gat,25,135,0|script|Peetu|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperBookpages1.txt b/world/map/npc/048-2/helperBookpages1.txt index 5d64ff5d..27ff12d8 100644 --- a/world/map/npc/048-2/helperBookpages1.txt +++ b/world/map/npc/048-2/helperBookpages1.txt @@ -4,7 +4,7 @@ // Ensio is one of the helpers working on sorting the bookpages, can take bookpages // can give second hint about the visitor in investigation subquest -048-2.gat,104,86,0|script|Ensio|365, +048-2.gat,104,86,0|script|Ensio|365 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/helperBookpages2.txt b/world/map/npc/048-2/helperBookpages2.txt index a337dfd7..79be8539 100644 --- a/world/map/npc/048-2/helperBookpages2.txt +++ b/world/map/npc/048-2/helperBookpages2.txt @@ -4,7 +4,7 @@ // Henriikka is one of the helpers working on sorting the bookpages, sends the player to Ensio // can be questioned as part of the investigation subquest, but doesn't give hints -048-2.gat,94,86,0|script|Henriikka|363, +048-2.gat,94,86,0|script|Henriikka|363 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/helperBookpages3.txt b/world/map/npc/048-2/helperBookpages3.txt index b3591abb..a4733060 100644 --- a/world/map/npc/048-2/helperBookpages3.txt +++ b/world/map/npc/048-2/helperBookpages3.txt @@ -4,7 +4,7 @@ // Teuvo is one of the helpers working on sorting the bookpages // can give second hint about Peetu in investigation subquest -048-2.gat,99,87,0|script|Teuvo|366, +048-2.gat,99,87,0|script|Teuvo|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/helperChief.txt b/world/map/npc/048-2/helperChief.txt index 9705e937..a7fb2073 100644 --- a/world/map/npc/048-2/helperChief.txt +++ b/world/map/npc/048-2/helperChief.txt @@ -4,7 +4,7 @@ // Chief of the Blue Sage helpers // involved in investigation subquest -048-2.gat,146,26,0|script|Oskari|365, +048-2.gat,146,26,0|script|Oskari|365 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning1.txt b/world/map/npc/048-2/helperCleaning1.txt index 58a2f684..0bcea8d4 100644 --- a/world/map/npc/048-2/helperCleaning1.txt +++ b/world/map/npc/048-2/helperCleaning1.txt @@ -4,7 +4,7 @@ // Pyry works on cleaning the library, can start the slime subquest // can give second hint about helper in investigation subquest -048-2.gat,117,106,0|script|Pyry|365, +048-2.gat,117,106,0|script|Pyry|365 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning2.txt b/world/map/npc/048-2/helperCleaning2.txt index 7dc99811..1e39b184 100644 --- a/world/map/npc/048-2/helperCleaning2.txt +++ b/world/map/npc/048-2/helperCleaning2.txt @@ -4,7 +4,7 @@ // Nea works on cleaning the library // can give second hint about helper in investigation subquest -048-2.gat,123,87,0|script|Nea|363, +048-2.gat,123,87,0|script|Nea|363 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning3.txt b/world/map/npc/048-2/helperCleaning3.txt index 752a9db8..44a3ca07 100644 --- a/world/map/npc/048-2/helperCleaning3.txt +++ b/world/map/npc/048-2/helperCleaning3.txt @@ -4,7 +4,7 @@ // Arvo works on cleaning the library // can give second hint about the visitor in investigation subquest -048-2.gat,139,99,0|script|Arvo|366, +048-2.gat,139,99,0|script|Arvo|366 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning4.txt b/world/map/npc/048-2/helperCleaning4.txt index 3a4d1662..a11feae1 100644 --- a/world/map/npc/048-2/helperCleaning4.txt +++ b/world/map/npc/048-2/helperCleaning4.txt @@ -4,7 +4,7 @@ // Kristian works on cleaning the library // can give second hint about the visitor in investigation subquest -048-2.gat,131,119,0|script|Kristian|366, +048-2.gat,131,119,0|script|Kristian|366 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning5.txt b/world/map/npc/048-2/helperCleaning5.txt index 92cc1923..6470298e 100644 --- a/world/map/npc/048-2/helperCleaning5.txt +++ b/world/map/npc/048-2/helperCleaning5.txt @@ -4,7 +4,7 @@ // Mirjami is searching for some cleaning supplies // can give second hint about visitor in investigation subquest -048-2.gat,100,125,0|script|Mirjami|363, +048-2.gat,100,125,0|script|Mirjami|363 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); diff --git a/world/map/npc/048-2/helperJanitor.txt b/world/map/npc/048-2/helperJanitor.txt index 68466dbb..f62e9c0b 100644 --- a/world/map/npc/048-2/helperJanitor.txt +++ b/world/map/npc/048-2/helperJanitor.txt @@ -4,7 +4,7 @@ // Elias is the janitor of the mansion // part of investigation subquest, gives initial hint on the visitor with the mask -048-2.gat,40,41,0|script|Elias|365, +048-2.gat,40,41,0|script|Elias|365 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperMInk.txt b/world/map/npc/048-2/helperMInk.txt index 0b101fb3..592df111 100644 --- a/world/map/npc/048-2/helperMInk.txt +++ b/world/map/npc/048-2/helperMInk.txt @@ -4,7 +4,7 @@ // Eevert asks for material to create inks for the illustrations in the new books // can give second hint about Peetu in investigation subquest -048-2.gat,95,103,0|script|Eevert|365, +048-2.gat,95,103,0|script|Eevert|365 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @water_amount, 5; diff --git a/world/map/npc/048-2/helperMReed.txt b/world/map/npc/048-2/helperMReed.txt index 7988d97a..7fef1486 100644 --- a/world/map/npc/048-2/helperMReed.txt +++ b/world/map/npc/048-2/helperMReed.txt @@ -4,7 +4,7 @@ // Kullervo asks for Reed Bundles to create paper for repairing the books // can give second hint about both Peetu and visitor in investigation subquest -048-2.gat,104,78,0|script|Kullervo|366, +048-2.gat,104,78,0|script|Kullervo|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @reed_amount, 20; diff --git a/world/map/npc/048-2/helperMSilk.txt b/world/map/npc/048-2/helperMSilk.txt index cda5054c..8b6b08a6 100644 --- a/world/map/npc/048-2/helperMSilk.txt +++ b/world/map/npc/048-2/helperMSilk.txt @@ -4,7 +4,7 @@ // Janika asks for Silk Cocoons for repairing the books // can give second hint about visitor in investigation subquest -048-2.gat,104,103,0|script|Janika|363, +048-2.gat,104,103,0|script|Janika|363 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @silk_amount, 80; diff --git a/world/map/npc/048-2/helperMYetiClaw.txt b/world/map/npc/048-2/helperMYetiClaw.txt index 90b583a4..9d830439 100644 --- a/world/map/npc/048-2/helperMYetiClaw.txt +++ b/world/map/npc/048-2/helperMYetiClaw.txt @@ -4,7 +4,7 @@ // Santeri asks for Yeti Claws to make glue for repairing the books // can give second hint about Peetu in investigation subquest -048-2.gat,97,78,0|script|Santeri|366, +048-2.gat,97,78,0|script|Santeri|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @claw_amount, 8; diff --git a/world/map/npc/048-2/helperResting1.txt b/world/map/npc/048-2/helperResting1.txt index 5ffd6f0f..e1425bc2 100644 --- a/world/map/npc/048-2/helperResting1.txt +++ b/world/map/npc/048-2/helperResting1.txt @@ -4,7 +4,7 @@ // Lenita is one of the helpers working on sorting the bookpages, but is currently having a break // can give second hint about the visitor in investigation subquest -048-2.gat,36,26,0|script|Lenita|363, +048-2.gat,36,26,0|script|Lenita|363 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/helperResting2.txt b/world/map/npc/048-2/helperResting2.txt index a6b4873c..26ff2db6 100644 --- a/world/map/npc/048-2/helperResting2.txt +++ b/world/map/npc/048-2/helperResting2.txt @@ -4,7 +4,7 @@ // Miro is one of the helpers cleaning up the library, but it currently having a break // can give second hint about the Peetu in investigation subquest -048-2.gat,35,27,0|script|Miro|366, +048-2.gat,35,27,0|script|Miro|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); diff --git a/world/map/npc/048-2/sageNikolai.txt b/world/map/npc/048-2/sageNikolai.txt index 5aa1b659..b396dbd9 100644 --- a/world/map/npc/048-2/sageNikolai.txt +++ b/world/map/npc/048-2/sageNikolai.txt @@ -3,7 +3,7 @@ // see bluesageConfig for detailed quest description // Sage Nikolai gives hints about the different subquests and rewards -048-2.gat,98,106,0|script|Nikolai|362, +048-2.gat,98,106,0|script|Nikolai|362 { set @halloween_npc_id, $@halloween_npc_nikolai; callfunc "TrickOrTreat"; @@ -287,7 +287,7 @@ L_Close: close; } -//048-2.gat,100,106,0|script|Debug|160, +//048-2.gat,100,106,0|script|Debug|160 //{ // set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); // set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/slimes.txt b/world/map/npc/048-2/slimes.txt index 2318d1f0..dceaad7a 100644 --- a/world/map/npc/048-2/slimes.txt +++ b/world/map/npc/048-2/slimes.txt @@ -13,7 +13,7 @@ // @spawnSlimeX: Number of slimes killed by the character that triggered the spawn // white slimes -048-2.gat,181,95,0|script|#Slime0Trigger|32767,2,2, +048-2.gat,181,95,0|script|#Slime0Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); @@ -46,7 +46,7 @@ L_End: end; } -048-2.gat,181,95,0|script|#Slime0|32767, +048-2.gat,181,95,0|script|#Slime0|32767 { end; @@ -102,7 +102,7 @@ L_ClearedPoint: // white slimes -048-2.gat,164,123,0|script|#Slime1Trigger|32767,2,2, +048-2.gat,164,123,0|script|#Slime1Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); @@ -135,7 +135,7 @@ L_End: end; } -048-2.gat,164,123,0|script|#Slime1|32767, +048-2.gat,164,123,0|script|#Slime1|32767 { end; @@ -191,7 +191,7 @@ L_ClearedPoint: // white slimes -048-2.gat,198,115,0|script|#Slime2Trigger|32767,2,2, +048-2.gat,198,115,0|script|#Slime2Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); @@ -224,7 +224,7 @@ L_End: end; } -048-2.gat,198,115,0|script|#Slime2|32767, +048-2.gat,198,115,0|script|#Slime2|32767 { end; @@ -280,7 +280,7 @@ L_ClearedPoint: // white slimes -048-2.gat,167,79,0|script|#Slime3Trigger|32767,2,2, +048-2.gat,167,79,0|script|#Slime3Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); @@ -313,7 +313,7 @@ L_End: end; } -048-2.gat,167,79,0|script|#Slime3|32767, +048-2.gat,167,79,0|script|#Slime3|32767 { end; @@ -369,7 +369,7 @@ L_ClearedPoint: // blue slimes -048-2.gat,192,86,0|script|#Slime4Trigger|32767,2,2, +048-2.gat,192,86,0|script|#Slime4Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); @@ -402,7 +402,7 @@ L_End: end; } -048-2.gat,192,86,0|script|#Slime4|32767, +048-2.gat,192,86,0|script|#Slime4|32767 { end; @@ -458,7 +458,7 @@ L_ClearedPoint: // blue slimes -048-2.gat,183,110,0|script|#Slime5Trigger|32767,2,2, +048-2.gat,183,110,0|script|#Slime5Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); @@ -491,7 +491,7 @@ L_End: end; } -048-2.gat,183,110,0|script|#Slime5|32767, +048-2.gat,183,110,0|script|#Slime5|32767 { end; @@ -547,7 +547,7 @@ L_ClearedPoint: // blue slimes -048-2.gat,164,102,0|script|#Slime6Trigger|32767,2,2, +048-2.gat,164,102,0|script|#Slime6Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); @@ -580,7 +580,7 @@ L_End: end; } -048-2.gat,164,102,0|script|#Slime6|32767, +048-2.gat,164,102,0|script|#Slime6|32767 { end; diff --git a/world/map/npc/048-2/traveler.txt b/world/map/npc/048-2/traveler.txt index 3a95c499..89f3ac58 100644 --- a/world/map/npc/048-2/traveler.txt +++ b/world/map/npc/048-2/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -048-2.gat,23,46,0|script|Drake the Traveler|103, +048-2.gat,23,46,0|script|Drake the Traveler|103 { set @NpcName$, "Drake"; set @NpcTravelBit, $@blue_sage_bit; diff --git a/world/map/npc/048-2/visitors.txt b/world/map/npc/048-2/visitors.txt index 8f43c941..4fc4b4ca 100644 --- a/world/map/npc/048-2/visitors.txt +++ b/world/map/npc/048-2/visitors.txt @@ -2,7 +2,7 @@ // author: Jenalya // visitors that came to see the library and are now disappointed -048-2.gat,46,44,0|script|Connor|150, +048-2.gat,46,44,0|script|Connor|150 { mes "[Connor]"; mes "\"Oh, hello. There was a big accident in the library! Most of the books were damaged or destroyed!\""; @@ -14,7 +14,7 @@ close; } -048-2.gat,28,30,0|script|Parcival|153, +048-2.gat,28,30,0|script|Parcival|153 { mes "[Parcival]"; mes "\"Hello young one. Did you also come here to see the library?\""; diff --git a/world/map/npc/051-1/_mobs.txt b/world/map/npc/051-1/_mobs.txt index 4b464216..e24f8515 100644 --- a/world/map/npc/051-1/_mobs.txt +++ b/world/map/npc/051-1/_mobs.txt @@ -1,11 +1,11 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Illia outskirts mobs -051-1.gat,42,35,42,24|monster|LogHead|1025,30,100000,30000,Mob051-1::On1025 -051-1.gat,42,35,41,22|monster|SpikyMushroom|1019,10,100000,30000,Mob051-1::On1019 +051-1.gat,42,35,42,24|monster|LogHead|1025,30,100000ms,30000ms,Mob051-1::On1025 +051-1.gat,42,35,41,22|monster|SpikyMushroom|1019,10,100000ms,30000ms,Mob051-1::On1019 -051-1.gat,0,0,0|script|Mob051-1|-1, +051-1.gat,0,0,0|script|Mob051-1|-1 { end; diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt index 960eb401..b2b4ad77 100644 --- a/world/map/npc/051-1/desert.txt +++ b/world/map/npc/051-1/desert.txt @@ -8,7 +8,7 @@ // 2: Players collected enough souls and gave the souls to the waterfall //----------------------------------------------------------------------------- -051-1.gat,142,39,0|script|Bones|367, +051-1.gat,142,39,0|script|Bones|367 { mes "You find a ruined paper next to these bones."; mes "It says..."; @@ -22,7 +22,7 @@ } -051-1.gat,170,24,0|script|Cursed Waterfall|400, +051-1.gat,170,24,0|script|Cursed Waterfall|400 { set $@illia_num_sealed_souls, 7; set @step, 3; diff --git a/world/map/npc/051-1/desertmonsters.txt b/world/map/npc/051-1/desertmonsters.txt index 9011e1b3..9ab901c9 100644 --- a/world/map/npc/051-1/desertmonsters.txt +++ b/world/map/npc/051-1/desertmonsters.txt @@ -1,7 +1,7 @@ -051-1.gat,134,36,67,49|monster|Soul Snake|1096,12,100000,30000,IlliaDMobs051-1::On1096 +051-1.gat,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.gat,0,0,0|script|IlliaDMobs051-1|-1, +051-1.gat,0,0,0|script|IlliaDMobs051-1|-1 { end; @@ -17,7 +17,7 @@ On1096: // Soul eater spawns. They will eat a Sealed Soul when killed, and when the soul collecting is started. // Spawn in the island -051-1.gat,142,38,0|script|#SoulEaters0Trigger|32767,3,3, +051-1.gat,142,38,0|script|#SoulEaters0Trigger|32767,3,3 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -27,7 +27,7 @@ On1096: end; } -051-1.gat,142,38,0|script|#SoulEaters0|32767, +051-1.gat,142,38,0|script|#SoulEaters0|32767 { end; @@ -48,7 +48,7 @@ OnSoulEaterDeath: } // Spawn inside the north building -051-1.gat,134,16,0|script|#SoulEaters1Trigger|32767,9,2, +051-1.gat,134,16,0|script|#SoulEaters1Trigger|32767,9,2 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -58,7 +58,7 @@ OnSoulEaterDeath: end; } -051-1.gat,134,16,0|script|#SoulEaters1|32767, +051-1.gat,134,16,0|script|#SoulEaters1|32767 { end; @@ -79,7 +79,7 @@ OnSoulEaterDeath: } // Spawn in the south grass area -051-1.gat,137,55,0|script|#SoulEaters2Trigger|32767,5,4, +051-1.gat,137,55,0|script|#SoulEaters2Trigger|32767,5,4 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -89,7 +89,7 @@ OnSoulEaterDeath: end; } -051-1.gat,137,55,0|script|#SoulEaters2|32767, +051-1.gat,137,55,0|script|#SoulEaters2|32767 { end; @@ -110,7 +110,7 @@ OnSoulEaterDeath: } // Spawn near the eastern cliff -051-1.gat,155,35,0|script|#SoulEaters3Trigger|32767,4,7, +051-1.gat,155,35,0|script|#SoulEaters3Trigger|32767,4,7 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -120,7 +120,7 @@ OnSoulEaterDeath: end; } -051-1.gat,155,35,0|script|#SoulEaters3|32767, +051-1.gat,155,35,0|script|#SoulEaters3|32767 { end; @@ -141,7 +141,7 @@ OnSoulEaterDeath: } // Spawn near the western cliff -051-1.gat,120,38,0|script|#SoulEaters4Trigger|32767,6,9, +051-1.gat,120,38,0|script|#SoulEaters4Trigger|32767,6,9 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -151,7 +151,7 @@ OnSoulEaterDeath: end; } -051-1.gat,120,38,0|script|#SoulEaters4|32767, +051-1.gat,120,38,0|script|#SoulEaters4|32767 { end; diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt index 9a1b7223..a594d231 100644 --- a/world/map/npc/051-1/forest.txt +++ b/world/map/npc/051-1/forest.txt @@ -9,7 +9,7 @@ // 3: Players unlocked the door //----------------------------------------------------------------------------- -051-1.gat,64,46,0|script|Strange Stone|400, +051-1.gat,64,46,0|script|Strange Stone|400 { set @step, 1; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -61,7 +61,7 @@ L_TaskComplete: } // Warp from the forest, to the cave -051-1.gat,66,44,0|script|#ToCave|32767,1,1, +051-1.gat,66,44,0|script|#ToCave|32767,1,1 { set @step, 1; if ($@illia_progress < @step) goto L_ShouldNotBeHere; diff --git a/world/map/npc/051-1/forestmonsters.txt b/world/map/npc/051-1/forestmonsters.txt index 3ad5ea4e..89ed60a9 100644 --- a/world/map/npc/051-1/forestmonsters.txt +++ b/world/map/npc/051-1/forestmonsters.txt @@ -1,6 +1,6 @@ -051-1.gat,52,32,10,8|monster|Green Slime|1005,20,100000,30000,IlliaFMobs051-1::On1005 +051-1.gat,52,32,10,8|monster|GreenSlime|1005,20,100000ms,30000ms,IlliaFMobs051-1::On1005 -051-1.gat,0,0,0|script|IlliaFMobs051-1|-1, +051-1.gat,0,0,0|script|IlliaFMobs051-1|-1 { end; diff --git a/world/map/npc/051-1/janitor.txt b/world/map/npc/051-1/janitor.txt index b2be30da..c1e23f76 100644 --- a/world/map/npc/051-1/janitor.txt +++ b/world/map/npc/051-1/janitor.txt @@ -1,5 +1,5 @@ // Forest janitor -051-1.gat,1,1,0|script|#IlliaJanitor1|127, +051-1.gat,1,1,0|script|#IlliaJanitor1|127 { end; @@ -10,7 +10,7 @@ OnCommandClean: } // Desert janitor -051-1.gat,1,1,0|script|#IlliaJanitor3|127, +051-1.gat,1,1,0|script|#IlliaJanitor3|127 { end; diff --git a/world/map/npc/051-3/_mobs.txt b/world/map/npc/051-3/_mobs.txt index 6166fefa..cc796b3b 100644 --- a/world/map/npc/051-3/_mobs.txt +++ b/world/map/npc/051-3/_mobs.txt @@ -1,25 +1,25 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Illia Bandit Cave mobs -051-3.gat,31,52,21,13|monster|RedSlime|1008,8,100000,30000,Mob051-3::On1008 -051-3.gat,31,52,19,14|monster|CaveMaggot|1056,3,100000,30000,Mob051-3::On1056 -051-3.gat,56,102,3,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012 -051-3.gat,61,102,2,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012 -051-3.gat,65,102,2,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012 -051-3.gat,71,109,4,2|monster|BlackScorpion|1009,1,100000,250000,Mob051-3::On1009 -051-3.gat,59,56,12,36|monster|Bandit|1064,47,100000,10000,Mob051-3::On1064 -051-3.gat,59,44,13,13|monster|BanditLord|1065,4,100000,20000,Mob051-3::On1065 -051-3.gat,60,69,18,9|monster|BanditLord|1065,4,100000,20000,Mob051-3::On1065 -051-3.gat,63,94,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099 -051-3.gat,53,93,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099 -051-3.gat,48,71,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099 -051-3.gat,38,30,17,12|monster|Bandit|1064,12,100000,10000,Mob051-3::On1064 -051-3.gat,39,33,11,8|monster|BanditLord|1065,2,100000,20000,Mob051-3::On1065 -051-3.gat,80,101,10,12|monster|CopperSlime|1098,7,100000,60000,Mob051-3::On1098 -051-3.gat,60,94,18,5|monster|CopperSlime|1098,7,100000,60000,Mob051-3::On1098 +051-3.gat,31,52,21,13|monster|RedSlime|1008,8,100000ms,30000ms,Mob051-3::On1008 +051-3.gat,31,52,19,14|monster|CaveMaggot|1056,3,100000ms,30000ms,Mob051-3::On1056 +051-3.gat,56,102,3,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012 +051-3.gat,61,102,2,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012 +051-3.gat,65,102,2,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012 +051-3.gat,71,109,4,2|monster|BlackScorpion|1009,1,100000ms,250000ms,Mob051-3::On1009 +051-3.gat,59,56,12,36|monster|Bandit|1064,47,100000ms,10000ms,Mob051-3::On1064 +051-3.gat,59,44,13,13|monster|BanditLord|1065,4,100000ms,20000ms,Mob051-3::On1065 +051-3.gat,60,69,18,9|monster|BanditLord|1065,4,100000ms,20000ms,Mob051-3::On1065 +051-3.gat,63,94,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099 +051-3.gat,53,93,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099 +051-3.gat,48,71,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099 +051-3.gat,38,30,17,12|monster|Bandit|1064,12,100000ms,10000ms,Mob051-3::On1064 +051-3.gat,39,33,11,8|monster|BanditLord|1065,2,100000ms,20000ms,Mob051-3::On1065 +051-3.gat,80,101,10,12|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098 +051-3.gat,60,94,18,5|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098 -051-3.gat,0,0,0|script|Mob051-3|-1, +051-3.gat,0,0,0|script|Mob051-3|-1 { end; diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt index 109d55b2..10cf8d28 100644 --- a/world/map/npc/051-3/ambush.txt +++ b/world/map/npc/051-3/ambush.txt @@ -10,13 +10,13 @@ // 4: Key of the door found, to leave the cave //----------------------------------------------------------------------------- -051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2, +051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2 { message strcharinfo(0), "There is no way I can pass here. Let's find another way."; end; } -051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2, +051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2 { set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -34,7 +34,7 @@ L_ShouldNotBeHere: } -051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3, +051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3 { set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -52,7 +52,7 @@ L_ShouldNotBeHere: end; } -051-3.gat,1,1,0|script|#BndtTl|127, +051-3.gat,1,1,0|script|#BndtTl|127 { end; @@ -141,7 +141,7 @@ L_CaptureHelper3: } -051-3.gat,29,94,0|script|Sneaky Bandit|127, +051-3.gat,29,94,0|script|Sneaky Bandit|127 { end; @@ -161,7 +161,7 @@ OnTimer3600: } -051-3.gat,33,95,0|script|Another Sneaky Bandit|127, +051-3.gat,33,95,0|script|Another Sneaky Bandit|127 { end; diff --git a/world/map/npc/051-3/jailslimes.txt b/world/map/npc/051-3/jailslimes.txt index e0ad4062..48a70de9 100644 --- a/world/map/npc/051-3/jailslimes.txt +++ b/world/map/npc/051-3/jailslimes.txt @@ -1,10 +1,10 @@ // Separate spawns for the copper slimes in the 4 jails -051-3.gat,57,104,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098 -051-3.gat,62,104,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098 -051-3.gat,63,104,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098 -051-3.gat,70,111,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098 +051-3.gat,57,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 +051-3.gat,62,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 +051-3.gat,63,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 +051-3.gat,70,111,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 -051-3.gat,0,0,0|script|IlliaCMobs051-3|-1, +051-3.gat,0,0,0|script|IlliaCMobs051-3|-1 { end; diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt index 527ca24c..c33d791b 100644 --- a/world/map/npc/051-3/janitor.txt +++ b/world/map/npc/051-3/janitor.txt @@ -1,5 +1,5 @@ // Bandit cave janitor -051-3.gat,1,1,0|script|#IlliaJanitor2|127, +051-3.gat,1,1,0|script|#IlliaJanitor2|127 { end; diff --git a/world/map/npc/051-3/locks.txt b/world/map/npc/051-3/locks.txt index e04740af..f0fcb9d7 100644 --- a/world/map/npc/051-3/locks.txt +++ b/world/map/npc/051-3/locks.txt @@ -1,4 +1,4 @@ -051-3.gat,69,107,0|script|Jail Lock 1|400, +051-3.gat,69,107,0|script|Jail Lock 1|400 { if (isin("051-3.gat", 69, 108, 73, 111)) goto L_Do_Lock_Picking; end; @@ -17,7 +17,7 @@ L_OpenDoor: close; } -051-3.gat,64,100,0|script|Jail Lock 2|400, +051-3.gat,64,100,0|script|Jail Lock 2|400 { if (isin("051-3.gat", 64, 101, 66, 104)) goto L_Do_Lock_Picking; end; @@ -34,7 +34,7 @@ L_OpenDoor: close; } -051-3.gat,62,100,0|script|Jail Lock 3|400, +051-3.gat,62,100,0|script|Jail Lock 3|400 { if (isin("051-3.gat", 61, 101, 62, 104)) goto L_Do_Lock_Picking; end; @@ -51,7 +51,7 @@ L_OpenDoor: close; } -051-3.gat,58,100,0|script|Jail Lock 4|400, +051-3.gat,58,100,0|script|Jail Lock 4|400 { if (isin("051-3.gat", 57, 101, 58, 104)) goto L_Do_Lock_Picking; end; diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt index 75bc1f19..66db7451 100644 --- a/world/map/npc/051-3/reinforcements.txt +++ b/world/map/npc/051-3/reinforcements.txt @@ -1,4 +1,4 @@ -051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3, +051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3 { set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -14,7 +14,7 @@ L_ShouldNotBeHere: end; } -051-3.gat,37,24,0|script|Door|400, +051-3.gat,37,24,0|script|Door|400 { set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -48,7 +48,7 @@ OnRnfrcmts: // Spawn 4 bandit lords areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::OnB"; initnpctimer; - mapannounce "051-3.gat", "Bandit Lords : Do not let them escape!!" , 0; + mapannounce "051-3.gat", "Bandit Lords:* Do not let them escape!!" , 0; areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts"; end; diff --git a/world/map/npc/052-1/_mobs.txt b/world/map/npc/052-1/_mobs.txt index 37e8e0c6..6b59f8b6 100644 --- a/world/map/npc/052-1/_mobs.txt +++ b/world/map/npc/052-1/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Illia archipelago mobs -052-1.gat,55,29,43,39|monster|AzulSlime|1100,18,100000,20000,Mob052-1::On1100 +052-1.gat,55,29,43,39|monster|AzulSlime|1100,18,100000ms,20000ms,Mob052-1::On1100 -052-1.gat,0,0,0|script|Mob052-1|-1, +052-1.gat,0,0,0|script|Mob052-1|-1 { end; diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt index 34633ac5..33a0aa51 100644 --- a/world/map/npc/052-1/channelling.txt +++ b/world/map/npc/052-1/channelling.txt @@ -8,7 +8,7 @@ // 2: Channelling completed //----------------------------------------------------------------------------- -052-1.gat,25,44,0|script|#EnchantDoorTrigger|32767,3,4, +052-1.gat,25,44,0|script|#EnchantDoorTrigger|32767,3,4 { set @step, 4; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -64,7 +64,7 @@ OnCommandDestroy: } -052-1.gat,51,38,0|script|Engravings|400, +052-1.gat,51,38,0|script|Engravings|400 { mes "You can read some words engraved inside this rock, but some are erased by wind and time:"; next; @@ -92,7 +92,7 @@ L_SuggestChannelling: } -function|script|StartChannelling|, +function|script|StartChannelling { if (isat("052-1.gat",53,38) == 0) end; @@ -130,7 +130,7 @@ function|script|StartChannelling|, } -052-1.gat,53,38,0|script|#Power Circle|368, +052-1.gat,53,38,0|script|#Power Circle|368 { set @step, 4; if ($@illia_progress < @step) diff --git a/world/map/npc/052-1/janitor.txt b/world/map/npc/052-1/janitor.txt index 0a3a5356..26b52d38 100644 --- a/world/map/npc/052-1/janitor.txt +++ b/world/map/npc/052-1/janitor.txt @@ -1,6 +1,6 @@ // Illia Island janitor -052-1.gat,1,1,0|script|#IlliaJanitor4|127, +052-1.gat,1,1,0|script|#IlliaJanitor4|127 { end; diff --git a/world/map/npc/052-2/_mobs.txt b/world/map/npc/052-2/_mobs.txt index f105c44e..9c43d9af 100644 --- a/world/map/npc/052-2/_mobs.txt +++ b/world/map/npc/052-2/_mobs.txt @@ -3,7 +3,7 @@ -052-2.gat,0,0,0|script|Mob052-2|-1, +052-2.gat,0,0,0|script|Mob052-2|-1 { end; } diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index 84c5a5cd..fc57e654 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -12,7 +12,7 @@ // 3: player choosed to leave the room //----------------------------------------------------------------------------- -052-2.gat,136,73,0|script|Chest#illia|111, +052-2.gat,136,73,0|script|Chest#illia|111 { set @step, 8; if ($@illia_progress < @step) goto L_ShouldNotBeHere; diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt index 7ee68955..d78c4bba 100644 --- a/world/map/npc/052-2/janitor.txt +++ b/world/map/npc/052-2/janitor.txt @@ -1,5 +1,5 @@ // Lobby janitor -052-2.gat,1,1,0|script|#IlliaJanitor5|127, +052-2.gat,1,1,0|script|#IlliaJanitor5|127 { end; @@ -12,7 +12,7 @@ OnCommandClean: } // Storage janitor -052-2.gat,1,1,0|script|#IlliaJanitor6|127, +052-2.gat,1,1,0|script|#IlliaJanitor6|127 { end; @@ -24,7 +24,7 @@ OnCommandClean: } // Final boss janitor -052-2.gat,1,1,0|script|#IlliaJanitor7|127, +052-2.gat,1,1,0|script|#IlliaJanitor7|127 { end; diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt index c707c76f..fb9dd41e 100644 --- a/world/map/npc/052-2/lobby.txt +++ b/world/map/npc/052-2/lobby.txt @@ -14,7 +14,7 @@ // 8: Witch guards defeated. Door is open. //----------------------------------------------------------------------------- -052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2, +052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2 { set @step, 5; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -33,7 +33,7 @@ L_ShouldNotBeHere: } -052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2, +052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2 { set @step, 5; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -50,7 +50,7 @@ L_ShouldNotBeHere: end; } -052-2.gat,1,1,0|script|#LuviaShadow|127, +052-2.gat,1,1,0|script|#LuviaShadow|127 { end; @@ -103,7 +103,7 @@ OnNN: } -052-2.gat,1,1,0|script|#MysteriousVoice|127, +052-2.gat,1,1,0|script|#MysteriousVoice|127 { end; @@ -149,7 +149,7 @@ L_Continue: // Dummy npc to display the mysterious voice, // as a workaround to fakenpcname causing problems -052-2.gat,1,1,0|script|?|127, +052-2.gat,1,1,0|script|?|127 { end; diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt index ef04a667..a2857e9c 100644 --- a/world/map/npc/052-2/partyroom.txt +++ b/world/map/npc/052-2/partyroom.txt @@ -9,7 +9,7 @@ // 3: Luvia is defeated //----------------------------------------------------------------------------- -052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2, +052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -29,7 +29,7 @@ L_ShouldNotBeHere: // A trigger whose only purpose is to place Luvia npcs back in place. // (even though the Janitor 7 will have done this job) -052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1, +052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1 { if (strcharinfo(0) != $@ILLIA_HERO$) end; if ($@illia_progress == 7 && $@illia_level_7_progress == 0) goto L_PlaceLuvia; @@ -42,7 +42,7 @@ L_PlaceLuvia: } -052-2.gat,88,15,0|script|Luvia|371, +052-2.gat,88,15,0|script|Luvia|371 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -83,7 +83,7 @@ OnTimer15000: } -052-2.gat,88,15,0|script|#LuviaDaemon|127, +052-2.gat,88,15,0|script|#LuviaDaemon|127 { end; @@ -214,7 +214,7 @@ OnDeath: end; set $@illia_level_7_progress, 4; killmonster "052-2.gat", "#LuviaDaemon::OnWGD"; - mapannounce "052-2.gat", "Luvia : How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; + mapannounce "052-2.gat", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; set $@illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120; areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP"; @@ -272,7 +272,7 @@ OnW00t: } // Warp from the party room, to the chest room -052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2, +052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt index 50c4bad7..1951cfaf 100644 --- a/world/map/npc/052-2/storage.txt +++ b/world/map/npc/052-2/storage.txt @@ -8,7 +8,7 @@ // 2: All spawns are done and the players killed all mobs //----------------------------------------------------------------------------- -052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0, +052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0 { set @step, 6; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -27,14 +27,14 @@ L_StartItemInvoker: } -052-2.gat,1,1,0|script|#ItemsInvoker|127, +052-2.gat,1,1,0|script|#ItemsInvoker|127 { end; OnInit: setarray $@illia_storage_items, 541, 567, 568, 562; setarray $@illia_storage_special_items, 687, 827, 1229; - // Map coords : x1,y1, x2,y2, ... + // Map coords:* x1,y1, x2,y2, ... setarray $@illia_storage_item_points, 20,67, 22,75, 27,71, 30,73, 34,76, 30,64, 34,65, 34,62, 21,61, 22,64; end; @@ -172,7 +172,7 @@ OnWow: } -052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1, +052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1 { set @step, 6; if ($@illia_progress < @step) goto L_ShouldNotBeHere; diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt index 9643e9c5..a291e3b7 100644 --- a/world/map/npc/055-1/_mobs.txt +++ b/world/map/npc/055-1/_mobs.txt @@ -1,26 +1,26 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Hills mobs -055-1.gat,68,72,22,19|monster|Butterfly|1055,16,10000,85000,Mob055-1::On1055 -055-1.gat,87,29,55,14|monster|Silkworm|1035,15,10000,85000,Mob055-1::On1035 -055-1.gat,79,30,84,17|monster|Squirrel|1038,10,10000,45000,Mob055-1::On1038 -055-1.gat,0,0,0,0|monster|Mouboo|1028,15,10000,85000,Mob055-1::On1028 -055-1.gat,91,49,6,4|monster|CloverPatch|1037,1,10000,180000,Mob055-1::On1037 -055-1.gat,103,54,5,3|monster|CloverPatch|1037,1,10000,180000,Mob055-1::On1037 -055-1.gat,64,75,27,16|monster|CloverPatch|1037,1,10000,120000,Mob055-1::On1037 -055-1.gat,80,34,82,25|monster|Snail|1041,3,10000,85000,Mob055-1::On1041 -055-1.gat,70,72,17,24|monster|AlizarinPlant|1032,2,10000,60000,Mob055-1::On1032 -055-1.gat,81,32,81,22|monster|AlizarinPlant|1032,2,10000,60000,Mob055-1::On1032 -055-1.gat,0,0,0,0|monster|MauvePlant|1029,7,10000,55000,Mob055-1::On1029 -055-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000,60000,Mob055-1::On1030 -055-1.gat,0,0,0,0|monster|GambogePlant|1031,2,10000,60000,Mob055-1::On1031 -055-1.gat,116,60,4,2|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014 -055-1.gat,97,60,4,2|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014 -055-1.gat,64,73,23,17|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014 -055-1.gat,0,0,0,0|monster|SpikyMushroom|1019,7,10000,60000,Mob055-1::On1019 +055-1.gat,68,72,22,19|monster|Butterfly|1055,16,10000ms,85000ms,Mob055-1::On1055 +055-1.gat,87,29,55,14|monster|Silkworm|1035,15,10000ms,85000ms,Mob055-1::On1035 +055-1.gat,79,30,84,17|monster|Squirrel|1038,10,10000ms,45000ms,Mob055-1::On1038 +055-1.gat,0,0,0,0|monster|Mouboo|1028,15,10000ms,85000ms,Mob055-1::On1028 +055-1.gat,91,49,6,4|monster|CloverPatch|1037,1,10000ms,180000ms,Mob055-1::On1037 +055-1.gat,103,54,5,3|monster|CloverPatch|1037,1,10000ms,180000ms,Mob055-1::On1037 +055-1.gat,64,75,27,16|monster|CloverPatch|1037,1,10000ms,120000ms,Mob055-1::On1037 +055-1.gat,80,34,82,25|monster|Snail|1041,3,10000ms,85000ms,Mob055-1::On1041 +055-1.gat,70,72,17,24|monster|AlizarinPlant|1032,2,10000ms,60000ms,Mob055-1::On1032 +055-1.gat,81,32,81,22|monster|AlizarinPlant|1032,2,10000ms,60000ms,Mob055-1::On1032 +055-1.gat,0,0,0,0|monster|MauvePlant|1029,7,10000ms,55000ms,Mob055-1::On1029 +055-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000ms,60000ms,Mob055-1::On1030 +055-1.gat,0,0,0,0|monster|GambogePlant|1031,2,10000ms,60000ms,Mob055-1::On1031 +055-1.gat,116,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014 +055-1.gat,97,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014 +055-1.gat,64,73,23,17|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014 +055-1.gat,0,0,0,0|monster|SpikyMushroom|1019,7,10000ms,60000ms,Mob055-1::On1019 -055-1.gat,0,0,0|script|Mob055-1|-1, +055-1.gat,0,0,0|script|Mob055-1|-1 { end; diff --git a/world/map/npc/055-1/flowerpentagram4.txt b/world/map/npc/055-1/flowerpentagram4.txt index 59c5195f..b0996bb3 100644 --- a/world/map/npc/055-1/flowerpentagram4.txt +++ b/world/map/npc/055-1/flowerpentagram4.txt @@ -1,6 +1,6 @@ // Author: Jenalya -055-1.gat,141,89,0|script|#FlowerPentagram4|400, +055-1.gat,141,89,0|script|#FlowerPentagram4|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt index 98d820b9..391cf96f 100644 --- a/world/map/npc/055-1/pumpkins.txt +++ b/world/map/npc/055-1/pumpkins.txt @@ -1,10 +1,10 @@ // Pumpkin mobs for the seasonal halloween event with Oscar -055-1.gat,48,25,16,8|monster|Spawn Pumpkin|1063,12,10000,5000,PumpkinMob055-1::On1063 -055-1.gat,139,29,5,7|monster|Spawn Pumpkin|1063,7,10000,5000,PumpkinMob055-1::On1063 -055-1.gat,132,24,6,4|monster|Spawn Pumpkin|1063,4,10000,5000,PumpkinMob055-1::On1063 +055-1.gat,48,25,16,8|monster|Pumpkin|1063,12,10000ms,5000ms,PumpkinMob055-1::On1063 +055-1.gat,139,29,5,7|monster|Pumpkin|1063,7,10000ms,5000ms,PumpkinMob055-1::On1063 +055-1.gat,132,24,6,4|monster|Pumpkin|1063,4,10000ms,5000ms,PumpkinMob055-1::On1063 -055-1.gat,0,0,0|script|PumpkinMob055-1|-1, +055-1.gat,0,0,0|script|PumpkinMob055-1|-1 { end; diff --git a/world/map/npc/055-1/traveler.txt b/world/map/npc/055-1/traveler.txt index 881be4d2..cc5db3c3 100644 --- a/world/map/npc/055-1/traveler.txt +++ b/world/map/npc/055-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -055-1.gat,135,60,0|script|Sherman the Traveler|103, +055-1.gat,135,60,0|script|Sherman the Traveler|103 { set @NpcName$, "Sherman"; set @NpcTravelBit, $@hurns_farms_bit; diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt index 2e54c2c9..045e38e5 100644 --- a/world/map/npc/055-3/_mobs.txt +++ b/world/map/npc/055-3/_mobs.txt @@ -1,17 +1,17 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Cave mobs -055-3.gat,45,44,20,14|monster|RedSlime|1008,10,10000,60000,Mob055-3::On1008 -055-3.gat,0,0,1,1|monster|Bat|1017,20,10000,45000,Mob055-3::On1017 -055-3.gat,53,75,28,40|monster|YellowSlime|1007,10,10000,60000,Mob055-3::On1007 -055-3.gat,0,0,1,1|monster|BlackScorpion|1009,8,10000,35000,Mob055-3::On1009 -055-3.gat,0,0,1,1|monster|Spider|1012,8,10000,35000,Mob055-3::On1012 -055-3.gat,0,0,1,1|monster|Snake|1010,3,10000,20000,Mob055-3::On1010 -055-3.gat,46,44,14,18|monster|Spider|1012,3,50000,100000,Mob055-3::On1012 -055-3.gat,52,78,36,23|monster|BlackScorpion|1009,3,50000,100000,Mob055-3::On1009 +055-3.gat,45,44,20,14|monster|RedSlime|1008,10,10000ms,60000ms,Mob055-3::On1008 +055-3.gat,0,0,1,1|monster|Bat|1017,20,10000ms,45000ms,Mob055-3::On1017 +055-3.gat,53,75,28,40|monster|YellowSlime|1007,10,10000ms,60000ms,Mob055-3::On1007 +055-3.gat,0,0,1,1|monster|BlackScorpion|1009,8,10000ms,35000ms,Mob055-3::On1009 +055-3.gat,0,0,1,1|monster|Spider|1012,8,10000ms,35000ms,Mob055-3::On1012 +055-3.gat,0,0,1,1|monster|Snake|1010,3,10000ms,20000ms,Mob055-3::On1010 +055-3.gat,46,44,14,18|monster|Spider|1012,3,50000ms,100000ms,Mob055-3::On1012 +055-3.gat,52,78,36,23|monster|BlackScorpion|1009,3,50000ms,100000ms,Mob055-3::On1009 -055-3.gat,0,0,0|script|Mob055-3|-1, +055-3.gat,0,0,0|script|Mob055-3|-1 { end; diff --git a/world/map/npc/056-1/_mobs.txt b/world/map/npc/056-1/_mobs.txt index e10069a9..6f4e6bf5 100644 --- a/world/map/npc/056-1/_mobs.txt +++ b/world/map/npc/056-1/_mobs.txt @@ -1,12 +1,12 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woods mobs -056-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,10000,45000,Mob056-1::On1013 -056-1.gat,0,0,0,0|monster|LogHead|1025,10,10000,45000,Mob056-1::On1025 -056-1.gat,0,0,0,0|monster|MauvePlant|1029,2,10000,85000,Mob056-1::On1029 +056-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,10000ms,45000ms,Mob056-1::On1013 +056-1.gat,0,0,0,0|monster|LogHead|1025,10,10000ms,45000ms,Mob056-1::On1025 +056-1.gat,0,0,0,0|monster|MauvePlant|1029,2,10000ms,85000ms,Mob056-1::On1029 -056-1.gat,0,0,0|script|Mob056-1|-1, +056-1.gat,0,0,0|script|Mob056-1|-1 { end; diff --git a/world/map/npc/056-1/flowerpentagram5.txt b/world/map/npc/056-1/flowerpentagram5.txt index 9a128ef8..bc5b3766 100644 --- a/world/map/npc/056-1/flowerpentagram5.txt +++ b/world/map/npc/056-1/flowerpentagram5.txt @@ -1,7 +1,7 @@ // Author: Jenalya // $@Flower_Pentagram_Time saves the time when the last summoning happened -056-1.gat,62,31,0|script|#FlowerPentagram5|400, +056-1.gat,62,31,0|script|#FlowerPentagram5|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; diff --git a/world/map/npc/056-2/_mobs.txt b/world/map/npc/056-2/_mobs.txt index c893945e..7cd703f1 100644 --- a/world/map/npc/056-2/_mobs.txt +++ b/world/map/npc/056-2/_mobs.txt @@ -3,7 +3,7 @@ -056-2.gat,0,0,0|script|Mob056-2|-1, +056-2.gat,0,0,0|script|Mob056-2|-1 { end; } diff --git a/world/map/npc/056-2/barrier.txt b/world/map/npc/056-2/barrier.txt index a9f12a5d..1cbe2b94 100644 --- a/world/map/npc/056-2/barrier.txt +++ b/world/map/npc/056-2/barrier.txt @@ -1,4 +1,4 @@ -056-2.gat,23,33,0|script|#Barrier|45,0,0, +056-2.gat,23,33,0|script|#Barrier|45,0,0 { if (Mirak_Bantime > gettimetick(2)) goto L_Block; diff --git a/world/map/npc/056-2/mirak.txt b/world/map/npc/056-2/mirak.txt index 4296a2cc..bfa1d132 100644 --- a/world/map/npc/056-2/mirak.txt +++ b/world/map/npc/056-2/mirak.txt @@ -1,4 +1,4 @@ -056-2.gat,67,24,0|script|Mirak|372, +056-2.gat,67,24,0|script|Mirak|372 { // Variables to set: // @dq_cost - The number of points this quest uses diff --git a/world/map/npc/056-2/notes.txt b/world/map/npc/056-2/notes.txt index a458c2a9..a223c29a 100644 --- a/world/map/npc/056-2/notes.txt +++ b/world/map/npc/056-2/notes.txt @@ -1,4 +1,4 @@ -056-2.gat,77,34,0|script|Warning#mirak|400, +056-2.gat,77,34,0|script|Warning#mirak|400 { mes "Turn around. Do not come any closer!"; mes "Go back upstairs and leave! I don't want to see anybody!"; @@ -6,7 +6,7 @@ mes "- Mirak"; close; } -056-2.gat,29,30,0|script|Note#mirak|400, +056-2.gat,29,30,0|script|Note#mirak|400 { mes "DO NOT GO ANY FURTHER!"; mes "Put the supplies on the table and do not come downstairs. I don't want to be bothered."; diff --git a/world/map/npc/057-1/_mobs.txt b/world/map/npc/057-1/_mobs.txt index 2f563f98..0f11b5b6 100644 --- a/world/map/npc/057-1/_mobs.txt +++ b/world/map/npc/057-1/_mobs.txt @@ -1,27 +1,27 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland mobs -057-1.gat,0,0,0,0|monster|MauvePlant|1029,5,45000,45000,Mob057-1::On1029 -057-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000,65000,Mob057-1::On1030 -057-1.gat,0,0,0,0|monster|GambogePlant|1031,5,10000,45000,Mob057-1::On1031 -057-1.gat,0,0,0,0|monster|AlizarinPlant|1032,7,10000,70000,Mob057-1::On1032 -057-1.gat,0,0,0,0|monster|Mouboo|1028,14,10000,45000,Mob057-1::On1028 -057-1.gat,95,42,29,9|monster|Butterfly|1055,3,10000,40000,Mob057-1::On1055 -057-1.gat,25,48,11,46|monster|Silkworm|1035,7,10000,15000,Mob057-1::On1035 -057-1.gat,99,40,22,16|monster|PinkFlower|1014,2,10000,45000,Mob057-1::On1014 -057-1.gat,100,30,19,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055 -057-1.gat,83,64,12,12|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055 -057-1.gat,59,34,8,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055 -057-1.gat,32,45,8,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055 -057-1.gat,144,35,12,12|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055 -057-1.gat,104,67,12,11|monster|PinkFlower|1014,2,10000,45000,Mob057-1::On1014 -057-1.gat,135,53,12,11|monster|PinkFlower|1014,2,10000,45000,Mob057-1::On1014 -057-1.gat,0,0,0,0|monster|SpikyMushroom|1019,10,10000,45000,Mob057-1::On1019 -057-1.gat,0,0,0,0|monster|CloverPatch|1037,3,10000,180000,Mob057-1::On1037 -057-1.gat,27,46,14,52|monster|Squirrel|1038,6,10000,50000,Mob057-1::On1038 +057-1.gat,0,0,0,0|monster|MauvePlant|1029,5,45000ms,45000ms,Mob057-1::On1029 +057-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000ms,65000ms,Mob057-1::On1030 +057-1.gat,0,0,0,0|monster|GambogePlant|1031,5,10000ms,45000ms,Mob057-1::On1031 +057-1.gat,0,0,0,0|monster|AlizarinPlant|1032,7,10000ms,70000ms,Mob057-1::On1032 +057-1.gat,0,0,0,0|monster|Mouboo|1028,14,10000ms,45000ms,Mob057-1::On1028 +057-1.gat,95,42,29,9|monster|Butterfly|1055,3,10000ms,40000ms,Mob057-1::On1055 +057-1.gat,25,48,11,46|monster|Silkworm|1035,7,10000ms,15000ms,Mob057-1::On1035 +057-1.gat,99,40,22,16|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014 +057-1.gat,100,30,19,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055 +057-1.gat,83,64,12,12|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055 +057-1.gat,59,34,8,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055 +057-1.gat,32,45,8,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055 +057-1.gat,144,35,12,12|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055 +057-1.gat,104,67,12,11|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014 +057-1.gat,135,53,12,11|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014 +057-1.gat,0,0,0,0|monster|SpikyMushroom|1019,10,10000ms,45000ms,Mob057-1::On1019 +057-1.gat,0,0,0,0|monster|CloverPatch|1037,3,10000ms,180000ms,Mob057-1::On1037 +057-1.gat,27,46,14,52|monster|Squirrel|1038,6,10000ms,50000ms,Mob057-1::On1038 -057-1.gat,0,0,0|script|Mob057-1|-1, +057-1.gat,0,0,0|script|Mob057-1|-1 { end; diff --git a/world/map/npc/068-1/_mobs.txt b/world/map/npc/068-1/_mobs.txt index 147625f7..14eeb839 100644 --- a/world/map/npc/068-1/_mobs.txt +++ b/world/map/npc/068-1/_mobs.txt @@ -1,14 +1,14 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Noble mobs -068-1.gat,60,67,52,1|monster|SeaSlime|1033,3,100000,30000,Mob068-1::On1033 -068-1.gat,93,49,4,3|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002 -068-1.gat,89,71,5,8|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002 -068-1.gat,78,38,7,6|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002 -068-1.gat,59,83,52,1|monster|SeaSlime|1033,3,100000,30000,Mob068-1::On1033 +068-1.gat,60,67,52,1|monster|SeaSlime|1033,3,100000ms,30000ms,Mob068-1::On1033 +068-1.gat,93,49,4,3|monster|Maggot|1002,5,100000ms,30000ms,Mob068-1::On1002 +068-1.gat,89,71,5,8|monster|Maggot|1002,5,100000ms,30000ms,Mob068-1::On1002 +068-1.gat,78,38,7,6|monster|Maggot|1002,5,100000ms,30000ms,Mob068-1::On1002 +068-1.gat,59,83,52,1|monster|SeaSlime|1033,3,100000ms,30000ms,Mob068-1::On1033 -068-1.gat,0,0,0|script|Mob068-1|-1, +068-1.gat,0,0,0|script|Mob068-1|-1 { end; diff --git a/world/map/npc/068-1/stat_reset.txt b/world/map/npc/068-1/stat_reset.txt index fe54f379..73519a22 100644 --- a/world/map/npc/068-1/stat_reset.txt +++ b/world/map/npc/068-1/stat_reset.txt @@ -1,6 +1,6 @@ // -068-1.gat,79,94,0|script|Malivox|103, +068-1.gat,79,94,0|script|Malivox|103 { // if (ResetA_charstate == 1) goto L_Multiple; diff --git a/world/map/npc/068-1/tombstones.txt b/world/map/npc/068-1/tombstones.txt index 2b0542a2..132be7ff 100644 --- a/world/map/npc/068-1/tombstones.txt +++ b/world/map/npc/068-1/tombstones.txt @@ -1,6 +1,6 @@ // Tombstones in Noble memorial -068-1.gat,91,48,0|script|Tombstone#1|400, +068-1.gat,91,48,0|script|Tombstone#1|400 { mes "~ wushin ~"; @@ -8,7 +8,7 @@ close; } -068-1.gat,92,48,0|script|Tombstone#2|400, +068-1.gat,92,48,0|script|Tombstone#2|400 { mes "~ Nard ~"; @@ -16,7 +16,7 @@ close; } -068-1.gat,93,48,0|script|Tombstone#3|400, +068-1.gat,93,48,0|script|Tombstone#3|400 { mes "~ tux9th ~"; @@ -24,7 +24,7 @@ close; } -068-1.gat,94,48,0|script|Tombstone#4|400, +068-1.gat,94,48,0|script|Tombstone#4|400 { mes "~ o11c ~"; @@ -32,7 +32,7 @@ close; } -068-1.gat,95,48,0|script|Tombstone#5|400, +068-1.gat,95,48,0|script|Tombstone#5|400 { mes "~ " + strcharinfo(0) + " ~"; diff --git a/world/map/npc/068-2/_mobs.txt b/world/map/npc/068-2/_mobs.txt index d7abff17..c0b6cd10 100644 --- a/world/map/npc/068-2/_mobs.txt +++ b/world/map/npc/068-2/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Noble Indoors mobs -068-2.gat,94,54,5,6|monster|Silkworm|1035,4,10000,85000,Mob068-2::On1035 +068-2.gat,94,54,5,6|monster|Silkworm|1035,4,10000ms,85000ms,Mob068-2::On1035 -068-2.gat,0,0,0|script|Mob068-2|-1, +068-2.gat,0,0,0|script|Mob068-2|-1 { end; diff --git a/world/map/npc/068-2/bank.txt b/world/map/npc/068-2/bank.txt index 70011c70..328d98ae 100644 --- a/world/map/npc/068-2/bank.txt +++ b/world/map/npc/068-2/bank.txt @@ -1,5 +1,5 @@ // Another banker -068-2.gat,29,83,0|script|Hydusun|149, +068-2.gat,29,83,0|script|Hydusun|149 { set @npcname$, "Hydusun"; callfunc "Banker"; diff --git a/world/map/npc/068-2/hetchel.txt b/world/map/npc/068-2/hetchel.txt index a14b64bd..7c20231f 100644 --- a/world/map/npc/068-2/hetchel.txt +++ b/world/map/npc/068-2/hetchel.txt @@ -1,5 +1,5 @@ // Hetchel the Silk Weaver -// bh28, +// bh28 // 2013-03, GPLv2. // // Hetchel is referred to by Lora Tay. @@ -9,15 +9,15 @@ // // @wg_state: variable indicating winter gloves status. // Lora Tay proposes silk Robe if (@wg_state>= 11). -// @SHEET_COCOONS_NR : Number of cocoons required per sheet. +// @SHEET_COCOONS_NR:* Number of cocoons required per sheet. // Might ne calculated from @ROBE_COCOONS_NR/@ROBE_SHEETS_NR // Actually: 150∕6 = 25 -// @SHEET_ZENY : Money to pay per sheet: A sixth of 10000-2*500-6000 +// @SHEET_ZENY :* Money to pay per sheet: A sixth of 10000-2*500-6000 // @SheetCount Number of sheets to buy (variable). // // @silkpants_state: variable indicating silkpant quest status. -068-2.gat,62,83,0|script|Hetchel|376, +068-2.gat,62,83,0|script|Hetchel|376 { set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT); set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); @@ -408,7 +408,7 @@ L_Close: close; } -068-2.gat,60,83,0|script|HetchelDebug|376, +068-2.gat,60,83,0|script|HetchelDebug|376 { set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT); set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); diff --git a/world/map/npc/068-2/inya.txt b/world/map/npc/068-2/inya.txt index f75fc2cb..b3301656 100644 --- a/world/map/npc/068-2/inya.txt +++ b/world/map/npc/068-2/inya.txt @@ -1,7 +1,7 @@ //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple) //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic? -068-2.gat,29,56,0|script|Inya|106, +068-2.gat,29,56,0|script|Inya|106 { mes "[Inya]"; mes "\"I am Inya, a jeweler of fine rings. If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\""; diff --git a/world/map/npc/068-2/latoy.txt b/world/map/npc/068-2/latoy.txt index 9031979f..13225bac 100644 --- a/world/map/npc/068-2/latoy.txt +++ b/world/map/npc/068-2/latoy.txt @@ -1,10 +1,10 @@ // A snobby store that won't sell to the player // takes part in quest given by 021-2/kylian.txt -// Shop: DesertShirt :-1,SilkRobe :-5,SerfHat :-1,DesertHat :-4 -068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt :-1,SilkRobe :-5,SerfHat :-1,DesertHat :-4 +// Shop: DesertShirt:*1,SilkRobe:*5,SerfHat:*1,DesertHat:*4 +068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt:*1,SilkRobe:*5,SerfHat:*1,DesertHat:*4 -068-2.gat,92,83,0|script|Latoy|106, +068-2.gat,92,83,0|script|Latoy|106 { set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT; set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); diff --git a/world/map/npc/069-1/_mobs.txt b/world/map/npc/069-1/_mobs.txt index 82cb9c8d..b7985756 100644 --- a/world/map/npc/069-1/_mobs.txt +++ b/world/map/npc/069-1/_mobs.txt @@ -3,7 +3,7 @@ -069-1.gat,0,0,0|script|Mob069-1|-1, +069-1.gat,0,0,0|script|Mob069-1|-1 { end; } diff --git a/world/map/npc/069-2/_mobs.txt b/world/map/npc/069-2/_mobs.txt index d5e5bfd1..561eec94 100644 --- a/world/map/npc/069-2/_mobs.txt +++ b/world/map/npc/069-2/_mobs.txt @@ -3,7 +3,7 @@ -069-2.gat,0,0,0|script|Mob069-2|-1, +069-2.gat,0,0,0|script|Mob069-2|-1 { end; } diff --git a/world/map/npc/069-2/wizards.txt b/world/map/npc/069-2/wizards.txt index f1df5ef4..1d827d18 100644 --- a/world/map/npc/069-2/wizards.txt +++ b/world/map/npc/069-2/wizards.txt @@ -1,60 +1,60 @@ // Council of Ruling Wizards Room // manaseed -069-2.gat,106,82,0|script|Desert Mana Seed#_M|166, +069-2.gat,106,82,0|script|Desert Mana Seed#_M|166 { end; } // -069-2.gat,101,85,0|script|Wizard#1|355, +069-2.gat,101,85,0|script|Wizard#1|355 { end; } // -069-2.gat,94,87,0|script|Wizard#2|356, +069-2.gat,94,87,0|script|Wizard#2|356 { end; } // -069-2.gat,94,93,0|script|Wizard#3|357, +069-2.gat,94,93,0|script|Wizard#3|357 { end; } // -069-2.gat,101,95,0|script|Wizard#4|358, +069-2.gat,101,95,0|script|Wizard#4|358 { end; } // -069-2.gat,112,85,0|script|Wizard#5|359, +069-2.gat,112,85,0|script|Wizard#5|359 { end; } // -069-2.gat,119,87,0|script|Wizard#6|360, +069-2.gat,119,87,0|script|Wizard#6|360 { end; } // -069-2.gat,119,93,0|script|Wizard#7|361, +069-2.gat,119,93,0|script|Wizard#7|361 { end; } // -069-2.gat,112,95,0|script|Wizard#8|362, +069-2.gat,112,95,0|script|Wizard#8|362 { end; } // -069-2.gat,106,90,0|script|Arch-Wizard#9|354, +069-2.gat,106,90,0|script|Arch-Wizard#9|354 { end; } diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt index 4d3cdf68..0cbc5cf6 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.gat,26,28,0|script|#HolidayConfig|-1, +017-9.gat,26,28,0|script|#HolidayConfig|-1 { end; @@ -19,7 +19,7 @@ OnTimer20000: initnpctimer; end; } -017-9.gat,31,24,0|script|HolidayDebug#1|105, +017-9.gat,31,24,0|script|HolidayDebug#1|105 { if(getgmlevel() < 40) goto L_End; diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt index 7405a1c0..226d8bbb 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|-1 { end; diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt index 0da5e361..64da1d38 100644 --- a/world/map/npc/annuals/halloween/debug.txt +++ b/world/map/npc/annuals/halloween/debug.txt @@ -1,7 +1,7 @@ // Halloween Debug // Author: Wushin -function|script|HalloweenDebug|, +function|script|HalloweenDebug { if(debug) goto L_Debug; @@ -139,7 +139,7 @@ L_Close: set @halloween_npc_id, 0; close; } -009-1.gat,51,38,0|script|HalloweenDebug#1|409, +009-1.gat,51,38,0|script|HalloweenDebug#1|409 { callfunc "HalloweenDebug"; goto L_End; @@ -152,7 +152,7 @@ OnInit: L_End: end; } -001-1.gat,38,26,0|script|HalloweenDebug#2|409, +001-1.gat,38,26,0|script|HalloweenDebug#2|409 { callfunc "HalloweenDebug"; goto L_End; @@ -165,7 +165,7 @@ OnInit: L_End: end; } -026-1.gat,23,37,0|script|HalloweenDebug#3|409, +026-1.gat,23,37,0|script|HalloweenDebug#3|409 { callfunc "HalloweenDebug"; goto L_End; diff --git a/world/map/npc/annuals/halloween/munro.txt b/world/map/npc/annuals/halloween/munro.txt index c3ff6367..3b894901 100644 --- a/world/map/npc/annuals/halloween/munro.txt +++ b/world/map/npc/annuals/halloween/munro.txt @@ -1,5 +1,5 @@ // Part of Annual halloween -026-1.gat,24,37,0|script|Munro|183, +026-1.gat,24,37,0|script|Munro|183 { callfunc "HalloweenCheckOld"; callfunc "TrickOrTreatTally"; @@ -30,7 +30,7 @@ L_Halloween: L_Exit: close; } -function|script|SpawnMunro|, +function|script|SpawnMunro { if ($@halloween_time) goto L_EnableMunro; @@ -47,7 +47,7 @@ L_DisableMunro: L_Return: return; } -function|script|CheckMunro|, +function|script|CheckMunro { if (($@halloween_time) || ($@xmas_time)) goto L_Return; diff --git a/world/map/npc/annuals/halloween/trick_or_treat.txt b/world/map/npc/annuals/halloween/trick_or_treat.txt index 150b5939..24a359d2 100644 --- a/world/map/npc/annuals/halloween/trick_or_treat.txt +++ b/world/map/npc/annuals/halloween/trick_or_treat.txt @@ -1,7 +1,7 @@ // Halloween Annual // Authors: alastrim, enchilado, o11c, wushin // See config -function|script|TrickOrTreat|, +function|script|TrickOrTreat { callfunc "HalloweenCheckOld"; if ($@halloween_time) @@ -226,7 +226,7 @@ L_QuickReturn: set @halloween_npc_id, 0; return; } -function|script|TrickOrTreatTally|, +function|script|TrickOrTreatTally { set @npc_loop, 0; set @npc_tally, 0; @@ -249,7 +249,7 @@ L_Return: // Checks for an expired event key // Each new annual event needs a new key // or it will allow completion from last year -function|script|HalloweenCheckOld|, +function|script|HalloweenCheckOld { if(HALLOWEENYEAR == $HALLOWEEN_TIME_KEY[5]) goto L_Return; @@ -263,7 +263,7 @@ L_OldMatch: L_Return: return; } -function|script|HalloweenTree|, +function|script|HalloweenTree { mes "[Confused Tree]"; if ((HALLOWEENTIME & 65535) > ($@halloween_num_npcs * 3)) diff --git a/world/map/npc/annuals/tree_beard.txt b/world/map/npc/annuals/tree_beard.txt index 5923637f..27cf930e 100644 --- a/world/map/npc/annuals/tree_beard.txt +++ b/world/map/npc/annuals/tree_beard.txt @@ -1,80 +1,80 @@ // Annual Environment changes -020-1.gat,90,78,0|script|#GhostTreeOne|133, +020-1.gat,90,78,0|script|#GhostTreeOne|133 { callfunc "HalloweenTree"; close; } -020-1.gat,90,78,0|script|#Tree|380, +020-1.gat,90,78,0|script|#Tree|380 { end; } -020-1.gat,90,78,0|script|#XmasTree|379, +020-1.gat,90,78,0|script|#XmasTree|379 { end; } -020-1.gat,90,79,0|script|Present#1|386, +020-1.gat,90,79,0|script|Present#1|386 { callfunc "XmasStates"; callfunc "XmasMainItemReward"; close; } -009-1.gat,54,38,0|script|#GhostTreeTwo|133, +009-1.gat,54,38,0|script|#GhostTreeTwo|133 { callfunc "HalloweenTree"; close; } -009-1.gat,54,38,0|script|#TreeNoSnow|394, +009-1.gat,54,38,0|script|#TreeNoSnow|394 { end; } -009-1.gat,54,38,0|script|#XmasTreeNoSnow|381, +009-1.gat,54,38,0|script|#XmasTreeNoSnow|381 { end; } -009-1.gat,54,39,0|script|Present#2|386, +009-1.gat,54,39,0|script|Present#2|386 { callfunc "XmasStates"; callfunc "XmasMainItemReward"; close; } -001-1.gat,41,45,0|script|#GhostTreeThree|133, +001-1.gat,41,45,0|script|#GhostTreeThree|133 { callfunc "HalloweenTree"; close; } -001-1.gat,41,45,0|script|#PalmTree|384, +001-1.gat,41,45,0|script|#PalmTree|384 { end; } -001-1.gat,41,46,0|script|Present#3|386, +001-1.gat,41,46,0|script|Present#3|386 { callfunc "XmasStates"; callfunc "XmasMainItemReward"; close; } -001-1.gat,41,45,0|script|#XmasPalmTree|383, +001-1.gat,41,45,0|script|#XmasPalmTree|383 { end; } -function|script|SpawnMobs|, +function|script|SpawnMobs { cmdothernpc "XmasSpawnManager", "SpawnStart"; return; } -function|script|PresentHandler|, +function|script|PresentHandler { if($@xmas_time == $@xmas_reward_time) goto L_DeliverPresents; @@ -96,7 +96,7 @@ L_Return: return; } -function|script|ReplaceTrees|, +function|script|ReplaceTrees { disablenpc "#Tree"; disablenpc "#TreeNoSnow"; diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt index 07bff6f7..551c59f6 100644 --- a/world/map/npc/annuals/xmas/barriers.txt +++ b/world/map/npc/annuals/xmas/barriers.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|ThrowOutTheBum|, +function|script|ThrowOutTheBum { if((@xmas_thrown_out) && ($@xmas_time)) goto L_SideOut; @@ -31,7 +31,7 @@ L_Return: } // Annual Xmas Boss Fight Door -030-2.gat,153,21,0|script|#DarkDoor|45,0,0, +030-2.gat,153,21,0|script|#DarkDoor|45,0,0 { callfunc "XmasStates"; @@ -67,7 +67,7 @@ L_Close: // Annual Xmas secret passage to a trapdoor in Santa's Inn Basement -030-3.gat,100,49,0|script|SmallCrack#XmasPassage|400,0,1, +030-3.gat,100,49,0|script|SmallCrack#XmasPassage|400,0,1 { callfunc "XmasStates"; @@ -134,7 +134,7 @@ L_Close: } // Annual Xmas Escape Hatch -030-2.gat,48,44,0|script|#BasementDoor|45,0,0, +030-2.gat,48,44,0|script|#BasementDoor|45,0,0 { callfunc "XmasStates"; diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt index e8ac5cc2..5a982c5c 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|-1 { end; diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt index c925b6eb..30562e13 100644 --- a/world/map/npc/annuals/xmas/core.txt +++ b/world/map/npc/annuals/xmas/core.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|XmasNaughty|, +function|script|XmasNaughty { set @xmas_karma, ((XMASTIME & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); if((@xmas_karma - @karma_bonus) >= 0) @@ -23,7 +23,7 @@ L_Return: return; } -function|script|XmasNice|, +function|script|XmasNice { set @xmas_karma, ((XMASTIME & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); if((@xmas_karma + @karma_bonus) < 16) @@ -45,7 +45,7 @@ L_Return: } // Called for a basic reward for quests state completion -function|script|XmasXpReward|, +function|script|XmasXpReward { if (BaseLevel >= 10) goto L_HigherLevel; @@ -63,44 +63,44 @@ L_Return: return; } -function|script|XmasSetState|, +function|script|XmasSetState { set XMASTIME, (XMASTIME & ~(NIBBLE_0_MASK) | (@xmas_state << NIBBLE_0_SHIFT)); return; } -function|script|XmasSetSide|, +function|script|XmasSetSide { set XMASTIME, XMASTIME | $@xmas_side_bit; return; } -function|script|XmasSetRoute|, +function|script|XmasSetRoute { set XMASTIME, XMASTIME | $@xmas_route_bit; return; } -function|script|XmasThrowOut|, +function|script|XmasThrowOut { set XMASTIME, XMASTIME | $@xmas_thrown_out_bit; return; } -function|script|XmasSetBossStart|, +function|script|XmasSetBossStart { set XMASTIME, XMASTIME | $@xmas_boss_start_bit; return; } -function|script|XmasSetBossHero|, +function|script|XmasSetBossHero { set XMASTIME, XMASTIME | $@xmas_boss_hero_bit; return; } // Tallys the players quest -function|script|XmasSetReward|, +function|script|XmasSetReward { set @xmas_endgame, 0; set @xmas_reward_side, 0; @@ -138,7 +138,7 @@ L_SetRewardBonus: } // Main quest completion reward -function|script|XmasMainXpBpReward|, +function|script|XmasMainXpBpReward { callfunc "XmasSetReward"; @@ -169,7 +169,7 @@ L_XmasExp: } // Final Item reward -function|script|XmasMainItemReward|, +function|script|XmasMainItemReward { callfunc "XmasSetReward"; @@ -237,7 +237,7 @@ L_Return: // Checks for an expired event key // Each new annual event needs a new key // or it will allow completion from last year -function|script|XmasCheckOld|, +function|script|XmasCheckOld { if(XMASYEAR == $XMAS_TIME_KEY[5]) goto L_Return; diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt index a26565b6..248321fb 100644 --- a/world/map/npc/annuals/xmas/debug.txt +++ b/world/map/npc/annuals/xmas/debug.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|XmasDebug|, +function|script|XmasDebug { if(debug) goto L_Debug; @@ -171,7 +171,7 @@ L_Close: close; } -030-1.gat,91,48,0|script|XmasDebug#1|105, +030-1.gat,91,48,0|script|XmasDebug#1|105 { callfunc "XmasDebug"; goto L_End; @@ -185,7 +185,7 @@ L_End: end; } -030-2.gat,193,62,0|script|XmasDebug#2|105, +030-2.gat,193,62,0|script|XmasDebug#2|105 { callfunc "XmasDebug"; goto L_End; @@ -199,7 +199,7 @@ L_End: end; } -030-3.gat,26,26,0|script|XmasDebug#3|105, +030-3.gat,26,26,0|script|XmasDebug#3|105 { callfunc "XmasDebug"; goto L_End; @@ -213,7 +213,7 @@ L_End: end; } -030-4.gat,30,30,0|script|XmasDebug#4|111, +030-4.gat,30,30,0|script|XmasDebug#4|111 { callfunc "XmasDebug"; goto L_End; @@ -227,7 +227,7 @@ L_End: end; } -020-1.gat,86,76,0|script|XmasDebug#5|105, +020-1.gat,86,76,0|script|XmasDebug#5|105 { callfunc "XmasDebug"; goto L_End; diff --git a/world/map/npc/annuals/xmas/helpers.txt b/world/map/npc/annuals/xmas/helpers.txt index eeb8c50c..0d566de7 100644 --- a/world/map/npc/annuals/xmas/helpers.txt +++ b/world/map/npc/annuals/xmas/helpers.txt @@ -3,7 +3,7 @@ // please see #XmasConfig // TODO: Make Helpers static functions -function|script|XmasHelperPoints|, +function|script|XmasHelperPoints { set @xmas_helper_count, 0; set @xmas_helper_loop, 0; diff --git a/world/map/npc/annuals/xmas/list.txt b/world/map/npc/annuals/xmas/list.txt index 94dc4b23..1805e6a8 100644 --- a/world/map/npc/annuals/xmas/list.txt +++ b/world/map/npc/annuals/xmas/list.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|XmasCheckList|, +function|script|XmasCheckList { set @xmas_list_count, 0; set @xmas_list_loop, 0; @@ -47,7 +47,7 @@ L_Return: return; } -function|script|XmasList|, +function|script|XmasList { callfunc "XmasStates"; @@ -79,7 +79,7 @@ L_Return: return; } -function|script|XmasListList|, +function|script|XmasListList { set @xmas_list_loop, 0; set @xmas_child_loop, 0; diff --git a/world/map/npc/annuals/xmas/mobmanager.txt b/world/map/npc/annuals/xmas/mobmanager.txt index 71393290..59f48cb7 100644 --- a/world/map/npc/annuals/xmas/mobmanager.txt +++ b/world/map/npc/annuals/xmas/mobmanager.txt @@ -1,6 +1,6 @@ // Spawns mobs -019-1.gat,0,0,0|script|XmasSpawnManager|400, +019-1.gat,0,0,0|script|XmasSpawnManager|400 { end; @@ -54,7 +54,7 @@ L_End: end; } -019-1.gat,0,0,0|script|XmasSpawnCounter#0|400, +019-1.gat,0,0,0|script|XmasSpawnCounter#0|400 { end; @@ -63,7 +63,7 @@ OnTally: end; } -019-3.gat,0,0,0|script|XmasSpawnCounter#1|400, +019-3.gat,0,0,0|script|XmasSpawnCounter#1|400 { end; @@ -72,7 +72,7 @@ OnTally: end; } -030-1.gat,0,0,0|script|XmasSpawnCounter#2|400, +030-1.gat,0,0,0|script|XmasSpawnCounter#2|400 { end; @@ -81,7 +81,7 @@ OnTally: end; } -030-3.gat,0,0,0|script|XmasSpawnCounter#3|400, +030-3.gat,0,0,0|script|XmasSpawnCounter#3|400 { end; diff --git a/world/map/npc/annuals/xmas/reagents.txt b/world/map/npc/annuals/xmas/reagents.txt index 0b4eaa8b..4adcaf12 100644 --- a/world/map/npc/annuals/xmas/reagents.txt +++ b/world/map/npc/annuals/xmas/reagents.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|CheckReagents|, +function|script|CheckReagents { set @xmas_reagent_loop, 0; if((@xmas_reagent_done_state) || !(@xmas_reagent_start_state)) @@ -42,7 +42,7 @@ L_Return: return; } -function|script|DeleteReagents|, +function|script|DeleteReagents { set @xmas_reagent_loop, 0; if(@xmas_side) @@ -73,7 +73,7 @@ L_Return: return; } -function|script|ListReagents|, +function|script|ListReagents { set @xmas_reagent_loop, 0; mes "\"I'm going to need \""; @@ -109,7 +109,7 @@ L_AllReagents: return; } -function|script|BadPowderMake|, +function|script|BadPowderMake { if(countitem("PileOfAsh") < ($@xmas_red_amount + $@xmas_yellow_amount)) goto L_NotEnough; diff --git a/world/map/npc/annuals/xmas/states.txt b/world/map/npc/annuals/xmas/states.txt index 8d81864f..49f51000 100644 --- a/world/map/npc/annuals/xmas/states.txt +++ b/world/map/npc/annuals/xmas/states.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|XmasStates|, +function|script|XmasStates { // Check for Old Quest Line Keys. Reset Quest if so. callfunc "XmasCheckOld"; diff --git a/world/map/npc/botcheck/_mobs.txt b/world/map/npc/botcheck/_mobs.txt index 208ec7b1..58b64802 100644 --- a/world/map/npc/botcheck/_mobs.txt +++ b/world/map/npc/botcheck/_mobs.txt @@ -3,7 +3,7 @@ -botcheck.gat,0,0,0|script|Mobbotcheck|-1, +botcheck.gat,0,0,0|script|Mobbotcheck|-1 { end; } diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt index df908e62..ea5dfa22 100644 --- a/world/map/npc/functions/banker.txt +++ b/world/map/npc/functions/banker.txt @@ -1,6 +1,6 @@ // -function|script|Banker|, +function|script|Banker { if (BankAccount == 0) goto L_Start; diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt index 58fee175..e7491cf3 100644 --- a/world/map/npc/functions/barber.txt +++ b/world/map/npc/functions/barber.txt @@ -9,7 +9,7 @@ // or using GM commands, but scripts (such as this one) can set // any value 0-255 -function|script|Barber|, +function|script|Barber { callfunc "getHeadStyles"; goto L_Main; diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt index 588c22d5..c894586b 100644 --- a/world/map/npc/functions/clear_vars.txt +++ b/world/map/npc/functions/clear_vars.txt @@ -1,6 +1,6 @@ // Clears old variables -function|script|ClearVariables|, +function|script|ClearVariables { // Tutorial if ((TUTORIAL) || (sorfina)) @@ -264,7 +264,7 @@ L_Return: // The variable TMW_Quest was used to save the progress in several subquests linearly. // The subquests are moved to different nibbles of other variables // to make it possible to do some of the quests in parallel. -function|script|ClearVarTMW_Quest|, +function|script|ClearVarTMW_Quest { if (TMW_Quest == 0) goto L_Done; if (TMW_Quest <= 6) goto L_Bernard_Mikhail; @@ -324,7 +324,7 @@ L_Done: return; } --|script|#ClearGlobalVars|-1, +-|script|#ClearGlobalVars|-1 { end; diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt index a0360376..4448feed 100644 --- a/world/map/npc/functions/dailyquest.txt +++ b/world/map/npc/functions/dailyquest.txt @@ -27,7 +27,7 @@ // (DailyQuestBonus makes a good reward from non-daily quests) -function|script|DailyQuestPoints|, +function|script|DailyQuestPoints { set @dq_earliest, gettimetick(2) - 86400; if (DailyQuestTime < @dq_earliest) @@ -56,7 +56,7 @@ L_Bonus: return; } -function|script|DailyQuest|, +function|script|DailyQuest { callfunc "DailyQuestPoints"; diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt index a41633fc..af7fcee0 100755 --- a/world/map/npc/functions/debug.txt +++ b/world/map/npc/functions/debug.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Jenalya, Ali-G -function|script|Debug|, +function|script|Debug { goto L_Begin; @@ -916,7 +916,7 @@ L_Close: } -042-2.gat,30,26,0|script|Debug#0|154, +042-2.gat,30,26,0|script|Debug#0|154 { callfunc "Debug"; end; @@ -926,7 +926,7 @@ OnInit: end; } -001-1.gat,41,29,0|script|Debug#1|154, +001-1.gat,41,29,0|script|Debug#1|154 { callfunc "Debug"; end; @@ -936,7 +936,7 @@ OnInit: end; } -009-1.gat,52,33,0|script|Debug#2|154, +009-1.gat,52,33,0|script|Debug#2|154 { callfunc "Debug"; end; @@ -946,7 +946,7 @@ OnInit: end; } -020-1.gat,75,85,0|script|Debug#3|154, +020-1.gat,75,85,0|script|Debug#3|154 { callfunc "Debug"; end; @@ -956,7 +956,7 @@ OnInit: end; } -017-9.gat,21,24,0|script|Debug#4|154, +017-9.gat,21,24,0|script|Debug#4|154 { callfunc "Debug"; end; @@ -966,7 +966,7 @@ OnInit: end; } -027-2.gat,125,103,0|script|Debug#5|154, +027-2.gat,125,103,0|script|Debug#5|154 { callfunc "Debug"; end; diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt index efe8818b..67815ab1 100644 --- a/world/map/npc/functions/default_npc_checks.txt +++ b/world/map/npc/functions/default_npc_checks.txt @@ -4,7 +4,7 @@ // Range // Map, X, Y, Distance in Tiles // setarray @npc_loc, 24, 113, 4; -function|script|PCtoNPCRange|, +function|script|PCtoNPCRange { set @npc_check, 0; set @Nmap$, getmap() + ".gat"; @@ -26,7 +26,7 @@ L_Return: // @delitem_counts Counts of Items to delete // @getitem_ids Items to get // @getitem_counts Counts of Items to get -function|script|CheckInventory|, +function|script|CheckInventory { set @del_loop, 0; set @get_loop, 0; diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt index 175040a5..5ea50a3b 100644 --- a/world/map/npc/functions/evil_obelisk.txt +++ b/world/map/npc/functions/evil_obelisk.txt @@ -1,4 +1,4 @@ -function|script|EvilObelisk|, +function|script|EvilObelisk { mes "[Evil Obelisk]"; mes "(A mystical aura surrounds this stone. It seems to crave money.)"; diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt index 8d530d1f..ec84f3cb 100644 --- a/world/map/npc/functions/ferry.txt +++ b/world/map/npc/functions/ferry.txt @@ -1,6 +1,6 @@ // The ferry system -017-9.gat,27,28,0|script|#FerryConfig|-1, +017-9.gat,27,28,0|script|#FerryConfig|-1 { end; @@ -39,8 +39,8 @@ L_NextDock: cmdothernpc "#k1sound", "Ding"; cmdothernpc "#k2sound", "Ding"; - //mapannounce "035-2.tmx", " Koga - Main : Now arriving in "+$@MainDocks$[$@MainCurrentDock]+".", 0; - //mapannounce "036-2.tmx", " Koga - Candor : Now arriving in "+$@CandorDocks$[$@CandorCurrentDock]+".", 0; + //mapannounce "035-2.tmx", " Koga - Main:* Now arriving in "+$@MainDocks$[$@MainCurrentDock]+".", 0; + //mapannounce "036-2.tmx", " Koga - Candor:* Now arriving in "+$@CandorDocks$[$@CandorCurrentDock]+".", 0; initnpctimer; if($@MainCurrentDock == 2) goto L_k1city1; @@ -51,8 +51,8 @@ L_NextDock: OnTimer10000: if ($@DockTickCount > $@DockLeaveCount) goto L_NextDock; - //mapannounce "035-2.tmx", "Koga - Main : Now docked in "+$@MainDocks$[$@MainCurrentDock]+", Departing soon", 0; - //mapannounce "036-2.tmx", "Koga - Candor : Now docked in "+$@CandorDocks$[$@CandorCurrentDock]+", Departing soon", 0; + //mapannounce "035-2.tmx", "Koga - Main:* Now docked in "+$@MainDocks$[$@MainCurrentDock]+", Departing soon", 0; + //mapannounce "036-2.tmx", "Koga - Candor:* Now docked in "+$@CandorDocks$[$@CandorCurrentDock]+", Departing soon", 0; set $@DockTickCount, $@DockTickCount + 1; initnpctimer; end; @@ -90,7 +90,7 @@ L_k2city2: end; } -function|script|FerryManifest|, +function|script|FerryManifest { mes "Which Ferry do you want to check the schedule for?"; menu @@ -119,7 +119,7 @@ L_Close: close; } -function|script|BoardFerry|, +function|script|BoardFerry { mes "Board the ferry?"; menu @@ -134,7 +134,7 @@ L_Return: return; } -function|script|BoardCandorFerry|, +function|script|BoardCandorFerry { mes "Board the ferry?"; menu diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt index 5ef85bda..9799b11d 100644 --- a/world/map/npc/functions/game_rules.txt +++ b/world/map/npc/functions/game_rules.txt @@ -1,6 +1,6 @@ // -function|script|GameRules|, +function|script|GameRules { set @read, 0; menu @@ -73,7 +73,7 @@ L_Danish: L_French: mes "ATTENTION: this translation is outdated. Please refer to the English version and submit a patch."; - mes "Les joueurs ne respectant pas les regles suivantes pourront, a la discretion des moderateurs (GM), etre bannis (jusqu'au banissement eternel inclus) ou avoir leur personnage reinitialise :"; + mes "Les joueurs ne respectant pas les regles suivantes pourront, a la discretion des moderateurs (GM), etre bannis (jusqu'au banissement eternel inclus) ou avoir leur personnage reinitialise:*"; mes "1. Ne manquez pas de respect envers les autres joueurs (insultes, language grossier, et autres choses du meme genre a l'intention d'un(e) joueur(se) en particulier ou d'un groupe de joueurs(ses))"; mes "2. N'utilisez pas de \"bot\" (ceci inclus n'importe quelle activite dans le jeu en etant loin du clavier, dont poser un objet sur le clavier pour attaquer automatiquement les monstres)"; mes "3. Ne faites pas de publicite inadequate (spam) et de repetitions intempestives (flood) (ceci inclus la repetition de demande de troc (trade))"; diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index 5e923c7e..0e5650e1 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -1,4 +1,4 @@ -017-9.gat,0,0,0|script|#GlobalHandler|-1, +017-9.gat,0,0,0|script|#GlobalHandler|-1 { end; diff --git a/world/map/npc/functions/gm_island.txt b/world/map/npc/functions/gm_island.txt index cae9bdb0..7d3954e1 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|-1 { end; @@ -9,12 +9,12 @@ OnInit: disablenpc "Gm Event#3"; end; } -function|script|GmWarp|, +function|script|GmWarp { warp "028-1", 110, 30; return; } -function|script|GmDebug|, +function|script|GmDebug { if (getgmlevel() < 60) goto L_Return; @@ -42,22 +42,22 @@ L_GmStop: L_Return: return; } -017-9.gat,32,21,0|script|Gm Event Debug|368, +017-9.gat,32,21,0|script|Gm Event Debug|368 { callfunc "GmDebug"; close; } -001-1.gat,49,68,0|script|Gm Event#1|368,0,0, +001-1.gat,49,68,0|script|Gm Event#1|368,0,0 { callfunc "GmWarp"; end; } -009-1.gat,46,30,0|script|Gm Event#2|368,0,0, +009-1.gat,46,30,0|script|Gm Event#2|368,0,0 { callfunc "GmWarp"; end; } -020-1.gat,67,89,0|script|Gm Event#3|368,0,0, +020-1.gat,67,89,0|script|Gm Event#3|368,0,0 { callfunc "GmWarp"; end; diff --git a/world/map/npc/functions/headstyles.txt b/world/map/npc/functions/headstyles.txt index 4648ede4..9645d339 100644 --- a/world/map/npc/functions/headstyles.txt +++ b/world/map/npc/functions/headstyles.txt @@ -1,7 +1,7 @@ // headstyles config file // author: meko -function|script|getHeadStyles|, +function|script|getHeadStyles { set @HairStyles$, 0; set @HairColors$, 0; diff --git a/world/map/npc/functions/inn.txt b/world/map/npc/functions/inn.txt index 45ed4052..ffa75582 100644 --- a/world/map/npc/functions/inn.txt +++ b/world/map/npc/functions/inn.txt @@ -1,6 +1,6 @@ // INN -function|script|Inn|, +function|script|Inn { mes "[" + @npcname$ + "]"; mes "\"Would you like to rest? It's only " + @cost + " gp.\""; diff --git a/world/map/npc/functions/lockpicking.txt b/world/map/npc/functions/lockpicking.txt index 375fd173..e878298e 100644 --- a/world/map/npc/functions/lockpicking.txt +++ b/world/map/npc/functions/lockpicking.txt @@ -4,7 +4,7 @@ // The player has to find the good number of times to hit a pin //----------------------------------------------------------------------------- -function|script|LockPicking|, +function|script|LockPicking { set @lock_picking_success, 0; setarray @pins, rand(1,3), rand(1,3), rand(1,3); diff --git a/world/map/npc/functions/magic.txt b/world/map/npc/functions/magic.txt index 2715cf7e..38acb817 100644 --- a/world/map/npc/functions/magic.txt +++ b/world/map/npc/functions/magic.txt @@ -10,7 +10,7 @@ // ------------------------------------------------------------ // Gain initial magic skill // ------------------------------------------------------------ -function|script|MagicGainBasic|, +function|script|MagicGainBasic { set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DRANK_POTION; close; @@ -19,7 +19,7 @@ function|script|MagicGainBasic|, // ------------------------------------------------------------ // Initialise Menu for selecting a choice of things to ask about // ------------------------------------------------------------ -function|script|MagicTalkOptionsSetup|, +function|script|MagicTalkOptionsSetup { set @QQ_ELANORE, 1; set @QQ_MANASEED, 2; @@ -39,7 +39,7 @@ function|script|MagicTalkOptionsSetup|, // Returns the result in @c, or returns 0 if there is no result // ------------------------------------------------------------ -function|script|MagicTalkMenu|, +function|script|MagicTalkMenu { setarray @choice$, "", "", "", "", "", "", "", "", "", ""; set @choices_nr, 0; @@ -169,7 +169,7 @@ L_MenuItems: // @SUP_name$ name of the skill to level up // @SUP_xp # of experience points to award if the level up succeeds // ------------------------------------------------------------ -function|script|SkillUp|, +function|script|SkillUp { if (getskilllv(@SUP_id) >= @SUP_lvl) goto L_shortcut; diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt index 6e0744c3..eaf0aba3 100644 --- a/world/map/npc/functions/mob_points.txt +++ b/world/map/npc/functions/mob_points.txt @@ -1,6 +1,6 @@ // Mob points -function|script|MobPoints|, +function|script|MobPoints { if (@mobID < 1002) goto L_Return; diff --git a/world/map/npc/functions/process_equip.txt b/world/map/npc/functions/process_equip.txt index 1e93320a..4a4b776f 100644 --- a/world/map/npc/functions/process_equip.txt +++ b/world/map/npc/functions/process_equip.txt @@ -1,6 +1,6 @@ // -function|script|ProcessEquip|, +function|script|ProcessEquip { set @head, getequipid(equip_head); set @torso, getequipid(equip_torso); diff --git a/world/map/npc/functions/slot_machine.txt b/world/map/npc/functions/slot_machine.txt index ebf72471..c25dba03 100644 --- a/world/map/npc/functions/slot_machine.txt +++ b/world/map/npc/functions/slot_machine.txt @@ -1,6 +1,6 @@ // -function|script|SlotMachine|, +function|script|SlotMachine { mes "Pull the lever..."; next; diff --git a/world/map/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt index 0af50a74..e047e928 100644 --- a/world/map/npc/functions/soul_menhir.txt +++ b/world/map/npc/functions/soul_menhir.txt @@ -1,4 +1,4 @@ -function|script|SoulMenhir|, +function|script|SoulMenhir { mes "[Soul Menhir]"; mes "(A mystical aura surrounds this stone. You feel mysteriously attracted to it. Something tells you to touch it. What do you do?)"; diff --git a/world/map/npc/functions/strangerquiz.txt b/world/map/npc/functions/strangerquiz.txt index b3488649..8da3f65a 100644 --- a/world/map/npc/functions/strangerquiz.txt +++ b/world/map/npc/functions/strangerquiz.txt @@ -1,5 +1,5 @@ -function|script|StrangerQuiz|, +function|script|StrangerQuiz { // param @quizparam$$ // return in @quizanswer$ diff --git a/world/map/npc/functions/time.txt b/world/map/npc/functions/time.txt index 5f728639..9f141d3e 100644 --- a/world/map/npc/functions/time.txt +++ b/world/map/npc/functions/time.txt @@ -6,7 +6,7 @@ // output @ts_date$ "yyyy-mm-dd" // output @ts_time$ "hh:mm:ss" -function|script|time_stamp|, +function|script|time_stamp { // local variables // if there is reasonable demand, these might be exported diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt index 60db8375..6827aece 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.gat,27,28,0|script|#TravelConfig|-1, +017-9.gat,27,28,0|script|#TravelConfig|-1 { end; @@ -45,7 +45,7 @@ OnInit: end; } -function|script|TravelerTut|, +function|script|TravelerTut { //Explain Travelers mes "["+@NpcName$+"]"; @@ -63,7 +63,7 @@ L_Return: return; } -function|script|Traveler|, +function|script|Traveler { mes "["+@NpcName$+"]"; mes "\"Greetings. I am "+@NpcName$+" the Traveler.\""; diff --git a/world/map/npc/functions/undead_debug.txt b/world/map/npc/functions/undead_debug.txt index 4b2a015a..a49fcd76 100644 --- a/world/map/npc/functions/undead_debug.txt +++ b/world/map/npc/functions/undead_debug.txt @@ -1,6 +1,6 @@ // Debug Crypts Battle -function|script|UndeadDebug|, +function|script|UndeadDebug { goto L_Main; @@ -82,7 +82,7 @@ L_Close: } // Debug for Krukan -027-3.gat,84,89,0|script|UndeadDebug3|155, +027-3.gat,84,89,0|script|UndeadDebug3|155 { set @undeaddebug, 3; callfunc "UndeadDebug"; @@ -94,7 +94,7 @@ OnInit: } // Debug for Razha -027-4.gat,76,79,0|script|UndeadDebug4|155, +027-4.gat,76,79,0|script|UndeadDebug4|155 { set @undeaddebug, 4; callfunc "UndeadDebug"; @@ -106,7 +106,7 @@ OnInit: } // Debug for Terogan -027-5.gat,72,26,0|script|UndeadDebug5|155, +027-5.gat,72,26,0|script|UndeadDebug5|155 { set @undeaddebug, 5; callfunc "UndeadDebug"; diff --git a/world/map/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt index f24f2bc5..b9a73740 100644 --- a/world/map/npc/functions/water_bottle.txt +++ b/world/map/npc/functions/water_bottle.txt @@ -1,6 +1,6 @@ // Fills empty bottles with water -function|script|WaterBottle|, +function|script|WaterBottle { set @COST_PER_BOTTLE, 150; diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt index 29129eab..8c81f94e 100644 --- a/world/map/npc/items/check_wand.txt +++ b/world/map/npc/items/check_wand.txt @@ -1,6 +1,6 @@ // Wands // Author: Wushin -function|script|WandMana|, +function|script|WandMana { if(isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) && ((@Duel_Fighter != 1) || ($@Duel_NoMagic == 1))) goto L_Return; @@ -31,7 +31,7 @@ L_LowSp: L_Return: return; } -function|script|CheckWand|, +function|script|CheckWand { setarray $@Wands, 758, 1171; setarray $@WandsPwr, 2, 1; diff --git a/world/map/npc/items/launcher_ammo.txt b/world/map/npc/items/launcher_ammo.txt index 25f4df9b..1582f8a4 100644 --- a/world/map/npc/items/launcher_ammo.txt +++ b/world/map/npc/items/launcher_ammo.txt @@ -11,14 +11,14 @@ // // ------------------------------------------------------------ -function|script|CheckLauncher|, +function|script|CheckLauncher { if (getequipid(equip_arrow) == -1) set @LauncherType, 0; return; } -function|script|CheckAmmo|, +function|script|CheckAmmo { if ((@LauncherType == @AmmoType) || (!@LauncherType)) goto L_Return; diff --git a/world/map/npc/items/magic_gm_top_hat.txt b/world/map/npc/items/magic_gm_top_hat.txt index 35b5fbd7..f4f6b078 100644 --- a/world/map/npc/items/magic_gm_top_hat.txt +++ b/world/map/npc/items/magic_gm_top_hat.txt @@ -1,4 +1,4 @@ -function|script|ActivateMagicGMTophat|, +function|script|ActivateMagicGMTophat { if (getgmlevel() < 60) goto L_Return; getinventorylist; diff --git a/world/map/npc/items/mirror.txt b/world/map/npc/items/mirror.txt index 82aeb7a7..dcca9398 100644 --- a/world/map/npc/items/mirror.txt +++ b/world/map/npc/items/mirror.txt @@ -1,4 +1,4 @@ -function|script|useMirror|, +function|script|useMirror { callfunc "getHeadStyles"; goto L_Rand; diff --git a/world/map/npc/items/purification_potion.txt b/world/map/npc/items/purification_potion.txt index 9ff5494c..9a7bdcc7 100644 --- a/world/map/npc/items/purification_potion.txt +++ b/world/map/npc/items/purification_potion.txt @@ -1,6 +1,6 @@ // This is the function to use the PurificationPotion -function|script|usePurificationPotion|, +function|script|usePurificationPotion { if (isat("011-1.gat", 88,67)) goto L_Wyara_Pond; @@ -23,8 +23,6 @@ L_Wyara_Pond: message strcharinfo(0), "You pour the potion into the pond."; - set QUEST_MAGIC2, - (QUEST_MAGIC2 & ~(@Q_MASK) - | (@Q_status << @Q_SHIFT)); + set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT)); return; } diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt index f9734a1c..40200ea9 100644 --- a/world/map/npc/items/require_stat.txt +++ b/world/map/npc/items/require_stat.txt @@ -8,7 +8,7 @@ // @minbStatVal The minimum stat value to accept this item. // ------------------------------------------------------------ -function|script|RequireStat|, +function|script|RequireStat { set @bStatVal, readparam(@bStat); // If the requirement isn't met, we set an unequip trigger. diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt index 5873ce45..c0084408 100644 --- a/world/map/npc/items/restricted_item.txt +++ b/world/map/npc/items/restricted_item.txt @@ -6,7 +6,7 @@ // @minLvl The minimum required GM level to equip this item. When not set or set to 0, it is set to 60 as a default. // ------------------------------------------------------------ -function|script|RestrictedItem|, +function|script|RestrictedItem { if (!@minLvl) set @minLvl, 60; if (debug || getgmlevel() >= @minLvl) goto L_Return; // If the active character is staff, do nothing. diff --git a/world/map/npc/items/scissors.txt b/world/map/npc/items/scissors.txt index 71e1f52c..7e58ae98 100644 --- a/world/map/npc/items/scissors.txt +++ b/world/map/npc/items/scissors.txt @@ -1,4 +1,4 @@ -function|script|useScissors|, +function|script|useScissors { if (rand(3)) goto L_Change; diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt index 9bcfc875..e8ff6003 100644 --- a/world/map/npc/items/shock_sweet.txt +++ b/world/map/npc/items/shock_sweet.txt @@ -1,4 +1,4 @@ -function|script|useShockSweet|, +function|script|useShockSweet { if (rand(5)) goto L_Change; diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt index 83a74f20..c033c80f 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.gat,0,0,0|script|UnequipCB|-1, +017-9.gat,0,0,0|script|UnequipCB|-1 { end; @@ -13,7 +13,7 @@ OnUnequip: } // Paired with unequipcb -function|script|UnequipLater|, +function|script|UnequipLater { // if there are multiple items that want to be removed, // only schedule one timer - scripts will be called again diff --git a/world/map/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt index 68fbc468..d8bb9e07 100644 --- a/world/map/npc/items/unreleased_item.txt +++ b/world/map/npc/items/unreleased_item.txt @@ -3,7 +3,7 @@ // @slotId The slot in which the item would have been equipped in. This is passed automagically when called in an equip script. // ------------------------------------------------------------ -function|script|UnreleasedItem|, +function|script|UnreleasedItem { // If the server allows equipping unreleased items or if the active character is staff, do nothing. if (debug || getgmlevel()) diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index 23c5e611..ac82c92b 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -1,5 +1,5 @@ // See #TravelConfig -function|script|WarpTowel|, +function|script|WarpTowel { if (TowelLastUsed > (gettimetick(2) - 1800)) goto L_DontPanic; @@ -146,7 +146,7 @@ L_End: end; } -function|script|MultiWarpTowel|, +function|script|MultiWarpTowel { setarray $@warpTowels$, "HitchhikersTowel", "WhiteHitchhikersTowel", "RedHitchhikersTowel", "GreenHitchhikersTowel", "BlueHitchhikersTowel", "YellowHitchhikersTowel", "PurpleHitchhikersTowel", "OrangeHitchhikersTowel", "PinkHitchhikersTowel", "TealHitchhikersTowel", "LimeHitchhikersTowel"; set @towel_count, 0; |