[FoS] Fix several stuffs including exploits, add monster population of Artis.

This is not a coincidence, you'll understand in Migglemire.

1 files changed, 48 insertions, 45 deletions

diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 18df7e94a..9ecbfee00 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -149,50 +149,48 @@ L_FiresOfSteam:
     freeloop(false);
     setq ShipQuests_Arpan, 5;
     setq General_Narrator, 21;
-    .@acc=any(Mustache, Beard, HeartGlasses, Sunglasses, EyePatch, Shemagh, Monocle, Googles, BurglarMask, BanditMask, Shemagh);
-    .@ac2=any(OldTowel, SantaGlobe, RedStocking, LeatherBall, Doll, ZarkorScroll, ThetaBook, AshUrn, RubberDucky, DragonStar, BronzeQuiver, AstralCube, PlushMouboo, PlushMouboo, GraduationAlbum);
-    .@hat=any(TopHat, CaptainHat, SmileyCap, BowlerHat, DesertHat, PirateBandana, KnitHat, RightEyePatch, AntlersHat, BunnyEars, AxeHat, PaperBag, ShroomHat, AFKCap, BrimmedFeatherHat, CatEars, Earmuffs, CorsairHat, SailorHat, ChefHat, SkullMask, LeprechaunHat, PrsmHelmet, ImperialCrown, ClericCap);
-    .@ha2=any(DarkKnightHelmet, VikingHelmet, TerraniteMask, CenturionHelmet, ChemistHelmet, BullHelmet, DarkHelm, SamuraiHelmet, SamuraiHelmet);
-    .@che=any(RedknightArmor, AssassinChest, SaviorArmor, TerraniteArmor, GraduationRobe, GoldenWarlordPlate, RedknightArmor);
-    .@pan=any(JeansChaps, LeatherTrousers, AssassinPants, TerranitePants, WarlordPants, BromenalPants, ChainmailSkirt, AssassinPants, ChainmailSkirt, AssassinPants);
-    .@sho=any(DeepBlackBoots, HeliosBoots, WizardMoccasins, WarlordBoots, TerraniteBoots, AssassinBoots, WitchBoots, RedStockings, DeepBlackBoots, DeepBlackBoots);
-    .@nec=any(BarbarianAmulet, GoldenFourLeafAmulet, PlatinumFourLeafAmulet, BarbarianMasterAmulet, MoubooPendant, LifestonePendant, AlvasusPendant, ToothNecklace);
-    .@rin=any(GoldenPearlRing, GoldenBlackPearlRing);
-    .@glo=any(GoldenArmbands, WarlordGloves, AssassinGloves, TerraniteGloves, ManaGloves, SarabArmlet, LeatherGloves, MinerGloves);
-    .@shi=any(EnchantedHerbBag, RentCart, Barrel, MasterBola, PiouBola, AncientShield, BlueKnightShield, SteelShield, DragonShield, SnakeBola);
-    .@wpn=any(Setzer, Kitana, Lightsaber, BoneKnife, AncientSword, LongSword, RockKnife, DivineSword, CentaurSpear, Zambacutou, CursedScythe, Halberd, PynRifle, PynGatling, PynShotgun, PynRevolver, Dustynator, ChampionshipBow, BansheeBow, LeaderWand, ImmortalSword, LegendaryWand, ChampionshipBow, BansheeBow, LeaderWand, LegendaryWand);
-    .@bon=any(Pickaxe, Kanabo, ElficBow, Judgement, ThunderStaff, ReinbooWand, DarkPulsar, Skypiercer, IceGladius, RealBronzeGladius, PurpleBola, KidBola, SilkGloves, ClawPendant, Boots, LuffyxSummerShorts, UglyChristmasSweater, MinerTankTop, ContributorSweater, LinarianSoul, TuxSoul, DeliciousCookie, DarkEggshellHat, Wreath);
-    .@pet=any(PiouEgg, BhopEgg, MaggotCocoon, DoggyDog, CattyCat, BlackyCat, Ratte, ForestShroomEgg, FluffyEgg, DuckEgg, BatEgg, MoggunEgg, PinkieCrystal, DragonHorn, TamedSnakeEgg);
-    getitem .@acc, 1;
-    getitem .@ac2, 1;
-    getitem .@hat, 1;
-    getitem .@ha2, 1;
-    getitem .@che, 1;
-    getitem .@pan, 1;
-    getitem .@nec, 1;
-    getitem .@rin, 1;
-    getitem .@glo, 1;
-    getitem .@shi, 1;
-    getitem .@wpn, 1;
-    getitem .@bon, 1;
-    getitem .@pet, 1;
-    equip(.@acc);
-    equip(.@ac2);
-    equip(.@hat);
-    equip(.@ha2);
-    equip(.@che);
-    equip(.@pan);
-    equip(.@nec);
-    equip(.@rin);
-    equip(.@glo);
-    equip(.@shi);
-    equip(.@wpn);
-    Zeny+=rand2(40000);
-    #TUTORIAL_DONE=true;
-    #REG_DATE=gettimetick(2);
-    TUTORIAL=true;
-    MAGIC_LVL=7;
-    adddefaultskills;
+    if (!#TUTORIAL_DONE) {
+        .@acc=any(Mustache, Beard, HeartGlasses, Sunglasses, EyePatch, Shemagh, Monocle, Googles, BurglarMask, BanditMask, Shemagh);
+        .@ac2=any(OldTowel, SantaGlobe, RedStocking, LeatherBall, Doll, ZarkorScroll, ThetaBook, AshUrn, RubberDucky, DragonStar, BronzeQuiver, AstralCube, PlushMouboo, PlushMouboo, GraduationAlbum);
+        .@hat=any(TopHat, CaptainHat, SmileyCap, BowlerHat, DesertHat, PirateBandana, KnitHat, RightEyePatch, AntlersHat, BunnyEars, AxeHat, PaperBag, ShroomHat, AFKCap, BrimmedFeatherHat, CatEars, Earmuffs, CorsairHat, SailorHat, ChefHat, SkullMask, LeprechaunHat, PrsmHelmet, ImperialCrown, ClericCap);
+        .@ha2=any(DarkKnightHelmet, VikingHelmet, TerraniteMask, CenturionHelmet, ChemistHelmet, BullHelmet, DarkHelm, SamuraiHelmet, SamuraiHelmet);
+        .@che=any(RedknightArmor, AssassinChest, SaviorArmor, TerraniteArmor, GraduationRobe, GoldenWarlordPlate, RedknightArmor);
+        .@pan=any(JeansChaps, LeatherTrousers, AssassinPants, TerranitePants, WarlordPants, BromenalPants, ChainmailSkirt, AssassinPants, ChainmailSkirt, AssassinPants);
+        .@sho=any(DeepBlackBoots, HeliosBoots, WizardMoccasins, WarlordBoots, TerraniteBoots, AssassinBoots, WitchBoots, RedStockings, DeepBlackBoots, DeepBlackBoots);
+        .@nec=any(BarbarianAmulet, GoldenFourLeafAmulet, PlatinumFourLeafAmulet, BarbarianMasterAmulet, MoubooPendant, LifestonePendant, AlvasusPendant, ToothNecklace);
+        .@rin=any(GoldenPearlRing, GoldenBlackPearlRing);
+        .@glo=any(GoldenArmbands, WarlordGloves, AssassinGloves, TerraniteGloves, ManaGloves, SarabArmlet, LeatherGloves, MinerGloves);
+        .@shi=any(EnchantedHerbBag, RentCart, Barrel, MasterBola, PiouBola, AncientShield, BlueKnightShield, SteelShield, DragonShield, SnakeBola);
+        .@wpn=any(Setzer, Kitana, Lightsaber, BoneKnife, AncientSword, LongSword, RockKnife, DivineSword, CentaurSpear, Zambacutou, CursedScythe, Halberd, PynRifle, PynGatling, PynShotgun, PynRevolver, Dustynator, ChampionshipBow, BansheeBow, LeaderWand, ImmortalSword, LegendaryWand, ChampionshipBow, BansheeBow, LeaderWand, LegendaryWand);
+        .@bon=any(Pickaxe, Kanabo, ElficBow, Judgement, ThunderStaff, ReinbooWand, DarkPulsar, Skypiercer, IceGladius, RealBronzeGladius, PurpleBola, KidBola, SilkGloves, ClawPendant, Boots, LuffyxSummerShorts, UglyChristmasSweater, MinerTankTop, ContributorSweater, LinarianSoul, TuxSoul, DeliciousCookie, DarkEggshellHat, Wreath);
+        .@pet=any(PiouEgg, BhopEgg, MaggotCocoon, DoggyDog, CattyCat, BlackyCat, Ratte, ForestShroomEgg, FluffyEgg, DuckEgg, BatEgg, MoggunEgg, PinkieCrystal, DragonHorn, TamedSnakeEgg);
+        getitem .@acc, 1;
+        getitem .@ac2, 1;
+        getitem .@hat, 1;
+        getitem .@ha2, 1;
+        getitem .@che, 1;
+        getitem .@pan, 1;
+        getitem .@nec, 1;
+        getitem .@rin, 1;
+        getitem .@glo, 1;
+        getitem .@shi, 1;
+        getitem .@wpn, 1;
+        getitem .@bon, 1;
+        getitem .@pet, 1;
+        equip(.@acc);
+        equip(.@ac2);
+        equip(.@hat);
+        equip(.@ha2);
+        equip(.@che);
+        equip(.@pan);
+        equip(.@nec);
+        equip(.@rin);
+        equip(.@glo);
+        equip(.@shi);
+        equip(.@wpn);
+        Zeny+=rand2(40000);
+    }
+    adddefaultskills();
     sk_lvup(AL_DP);
     sk_lvup(AL_DP);
     sk_lvup(AL_DP);
