diff options
Diffstat (limited to 'world/map/npc')
26 files changed, 49 insertions, 53 deletions
diff --git a/world/map/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt index c778038d..6205f79a 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:*50,CactusPotion:*70,Beer:*175,ChickenLeg:*500 diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt index 2dea74a3..ad0b625b 100644 --- a/world/map/npc/001-2/casino.txt +++ b/world/map/npc/001-2/casino.txt @@ -40,7 +40,7 @@ L_End: close; } -001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins:*1 +001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins:*10 001-2.gat,28,63,0|script|BlackJack|107 { diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt index 46707cf3..9d71508d 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:*175,Cake:*30,CherryCake:*100 diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt index 905eec7d..c67441c2 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:*800,MinerGloves:*3000,ShortBow:*800,Arrow:*2,LeatherShield:*2000 diff --git a/world/map/npc/006-2/shops.txt b/world/map/npc/006-2/shops.txt index d6fff45d..f84f2690 100644 --- a/world/map/npc/006-2/shops.txt +++ b/world/map/npc/006-2/shops.txt @@ -2,4 +2,4 @@ // 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,30,35,0|shop|Ardra|179,CactusDrink:*1,CactusPotion:*1,BottleOfWater:*1,RoastedMaggot:*1 +006-2.gat,30,35,0|shop|Ardra|179,CactusDrink:*50,CactusPotion:*70,BottleOfWater:*200,RoastedMaggot:*110 diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index 698aa65f..a8bbc20b 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -163,8 +163,7 @@ OnInit: end; L_FAULTY_SETUP: - gmcommand "@mapexit"; - end; + mapexit; OnTimer1000: setnpctimer 0; diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt index 1b3ed2ca..d0da9413 100644 --- a/world/map/npc/009-2/shops.txt +++ b/world/map/npc/009-2/shops.txt @@ -6,7 +6,7 @@ // Bartender // sells beer, cake and steak -009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*1,Cake:*1,Steak:*1 +009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*175,Cake:*30,Steak:*275 // Receptionist // Offers the player to rest at the inn for 100gp @@ -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:*2,IronArrow:*4,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:*50,CactusPotion:*70,IronPotion:*500,ConcentrationPotion:*500,SlowPoisonPotion:*500 // 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:*300,BottleOfWater:*200,CottonShirt:*300,CottonShorts:*1000,Boots:*2000,SerfHat:*500,CottonHeadband:*3000,CottonGloves:*2000 diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt index a291cae0..aab0b36b 100644 --- a/world/map/npc/009-7/shops.txt +++ b/world/map/npc/009-7/shops.txt @@ -1,3 +1,3 @@ -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:*175,IronPotion:*500,ConcentrationPotion:*500,SmallManaElixir:*2400,BottleOfWater:*200,Milk:*300 -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:*110,PickledBeets:*5000,ChickenLeg:*250,Steak:*275,Beer:*180 diff --git a/world/map/npc/009-7/trapdoor.txt b/world/map/npc/009-7/trapdoor.txt index 7ab6b0b6..aff98cbd 100644 --- a/world/map/npc/009-7/trapdoor.txt +++ b/world/map/npc/009-7/trapdoor.txt @@ -58,6 +58,6 @@ L_Close: OnInit: setarray $@fightclub_randompasswords$, "Abibliophobia", "Anencephalous", "Batrachomyomachy", "Blunderbuss", "Boustrophedon", "Bumbershoot", "Canoodle", "Cockalorum", "Cockamamie", "Collywobbles", "Eructation", "Flibbertigibbet", "Formication", "Gaberlunzie", "Gastromancy", "Gobemouche", "Hemidemisemiquaver", "Hobbledehoy", "Hootenanny", "Lickspittle", "Lollygag", "Mumpsimus", "Nincompoop", "Oocephalus", "Pettifogger", "Sialoquent", "Slangwhanger", "Smellfungus", "Tatterdemalion", "Vomitory", "Widdershins", "Avoirdupois", "Embonpoint", "Bibble", "Erinaceous", "Impignorate", "Nudiustertian", "Tittynope", "Winklepicker", "Yarborough", "Floccinaucinihilipilification"; setarray $@fightclub_definitions$, "The fear of running out of reading material","Lacking a brain","Making a mountain out of a molehill","A gun with a flared muzzle or disorganized activity","A back and forth pattern","An umbrella","To hug and kiss","A small, haughty man","Absurd, outlandish","Butterflies in the stomach","A burp, belch","Nonsense, balderdash","The sense of ants crawling on your skin","A wandering beggar","Telling fortune from the rumblings of the stomach","A highly gullible person","A musical timing of 1/64","An awkward or ill-mannered young boy","A country or folk music get-together","A servile person, a toady","To move slowly, fall behind","To move slowly, fall behind","A foolish person","An egghead","A person who tries to befuddle others with his speech","Spitting while speaking","A loud abusive speaker or obnoxious writer","A perpetual pessimist","A child in rags","An exit or outlet","In a contrary or counterclockwise direction", "Commodities sold by weight", "A plump, hourglass figure", "To drink often; to eat and/or drink noisily", "Resembling a hedgehog", "To pawn or mortgage something", "The day before yesterday", "A small quantity of something left over", "Style of shoe or boot with a sharp and long pointed toe", "Hand of cards containing no card above a nine", "Estimation that something is valueless"; - if(getarraysize($@fightclub_randompasswords$) != getarraysize($@fightclub_definitions$)) gmcommand "@mapexit"; + if(getarraysize($@fightclub_randompasswords$) != getarraysize($@fightclub_definitions$)) mapexit; end; } diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt index 94c3f494..364adf8c 100644 --- a/world/map/npc/010-2/dimonds.txt +++ b/world/map/npc/010-2/dimonds.txt @@ -536,13 +536,13 @@ 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:*175,IronPotion:*500,ConcentrationPotion:*500 -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:*100,RoastedMaggot:*110,OrangeCupcake:*600,ChickenLeg:*250,Steak:*275 -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:*20000,IronArrow:*4,LeatherShield:*2000 -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:*1000,FancyHat:*1600,SilkHeadband:*5000,CottonSkirt:*1000,Boots:*8000,CottonBoots:*2000 010-2.gat,75,68,0|script|Basil|107 { diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt index 48126fe2..4aa94d9d 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:*20,RedApple:*25,Orange:*40 diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt index fb29a68a..c7468111 100644 --- a/world/map/npc/012-1/shops.txt +++ b/world/map/npc/012-1/shops.txt @@ -1,6 +1,6 @@ // -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:*80,PinkRose:*80,YellowRose:*80,WhiteRose:*80,OrangeRose:*80,DarkRedRose:*80,RedTulip:*80,PinkTulip:*80,YellowTulip:*80,WhiteTulip:*80,OrangeTulip:*80 012-1.gat,36,99,0|script|Blossom|163 { diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt index 1f43ebaa..2ce823b6 100644 --- a/world/map/npc/020-2/shops.txt +++ b/world/map/npc/020-2/shops.txt @@ -14,9 +14,9 @@ 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:*4,ShortBow:*8000,Dagger:*1000,LeatherShield:*2000 // 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:*50,CactusPotion:*70,IronPotion:*500,ConcentrationPotion:*500 // INN 020-2.gat,111,23,0|script|Kane|120 diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt index 2bb932da..20dc49d5 100644 --- a/world/map/npc/021-1/bakery.txt +++ b/world/map/npc/021-1/bakery.txt @@ -1,6 +1,6 @@ // 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:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,CherryCake:*100 021-1.gat,108,102,0|script|Itka|114 { diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt index db6dea50..3211b2b8 100644 --- a/world/map/npc/021-1/north_shops.txt +++ b/world/map/npc/021-1/north_shops.txt @@ -3,7 +3,7 @@ // 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:*300,CottonShorts:*1000,CottonBoots:*2000,CottonHeadband:*3000 021-1.gat,129,40,0|script|Well|400 { diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt index 0dd303f1..acde18f2 100644 --- a/world/map/npc/021-2/bakery.txt +++ b/world/map/npc/021-2/bakery.txt @@ -129,7 +129,7 @@ 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:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,Cake:*30,CherryCake:*100,OrangeCupcake:*270,Milk:*1500,XmasCake:*70 // Stockroom boy 021-2.gat,133,21,0|script|Iormo|160 diff --git a/world/map/npc/021-2/forge_shops.txt b/world/map/npc/021-2/forge_shops.txt index 608ce082..4e30fe50 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:*500,SlingBullet:*1,ShortBow:*8000,Arrow:*1,IronArrow:*4 +021-2.gat,71,133,0|shop|Mjolnir|377,Knife:*50,SharpKnife:*100,Dagger:*1000,LeatherShirt:*2000,LeatherShield:*2000 diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt index c51ca747..f1ab846a 100644 --- a/world/map/npc/027-2/gy_inn_shops.txt +++ b/world/map/npc/027-2/gy_inn_shops.txt @@ -7,10 +7,10 @@ // 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:*100,LadyFingers:*70,JellAhh:*80,Snapple:*110 +027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice:*80,GutBuster:*100,BloodWine:*150 +027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows:*50,ShockSweet:*1000 +027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink:*50,CactusPotion:*70,BugLeg:*100,SmallMushroom:*125,IronPotion:*500,ConcentrationPotion:*500,HardSpike:*40,DarkCrystal:*1000,Root:*500,WispPowder:*700,SpectrePowder:*700,PoltergeistPowder:*700 027-2.gat,106,22,0|script|Edwin|309 { diff --git a/world/map/npc/035-2/shops.txt b/world/map/npc/035-2/shops.txt index 7d7d656a..6ab193a5 100644 --- a/world/map/npc/035-2/shops.txt +++ b/world/map/npc/035-2/shops.txt @@ -1,6 +1,6 @@ // -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:*175,Orange:*40,CasinoCoins:*10 035-2.gat,23,35,0|script|Bunkmaster Phict|212 { diff --git a/world/map/npc/036-2/shops.txt b/world/map/npc/036-2/shops.txt index 4d60d6cf..cbb7c84e 100644 --- a/world/map/npc/036-2/shops.txt +++ b/world/map/npc/036-2/shops.txt @@ -1,7 +1,7 @@ // -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:*175,Steak:*550,CasinoCoins:*10 +036-2.gat,35,22,0|shop|Gunney|138,Arrow:*4,IronArrow:*8 036-2.gat,23,35,0|script|Bunkmaster Daban|212 { diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt index 92e27f9a..839a5f65 100644 --- a/world/map/npc/042-2/sorfina.txt +++ b/world/map/npc/042-2/sorfina.txt @@ -69,8 +69,8 @@ L_Tut: L_Carpet: mes "[Sorfina]"; mes "\"Try to take a few steps and walk to that carpet over there."; - mes "Just use the ###keyMoveUp; to move up, ###keyMoveDown; to move down, "; - mes " ###keyMoveLeft; to move left, ###keyMoveRight; to move right "; + mes "Just use the ###keyMoveUp; to move up, press ###keyMoveDown; to move down, "; + mes "press ###keyMoveLeft; to move left, press ###keyMoveRight; to move right "; mes " or click on the place you want to go to.\""; set @tutorial_tmp, 1; callfunc "SetTutorialMask"; @@ -141,8 +141,8 @@ L_Explain: L_Walk: mes "[Sorfina]"; mes "\"You can use the arrow keys to walk around."; - mes "Just use the ###keyMoveUp; to move up, ###keyMoveDown; to move down, "; - mes " ###keyMoveLeft; to move left, ###keyMoveRight; to move right "; + mes "Just use the ###keyMoveUp; to move up, press ###keyMoveDown; to move down, "; + mes "press ###keyMoveLeft; to move left, press ###keyMoveRight; to move right "; mes " or click on the place you want to go to.\""; mes "This only works if that place is reachable and walkable.\""; goto L_Close; diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt index aad93769..72d68d84 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -62,7 +62,7 @@ L_Fight_Again: mes "\"Ok, listen what to do."; mes "Equip a weapon and kill the maggots.\""; next; - mes "\"Press A to focus on a monster. With ###keyTargetAttack; you can focus and start attacking the same time."; + mes "\"Press ###keyTargetMonster; to focus on a monster. With ###keyTargetAttack; you can focus and start attacking the same time."; mes "But it also works to click on the monster with your mouse.\""; next; mes "\"If you press the ###keyTarget;, you can abort your attack.\""; diff --git a/world/map/npc/068-2/latoy.txt b/world/map/npc/068-2/latoy.txt index 13225bac..ee28555b 100644 --- a/world/map/npc/068-2/latoy.txt +++ b/world/map/npc/068-2/latoy.txt @@ -1,8 +1,7 @@ // 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 +068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt:*2000,SilkRobe:*40000,SerfHat:*500,DesertHat:*9600 068-2.gat,92,83,0|script|Latoy|106 { diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt index 226d8bbb..0401fc3d 100644 --- a/world/map/npc/annuals/halloween/config.txt +++ b/world/map/npc/annuals/halloween/config.txt @@ -339,11 +339,11 @@ L_Main: if(gettime(6) <= $@halloween_end_month && gettime(5) > $@halloween_reward_end_day) goto L_NoEventTime; - if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day + if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day && (gettime(5) <= $@halloween_reward_end_day && $@halloween_reward_start_month == $@halloween_end_month || !($@halloween_reward_start_month == $@halloween_end_month))) - || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day - && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month + || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day + && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month || !($@halloween_reward_start_month == $@halloween_end_month))) || (gettime(6) < $@halloween_end_month && gettime(6) > $@halloween_reward_start_month)) goto L_RewardTime; @@ -372,6 +372,5 @@ L_Return: L_HalloweenError: debugmes "Halloween is Dead Jim."; - gmcommand "@mapexit"; - end; + mapexit; } diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt index 70eb5b05..e95494d3 100644 --- a/world/map/npc/annuals/xmas/config.txt +++ b/world/map/npc/annuals/xmas/config.txt @@ -262,11 +262,11 @@ L_Main: set $@xmas_spawn_y2, 89; set $@xmas_respawn_count, 9; - if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day + if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day && (gettime(5) <= $@xmas_reward_end_day && $@xmas_reward_start_month == $@xmas_end_month || !($@xmas_reward_start_month == $@xmas_end_month))) - || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day - && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month + || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day + && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month || !($@xmas_reward_start_month == $@xmas_end_month))) || (gettime(6) < $@xmas_end_month && gettime(6) > $@xmas_reward_start_month)) goto L_RewardTime; @@ -299,6 +299,5 @@ L_Return: L_XmasError: debugmes "Xmas is Dead Jim."; - gmcommand "@mapexit"; - end; + mapexit; } diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt index 829b5f2f..cc5bfa14 100644 --- a/world/map/npc/functions/ferry.txt +++ b/world/map/npc/functions/ferry.txt @@ -124,8 +124,8 @@ function|script|BoardFerry { mes "Board the ferry?"; menu - "yes.", L_Board, - "no.", L_Return; + "Yes.", L_Board, + "No.", L_Return; L_Board: warp "035-2.tmx",39,29; |