diff options
24 files changed, 38 insertions, 38 deletions
diff --git a/world/map/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt index c778038d..c5b046b0 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-2/casino.txt b/world/map/npc/001-2/casino.txt index 2dea74a3..9e499b32 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:*-1 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..1e3f843a 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/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt index 905eec7d..7d3d1343 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/006-2/shops.txt b/world/map/npc/006-2/shops.txt index d6fff45d..81b9521c 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:*-1,CactusPotion:*-1,BottleOfWater:*-1,RoastedMaggot:*-1 diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt index 1b3ed2ca..64af7607 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:*-1,Cake:*-1,Steak:*-1 // 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:*-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-7/shops.txt b/world/map/npc/009-7/shops.txt index a291cae0..0ae2ffe0 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:*-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/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt index 94c3f494..abec829d 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:*-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 { diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt index 48126fe2..e0876fb0 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/012-1/shops.txt b/world/map/npc/012-1/shops.txt index fb29a68a..a5cd9cfe 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:*-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 { diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt index 1f43ebaa..4bdf1401 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:*-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 diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt index 2bb932da..8631b0ef 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:*-1,ChocolateCake:*-1,OrangeCake:*-1,AppleCake:*-1,CherryCake:*-1 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..67a9db73 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:*-1,CottonShorts:*-1,CottonBoots:*-1,CottonHeadband:*-1 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..85fab79e 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:*-1,ChocolateCake:*-1,OrangeCake:*-1,AppleCake:*-1,Cake:*-1,CherryCake:*-1,OrangeCupcake:*-3Milk:*-5XmasCake:*-1 // 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..1bbabe0a 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:*-2LeatherShield:*-2 diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt index c51ca747..0e13f9d9 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:*-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 { diff --git a/world/map/npc/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt index 2ac4a018..d53450e1 100644 --- a/world/map/npc/027-6/general_krukan.txt +++ b/world/map/npc/027-6/general_krukan.txt @@ -121,7 +121,7 @@ L_NextWave: L_SummonNuke: set $@CRYPT_FIGHT1_SUMMONS_COUNT, $@CRYPT_FIGHT1_SUMMONS_COUNT + $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PLAYER_COUNT*4; - areamonster "027-6.gat", 0, 0, 79, 84, "", 1043, $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PLAYER_COUNT*4, "General Krukan::OnPetDeath"; + areamonster "027-6.gat", 0, 0, 79, 84, "", 1043, $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PLAYER_COUNT*-4 "General Krukan::OnPetDeath"; goto L_Announce; L_WeakSummons: diff --git a/world/map/npc/027-7/general_razha.txt b/world/map/npc/027-7/general_razha.txt index cad3e4cb..99d2bae7 100644 --- a/world/map/npc/027-7/general_razha.txt +++ b/world/map/npc/027-7/general_razha.txt @@ -121,7 +121,7 @@ L_NextWave: L_SummonNuke: set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4; - areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4, "General Razha::OnPetDeath"; + areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*-4 "General Razha::OnPetDeath"; goto L_Announce; L_WeakSummons: diff --git a/world/map/npc/027-8/general_terogan.txt b/world/map/npc/027-8/general_terogan.txt index 3bf89d35..4d7051c6 100644 --- a/world/map/npc/027-8/general_terogan.txt +++ b/world/map/npc/027-8/general_terogan.txt @@ -177,7 +177,7 @@ L_NextWave: L_SummonNuke: set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4; - areamonster "027-8.gat", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4, "General Terogan#Main::OnPetDeath"; + areamonster "027-8.gat", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*-4 "General Terogan#Main::OnPetDeath"; goto L_Announce; L_WeakSummons: diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt index ed6101a7..993a2f0a 100644 --- a/world/map/npc/030-4/mana_battery.txt +++ b/world/map/npc/030-4/mana_battery.txt @@ -221,7 +221,7 @@ L_NextWave: goto L_Return_1; //KillerWaves if ($@XmasBossRound > 16) - areamonster "030-4.gat", 0, 0, 50, 50, "", 1114, $@XmasBossRound*2 + $@XmasBossPlayerCount*3, "AniManOMat::OnGuardDeath"; + areamonster "030-4.gat", 0, 0, 50, 50, "", 1114, $@XmasBossRound*2 + $@XmasBossPlayerCount*-3 "AniManOMat::OnGuardDeath"; //Normal Waves 1 to 10 // Guard Amount doubles if on hard mode set $@GuardAmount, 1 + (6 + ($@XmasBossRound) + (2 * $@XmasBossPlayerCount)) / 7; diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index de9062fd..8046e7e0 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -171,7 +171,7 @@ L_NextWave: && $@FIGHT_YETI_WAVE < 22) goto L_Return_1; if ($@FIGHT_YETI_WAVE > 22) - areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5, "Cindy::OnPetDeath"; + areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*-5 "Cindy::OnPetDeath"; if ($@FIGHT_YETI_WAVE > 22) set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5; set $@FIGHT_YETI_NUMBER, (5 + (1 * $@FIGHT_YETI_WAVE) + (2 * $@FIGHT_YETI_PLAYER_COUNT))/4; diff --git a/world/map/npc/035-2/shops.txt b/world/map/npc/035-2/shops.txt index 7d7d656a..abd03be3 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:*-1,Orange:*-1,CasinoCoins:*-1 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..1bac2f83 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:*-1,Steak:*-2CasinoCoins:*-1 +036-2.gat,35,22,0|shop|Gunney|138,Arrow:*-2IronArrow:*-2 036-2.gat,23,35,0|script|Bunkmaster Daban|212 { diff --git a/world/map/npc/068-2/latoy.txt b/world/map/npc/068-2/latoy.txt index 13225bac..bef96604 100644 --- a/world/map/npc/068-2/latoy.txt +++ b/world/map/npc/068-2/latoy.txt @@ -1,8 +1,8 @@ // 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:*-5SerfHat:*-1,DesertHat:*-4 +068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt:*-1,SilkRobe:*-5SerfHat:*-1,DesertHat:*-4 068-2.gat,92,83,0|script|Latoy|106 { |