From 1a5a1faea98aae7e968b656825f8b93fa687788f Mon Sep 17 00:00:00 2001 From: wushin Date: Wed, 19 Nov 2014 09:51:03 -0600 Subject: Wushin's is a sed failure --- world/map/npc/021-2/bakery.txt | 2 +- world/map/npc/021-2/forge_shops.txt | 2 +- world/map/npc/027-6/general_krukan.txt | 2 +- world/map/npc/027-7/general_razha.txt | 2 +- world/map/npc/027-8/general_terogan.txt | 2 +- world/map/npc/030-4/mana_battery.txt | 2 +- world/map/npc/031-4/cindyCave.txt | 2 +- world/map/npc/036-2/shops.txt | 4 ++-- world/map/npc/068-2/latoy.txt | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'world/map') diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt index 85fab79e..efd47e17 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:*-3Milk:*-5XmasCake:*-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 diff --git a/world/map/npc/021-2/forge_shops.txt b/world/map/npc/021-2/forge_shops.txt index 1bbabe0a..b43d86af 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:*-2LeatherShield:*-2 +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/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt index d53450e1..2ac4a018 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 99d2bae7..cad3e4cb 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 4d7051c6..3bf89d35 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 993a2f0a..ed6101a7 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 8046e7e0..de9062fd 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/036-2/shops.txt b/world/map/npc/036-2/shops.txt index 1bac2f83..5642ed15 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:*-2CasinoCoins:*-1 -036-2.gat,35,22,0|shop|Gunney|138,Arrow:*-2IronArrow:*-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 { diff --git a/world/map/npc/068-2/latoy.txt b/world/map/npc/068-2/latoy.txt index bef96604..e9d050f1 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:*-5SerfHat:*-1,DesertHat:*-4 -068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt:*-1,SilkRobe:*-5SerfHat:*-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 { -- cgit v1.2.3-60-g2f50