@@ -228,7 +226,7 @@ L_FiresOfSteam:
     sk_lvup(any(TMW2_FROSTNOVA, TMW2_HOLYLIGHT, TMW2_LIGHTNING, TMW2_METEORSHOWER, TMW2_FIREBALL, TMW2_BEARSTRIKE, MC_MAMMONITE, SN_SHARPSHOOTING));
     sk_lvup(any(TMW2_NILFHEIM, TMW2_JUDGMENT, TMW2_TEMPEST, TMW2_GAIABREAK, TMW2_ARMAGEDDON, TMW2_ALLINONE, ASC_METEORASSAULT, AC_SHOWER, SN_WINDWALK));
     sk_lvup(any(TMW2_GDP_MAXPOWER, TMW2_GDP_SPREGEN));
-    getitem GuildCoin, rand2(500);
+    getitembound GuildCoin, rand2(500), 4;
     getitembound any(StrengthFruit, AgilityFruit, VitalityFruit, IntelligenceFruit, DexterityFruit, LuckFruit), 1, 4;
     getitembound any(StrengthFruit, AgilityFruit, VitalityFruit, IntelligenceFruit, DexterityFruit, LuckFruit), 1, 4;
     getitembound any(SacredBullet, EvilBullet), 400, 4;
@@ -237,9 +235,14 @@ L_FiresOfSteam:
     getitembound ScentGrenade, rand2(4), 4;
     getitembound InsuranceContract, 1, 4;
     getitembound Wurtzite, 6, 4;
+    getitembound MercCard_AndreiSakar, 1, 4;
     percentheal 100,100;
     LOCATION$ = "Tulim";
 	TUT_VAR=gettimetick(2);
+    #TUTORIAL_DONE=true;
+    #REG_DATE=gettimetick(2);
+    TUTORIAL=true;
+    MAGIC_LVL=7;
     savepoint "029-0", 202, 85;
     warp "029-0", 202, 85;
     close;