Remove 2021 code from after the datacenter caught fire (for less grep'ing)

1 files changed, 9 insertions, 92 deletions

diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 65d06a73b..86f215bb5 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -25,7 +25,7 @@ OnTouch:
     if (.@lang >= 0 && .@lang <= MAX_LANG) Lang = .@lang;
 
     showavatar 3;
-    if ($EVENT$ == "Steam") goto L_FiresOfSteam;
+    if ($EVENT$ == "Steam" && false) goto L_FiresOfSteam;
 
     mesn "Narrator";
     mesc l("You open your eyes. The remants of the salt water in your eyes is not particularly helping you see.");
@@ -154,7 +154,7 @@ L_FiresOfSteam:
     closeclientdialog;
 OnForceReset:
     freeloop(true);
-    while (BaseLevel < 80)
+    while (BaseLevel < 60)
         getexp NextBaseExp, 100;
     freeloop(false);
     setq ShipQuests_Arpan, 5;
@@ -164,97 +164,7 @@ OnForceReset:
         #TUTORIAL_DONE=true;
     else
         array_push($@IPBLIST$, getcharip());
-    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, 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(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, MysticWand, ChampionshipBow, BansheeBow, LeaderWand, MysticWand);
-        .@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 .@sho, 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(10000, 60000);
-    }
     adddefaultskills();
-    sk_lvup(AL_DP);
-    sk_lvup(AL_DP);
-    sk_lvup(AL_DP);
-    sk_lvup(AL_DP);
-    sk_lvup(AL_DP);
-    sk_lvup(AL_DP);
-    sk_lvup(AL_DP);
-    sk_lvup(TMW2_TRANSMIGRATION);
-    sk_lvup(AM_REST);
-    sk_lvup(AM_RESURRECTHOMUN);
-    sk_lvup(AM_CALLHOMUN);
-    sk_lvup(TMW2_CRAFT);
-    sk_lvup(TMW2_CRAFT);
-    sk_lvup(TMW2_CRAFT);
-    sk_lvup(TMW2_CRAFT);
-    sk_lvup(TMW2_CRAFT);
-    sk_lvup(TMW2_ANCIENTLANGUAGES);
-    sk_lvup(TMW2_MANABOMB);
-    sk_lvup(TMW2_GROUNDSTRIKE);
-    sk_lvup(TMW2_NAPALMBEAT);
-    sk_lvup(TMW2_ARROWSHOWER);
-    sk_lvup(any(ALL_INCCARRY, TF_STEAL, MC_VENDING, MC_DISCOUNT, MC_OVERCHARGE));
-    sk_lvup(any(AC_OWL, SA_DRAGONOLOGY, TMW2_SAGE, CR_TRUST, SM_PROVOKE, ALL_FULL_THROTTLE, SA_FREECAST, TF_BACKSLIDING, NV_TRICKDEAD, MG_FIREWALL, SO_FIREWALK, GC_DARKILLUSION));
-    sk_lvup(any(AC_OWL, SA_DRAGONOLOGY, TMW2_SAGE, CR_TRUST, SM_PROVOKE, ALL_FULL_THROTTLE, SA_FREECAST, TF_BACKSLIDING, NV_TRICKDEAD, MG_FIREWALL, SO_FIREWALK, GC_DARKILLUSION));
-    sk_lvup(any(TMW2_KALMURK, TMW2_DRAGOKIN, TMW2_LIMERIZER, TMW2_HALHISS));
-    sk_lvup(any(TMW2_KALWULF, TMW2_FAIRYKINGDOM, TMW2_FROZENHEART, TMW2_STONEHEART));
-    sk_lvup(any(TMW2_KALBOO, TMW2_KALSPIKE, TMW2_CUTEHEART, TMW2_PLANTKINGDOM, TMW2_FAIRYEMPIRE));
-    sk_lvup(any(TMW2_FIRSTAID, TMW2_HEALING, TMW2_MAGNUSHEAL, EVOL_AREA_PROVOKE));
-    sk_lvup(any(TMW2_FIRSTAID, TMW2_HEALING, TMW2_MAGNUSHEAL, EVOL_AREA_PROVOKE));
-    sk_lvup(any(TMW2_FROSTDIVER, TMW2_NAPALMBEAT, TMW2_MAGICSTRIKE, TMW2_METEORSTRIKE, TMW2_FIREARROW, TMW2_BRAWLING, TMW2_FALKONSTRIKE, TMW2_CHARGEDARROW));
-    sk_lvup(any(TMW2_FROSTDIVER, TMW2_NAPALMBEAT, TMW2_MAGICSTRIKE, TMW2_METEORSTRIKE, TMW2_FIREARROW, TMW2_BRAWLING, TMW2_FALKONSTRIKE, TMW2_CHARGEDARROW));
-    sk_lvup(any(TMW2_FROSTDIVER, TMW2_NAPALMBEAT, TMW2_MAGICSTRIKE, TMW2_METEORSTRIKE, TMW2_FIREARROW, TMW2_BRAWLING, TMW2_FALKONSTRIKE, TMW2_CHARGEDARROW));
-    sk_lvup(any(TMW2_FROSTNOVA, TMW2_HOLYLIGHT, TMW2_LIGHTNINGBOLT, TMW2_METEORSHOWER, TMW2_FIREBALL, TMW2_BEARSTRIKE, TMW2_SUPREMEATTACK, SN_SHARPSHOOTING));
-    sk_lvup(any(TMW2_FROSTNOVA, TMW2_HOLYLIGHT, TMW2_LIGHTNINGBOLT, TMW2_METEORSHOWER, TMW2_FIREBALL, TMW2_BEARSTRIKE, TMW2_SUPREMEATTACK, SN_SHARPSHOOTING));
-    sk_lvup(any(TMW2_NILFHEIM, TMW2_JUDGMENT, TMW2_TEMPEST, TMW2_GAIABREAK, TMW2_ARMAGEDDON, TMW2_ALLINONE, TMW2_GROUNDSTRIKE, TMW2_ARROWSHOWER, SN_WINDWALK));
-    sk_lvup(any(TMW2_GDP_MAXPOWER, TMW2_GDP_SPREGEN));
-    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;
-    getitembound any(ThornArrow, PoisonArrow, CursedArrow), 400, 4;
-    getitembound DeathPenalty, rand2(18), 4;
-    getitembound ScentGrenade, rand2(4), 4;
-    getitembound InsuranceContract, 1, 4;
-    getitembound Wurtzite, 6, 4;
-    getitembound MercCard_AndreiSakar, 1, 4;
-    getitembound RecipeBook, 1, 1;
-    getitembound Bread, 10, 4;
     percentheal 100,100;
     LOCATION$ = "Artis";
 	TUT_VAR=gettimetick(2);
@@ -264,6 +174,13 @@ OnForceReset:
     CRAFTQUEST=true;
     MPQUEST=true;
     MAGIC_LVL=7;
+    sk_lvup(AL_DP);
+    sk_lvup(AL_DP);
+    sk_lvup(AL_DP);
+    sk_lvup(AL_DP);
+    sk_lvup(AL_DP);
+    sk_lvup(AL_DP);
+    sk_lvup(AL_DP);
     savepoint "029-0", 202, 85;
     if (!@forcereset)
         warp "029-0", 202, 85;