diff options
Diffstat (limited to 'world/map/npc/011-1')
| -rw-r--r-- | world/map/npc/011-1/_mobs.txt | 26 | ||||
| -rw-r--r-- | world/map/npc/011-1/alchemist.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/011-1/auldsbel.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/011-1/oscar.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/011-1/shops.txt | 2 |
5 files changed, 19 insertions, 19 deletions
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 |