diff options
| author | Jesusaves <cpntb1@ymail.com> | 2022-10-23 23:43:53 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2022-10-23 23:43:53 -0300 |
| commit | c72bff04727cc001b6162f2886ad1952097d5ac1 (patch) | |
| tree | 20fdf05b22ab6b990757b13d374eaa9090b2b327 /npc | |
| parent | a7c45a192268da2601cef47a4cdba987ae2327ca (diff) | |
| download | serverdata-c72bff04727cc001b6162f2886ad1952097d5ac1.tar.gz serverdata-c72bff04727cc001b6162f2886ad1952097d5ac1.tar.bz2 serverdata-c72bff04727cc001b6162f2886ad1952097d5ac1.tar.xz serverdata-c72bff04727cc001b6162f2886ad1952097d5ac1.zip | |
Remove some spurious maps
Diffstat (limited to 'npc')
50 files changed, 128 insertions, 902 deletions
diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt index d2f0652..521f29e 100644 --- a/npc/000-0/_import.txt +++ b/npc/000-0/_import.txt @@ -1,4 +1,4 @@ -// Map 000-0: Ocean +// Map 000-0: Aethyr Central Crossroad // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-0/mapflags.txt", "npc/000-0/sailors.txt", diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index 65d06a7..024408f 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -1,282 +1,65 @@ // TMW2 Script -// Modified by Jesusalva - -// Evol scripts. -// Authors: -// 4144 -// Qwerty Dragon -// Reid -// Vasily_Makarov -// Jesusalva // Description: -// Starting script of Evol Online, modified for TMW2. -// Translation: -// FR Translated +// Main start NPC -000-0,23,19,0 script Sailors NPC_SAILORS,6,6,{ +000-0,23,19,0 script Lost Travelers NPC_SAILORS,6,6,{ OnTouch: - .@q=getq(General_Narrator); - if (.@q) + if (TUT_VAR) end; //checkclientversion; .@lang = requestlang(); if (.@lang >= 0 && .@lang <= MAX_LANG) Lang = .@lang; - showavatar 3; - if ($EVENT$ == "Steam") 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."); - mesc l("(Click next button to advance dialogs)"), 3; - next; - mesc l("What in the world is happening?! Where in Jesusalva's name are you?!"); - next; - if (getvaultid()) { - mesc l("Sometimes, you really wish you could visit new universes without having to pick some sort of role on it."); - next; - } - mesc l("Actually. Who are you again? A headache which doesn't want to pass strikes you."); - mesc l("You can hear creaking planks and a sail flapping in the storm. A ship?"); - mesc l("You hear shouting directed at you. Sailors from the ship?"); - next; - - showavatar NPC_ORC_MAN; - setcamnpc "Sailors", -64, -32; - mesn l("Orc Voice"); - mesq lg("Hey kid! Can you hear me?"); - next; - - showavatar NPC_SILVIO; - setcamnpc "Sailors", 0, -32; - mesn l("Human Voice"); - mesq lg("Hear you? How do you even know she can understand you?!", "Hear you? How do you even know he can understand you?!"); - next; - - showavatar NPC_TRITAN_MAN_SAILOR; - setcamnpc "Sailors", 144, -80; - mesn l("Tritan Voice"); - mesq l("We speak various languages on this world. Let's try gesturing!"); - mesq l("Hey, you on the dune! Can you hear us?!"); - next; - restorecam; - - asklanguage(LANG_ON_SEA); - showavatar NPC_SAILORS; - setcamnpc; - mes ""; - mesn; - mesq lg("Oh, she's still alive!", "Oh, he's still alive!"); - next; - showavatar NPC_TRITAN_MAN_SAILOR; - setcamnpc "Sailors", 144, -80; - mesq lg("This girl needs help, we need to rescue her!", "This boy needs help, we need to rescue him!"); - next; - mesn; - mesc l("This is a menu. You can click on the desired option and press \"Send\", and double-clicking should work, too."); - mes ""; - select - l("I don't need to be rescued. I'm enjoying myself here."), - l("Thanks... I guess..."), - l("(Don't respond)"); - mes ""; - if (@menu == 1) { - mesn l("Sailor"); - mesq l("What do you mean? Do you at least have a rowboat with you?!"); - next; - mesn l("Billy Bons"); - // Dying of thirst will set in waaaay sooner than dying of hunger. - mesq l("We can't let you die of thirst! That wouldn't be cool at all! And I'm very cool!"); - next; - } else if (@menu == 2) { - mes ""; // You don't need to thank us! - } else { - mesn l("Sailor"); - mesq lg("Oh noes! She fainted! Quick, rescue her!!", "Oh noes! He fainted! Quick, rescue him!!"); + // Standard Procedures + if (!getvaultid()) { + mesc l("This world is exclusive for Mirror Lake Users."); next; + kick(getcharid(3), 3); + end; } - restorecam; - - showavatar; - mesn "Narrator"; - mesc l("The sailors take you aboard their ship."); - mesc l("Click on the NPCs (Non-Player Characters) around you to continue the introduction."); - next; + // TODO: Check if you have a homeworld set - addtimer(20000,"Elmo#sailors::OnSlow"); - warp "000-0-0", 30, 36; + // Set your language (WIP?) + asklanguage(LANG_ON_SEA); - closedialog; - close; -L_FiresOfSteam: - dispbottom l("Welcome to Moubootaur Legends: ##1Fires of Steam##0"); - warp "000-0-1", 26, 28; - sleep2(25); - atcommand("@refresh"); - asklanguage(LANG_ON_SEA); - clear; - mesn "Narrator"; - mesc l("You wake up in the middle of the night. How did you got here? WERE YOU KIDNAPPED?"); - next; - mesn "Narrator"; - mesc l("Memory slowly returns to you as you start growing aware of your surroundings. That's right, you are on a ship."); - next; - mesn "Narrator"; - mesc l("Andrei Sakar, the legendary Hurnscald Hero, as well as a group of alliance members which include yourself, are heading to the continent of Kolev, where is said to be a legendary town which helped the humans from the second era to survive."); - next; - mesn "Narrator"; - mesc l("They were sending food and supplies to the Alliance, but in the past months, there was a deadly silence. Not a single sign of life came from there."); - next; - mesn "Narrator"; - mesc l("Hoping for the best, but prepared for the worst, you set off to the legendary continent of Kolev; Your destination: Artis."); - next; - clear; - mesc l("Moubootaur Legends presents..."), 3; + mesc l("Welcome to..."), 3; mes ""; - mesc b(l(" Fires of Steam ")), 1; - mesc l("- The Death of Andrei Sakar -"), 1; - mes ""; - mesc l("An event to prepare for the Steam Release"), 2; - mes ""; - next; + mesc b(l(" The Crossroads ")), 1; + mesc l("- The world between mana worlds -"), 1; mes ""; + mesc l("The only place where your home world is meaningless."), 2; mes ""; - mesn strcharinfo(0); - mesq l("We'll be arriving at Artis by the dawn, where Elora will be waiting for us. I can only hope, that the denizens are okay..."); + mesc l("This game follows the same gameplay rules as %s. Equipment real effects may differ from their description because this.", b(l("Moubootaur Legends"))); next; clear; GameRules(8 | 4); clear; closeclientdialog; -OnForceReset: - freeloop(true); - while (BaseLevel < 80) - getexp NextBaseExp, 100; - freeloop(false); - setq ShipQuests_Arpan, 5; - setq General_Narrator, 21; - consoleinfo "New account: %d (%s)", getcharid(3), getcharip(); - if (array_find($@IPBLIST$, getcharip()) >= 0) - #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; + + // No naked players + getitem CreasedShirt, 1; + getitem CreasedShorts, 1; + equip(CreasedShirt); + equip(CreasedShorts); + + // Basic setup + adddefaultskills; percentheal 100,100; - LOCATION$ = "Artis"; TUT_VAR=gettimetick(2); #TUTORIAL_DONE=true; #REG_DATE=gettimetick(2); - TUTORIAL=true; - CRAFTQUEST=true; - MPQUEST=true; - MAGIC_LVL=7; - savepoint "029-0", 202, 85; - if (!@forcereset) - warp "029-0", 202, 85; - close; -OnForceReset2: - logmes(sprintf("%s - Reset Forced by System Admin", getcharid(3))); - #TUTORIAL_DONE=false; - @forcereset=true; - goto OnForceReset; + // Final warp + warp "033-1", 122, 192; + savepoint "033-1", 122, 192; + close; OnInit: .sex = G_MALE; - bindatcmd "sakarfr", "Sailors::OnForceReset2", 100, 99, 1; end; } diff --git a/npc/000-1/exit.txt b/npc/000-1/exit.txt index aed9a8c..bf1ab08 100644 --- a/npc/000-1/exit.txt +++ b/npc/000-1/exit.txt @@ -9,6 +9,7 @@ OnTouch: OnTalk: OnTalkNearby: // At any time, if you can't leave Nard ship, you must go to nard ship + /* if (!getq(General_Narrator) && getq(ShipQuests_Julia) < 3) { warp "002-1@Candor", 53, 38; end; @@ -26,6 +27,8 @@ OnTalkNearby: if (getsavepoint(0) != "000-1") end; //savepoint "002-1", 53, 38; warp "002-1", 53, 38; + */ + warp "033-1", 122, 192; end; } diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt index 71cb54d..9a773d0 100644 --- a/npc/001-1/_import.txt +++ b/npc/001-1/_import.txt @@ -1,5 +1,6 @@ -// Map 001-1: Floating Island of Aeros +// Map 001-1: Porthos - Town of Portals // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-1/_warps.txt", "npc/001-1/bgmaster.txt", "npc/001-1/eventmaster.txt", "npc/001-1/mahul.txt", diff --git a/npc/001-1/_warps.txt b/npc/001-1/_warps.txt new file mode 100644 index 0000000..90b773c --- /dev/null +++ b/npc/001-1/_warps.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-1: Porthos - Town of Portals warps +001-1,189,94,0 warp #001-1_189_94 0,0,033-5,29,48 +001-1,167,89,0 warp #001-1_167_89 0,0,033-4,35,42 +001-1,172,101,0 warp #001-1_172_101 0,0,033-2,40,48 +001-1,72,190,0 warp #001-1_72_190 0,0,020-1,69,41 diff --git a/npc/001-2/_import.txt b/npc/001-2/_import.txt index d7c488a..151d535 100644 --- a/npc/001-2/_import.txt +++ b/npc/001-2/_import.txt @@ -1,3 +1,4 @@ // Map 001-2: Coliseum // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2/mapflags.txt", +"npc/001-2/treasure.txt", diff --git a/npc/007-1/treasure.txt b/npc/001-2/treasure.txt index 9c887ed..1624924 100644 --- a/npc/007-1/treasure.txt +++ b/npc/001-2/treasure.txt @@ -4,32 +4,12 @@ // Description: // Fishing and Treasure Box -007-1,155,163,0 script #fishing_00710 NPC_WATER_SPLASH,{ - - .@regen_time=200; - fishing(2, CommonCarp, RustyKnife, - ScorpionStinger, FatesPotion, GrassCarp); // begin or continue fishing (AlchemyBlueprintA, EquipmentBlueprintA) TODO - close; - -OnInit: - .sex = G_OTHER; - .distance = 4; - .cooldown = 200; - .bp_chance = 2; - end; -} - -/* -007-1,x,y,0 duplicate(#fishing_00710) #fishing_00711 NPC_WATER_SPLASH -007-1,x,y,0 duplicate(#fishing_00710) #fishing_00712 NPC_WATER_SPLASH -*/ - // Animation code by Evol Team // 4144, gumi, Hal9000, Reid // (Random) Treasure Chest // Authored by Jesusalva // Regenerates every 6 hours -007-1,0,0,0 script #chest_00710 NPC_CHEST,{ +011-1,0,0,0 script #chest_00710 NPC_CHEST,{ if (!.busy && !.empty) { TreasureBox(); diff --git a/npc/001-3/_import.txt b/npc/001-3/_import.txt index 3a2cb29..2118c10 100644 --- a/npc/001-3/_import.txt +++ b/npc/001-3/_import.txt @@ -1,4 +1,3 @@ -// Map 001-3: Saulc's Home +// Map 001-3: Dark Forest // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/001-3/_warps.txt", "npc/001-3/ctrl.txt", diff --git a/npc/001-3/_warps.txt b/npc/001-3/_warps.txt deleted file mode 100644 index 732ca93..0000000 --- a/npc/001-3/_warps.txt +++ /dev/null @@ -1,11 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-3: Saulc's Home warps -001-3,80,123,0 warp #001-3_80_123 0,0,001-3-1,24,61 -001-3,127,124,0 warp #001-3_127_124 0,0,001-3-1,117,61 -001-3,104,80,0 warp #001-3_104_80 3,0,001-3-1,45,126 -001-3,106,65,0 warp #001-3_106_65 0,0,001-3-1,116,126 -001-3,101,65,0 warp #001-3_101_65 0,0,001-3-1,97,126 -001-3,117,138,0 warp #001-3_117_138 0,0,000-1,22,22 -001-3,72,103,0 warp #001-3_72_103 0,0,001-3-1,24,30 -001-3,135,103,0 warp #001-3_135_103 0,0,001-3-1,117,30 -001-3,66,121,0 warp #001-3_66_121 0,2,004-2,50,61 diff --git a/npc/001-5/_import.txt b/npc/001-5/_import.txt index 5c94ec5..2c40d6b 100644 --- a/npc/001-5/_import.txt +++ b/npc/001-5/_import.txt @@ -1,5 +1,4 @@ -// Map 001-5: Contributor's Cave +// Map 001-5: Beasts Dungeon // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/001-5/_mobs.txt", "npc/001-5/_warps.txt", "npc/001-5/worker.txt", diff --git a/npc/001-5/_mobs.txt b/npc/001-5/_mobs.txt deleted file mode 100644 index 6a6fd7f..0000000 --- a/npc/001-5/_mobs.txt +++ /dev/null @@ -1,8 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-5: Contributor's Cave mobs -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-5: Contributor's Cave mobs -001-5,49,49,29,29 monster Blub 1008,2,35000,60000 -001-5,53,50,25,29 monster Snake 1122,1,35000,120000 -001-5,54,51,25,29 monster Night Scorpion 1077,1,35000,150000 -001-5,51,49,29,29 monster Stray Little Blub 1007,3,35000,180000 diff --git a/npc/001-5/_warps.txt b/npc/001-5/_warps.txt index 5d41810..0e2eac5 100644 --- a/npc/001-5/_warps.txt +++ b/npc/001-5/_warps.txt @@ -1,5 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-5: Contributor's Cave warps -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-5: Contributor's Cave warps -001-5,22,80,0 warp #001-5_22_80 0,0,000-1,22,22 +// Map 001-5: Beasts Dungeon warps +001-5,121,102,0 warp #001-5_121_102 0,0,032-2,103,112 diff --git a/npc/003-3/_import.txt b/npc/003-3/_import.txt index d371450..c934b91 100644 --- a/npc/003-3/_import.txt +++ b/npc/003-3/_import.txt @@ -1,4 +1,3 @@ // Map 003-3: Tulimshar Storage // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/003-3/_warps.txt", "npc/003-3/malindou.txt", diff --git a/npc/006-10/_import.txt b/npc/006-10/_import.txt index 69724d9..72ca523 100644 --- a/npc/006-10/_import.txt +++ b/npc/006-10/_import.txt @@ -1,6 +1,5 @@ // Map 006-10: Fefe's Crypt // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/006-10/006-10_blackbox.txt", "npc/006-10/_config.txt", "npc/006-10/_mobs.txt", "npc/006-10/_warps.txt", diff --git a/npc/006-4-1/_import.txt b/npc/006-4-1/_import.txt index 1fea850..e820466 100644 --- a/npc/006-4-1/_import.txt +++ b/npc/006-4-1/_import.txt @@ -1,6 +1,5 @@ // Map 006-4-1: Abandoned Building // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/006-4-1/_config.txt", -"npc/006-4-1/_mobs.txt", "npc/006-4-1/_warps.txt", "npc/006-4-1/painting.txt", diff --git a/npc/006-4-1/_mobs.txt b/npc/006-4-1/_mobs.txt deleted file mode 100644 index 76eaeba..0000000 --- a/npc/006-4-1/_mobs.txt +++ /dev/null @@ -1,6 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 006-4-1: Abandoned Building mobs -006-4-1,55,103,19,9 monster Mana Ghost 1068,6,75000,250000 -006-4-1,55,46,31,11 monster Green Slime Mother 1236,6,75000,25000 -006-4-1,56,101,28,9 monster Yellow Slime Mother 1239,4,75000,25000 -006-4-1,54,151,14,10 monster Red Slime Mother 1240,3,75000,25000 diff --git a/npc/006-4/_import.txt b/npc/006-4/_import.txt index 78369b5..3cc9fe9 100644 --- a/npc/006-4/_import.txt +++ b/npc/006-4/_import.txt @@ -1,6 +1,5 @@ // Map 006-4: Abandoned Island // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/006-4/_config.txt", -"npc/006-4/_mobs.txt", "npc/006-4/_warps.txt", "npc/006-4/soulstone.txt", diff --git a/npc/006-4/_mobs.txt b/npc/006-4/_mobs.txt deleted file mode 100644 index 793827f..0000000 --- a/npc/006-4/_mobs.txt +++ /dev/null @@ -1,18 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 006-4: Abandoned Island mobs -006-4,57,82,10,24 monster Mana Ghost 1068,5,75000,25000 -006-4,59,192,16,19 monster Mana Ghost 1068,9,75000,250000 -006-4,94,179,17,15 monster Mana Ghost 1068,9,75000,250000 -006-4,128,183,14,19 monster Mana Ghost 1068,9,75000,250000 -006-4,102,202,20,8 monster Mana Ghost 1068,9,75000,250000 -006-4,101,153,21,10 monster Mana Ghost 1068,9,75000,250000 -006-4,95,66,39,11 monster Green Dragon 1195,6,75000,105000 -006-4,31,251,17,12 monster Green Slime Mother 1236,1,75000,25000 -006-4,66,203,15,11 monster Green Slime Mother 1236,3,75000,25000 -006-4,139,154,14,9 monster Green Slime Mother 1236,1,75000,25000 -006-4,149,181,7,19 monster Green Slime Mother 1236,1,75000,25000 -006-4,60,149,11,12 monster Green Slime Mother 1236,1,75000,25000 -006-4,142,77,10,22 monster Blue Slime Mother 1237,1,75000,25000 -006-4,94,91,34,11 monster Copper Slime Mother 1238,1,75000,25000 -006-4,94,85,35,6 monster Green Dragon 1195,6,75000,105000 -006-4,55,97,12,9 monster White Slime Mother 1242,1,120000,25000 diff --git a/npc/006-4/_warps.txt b/npc/006-4/_warps.txt index cc25e7c..5761a5a 100644 --- a/npc/006-4/_warps.txt +++ b/npc/006-4/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-4: Abandoned Island warps 006-4,95,99,0 warp #006-4_95_99 1,0,006-4-1,58,60 -006-4,32,257,0 warp #006-4_32_257 0,0,006-3,54,36 +006-4,32,257,0 warp #006-4_32_257 0,0,033-1,72,191 006-4,71,83,0 warp #006-4_71_83 1,0,006-4-1,44,31 diff --git a/npc/006-5/_warps.txt b/npc/006-5/_warps.txt index b9d0bcf..37a4e29 100644 --- a/npc/006-5/_warps.txt +++ b/npc/006-5/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-5: Groata Grotto warps -006-5,49,54,0 warp #006-5_49_54 0,0,006-3,40,36 +006-5,49,54,0 warp #006-5_49_54 0,0,033-1,72,191 diff --git a/npc/011-1/_import.txt b/npc/011-1/_import.txt index 258abb6..613e580 100644 --- a/npc/011-1/_import.txt +++ b/npc/011-1/_import.txt @@ -1,6 +1,4 @@ // Map 011-1: Depleted Mana Stones Mine // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/011-1/_mobs.txt", "npc/011-1/_warps.txt", -"npc/011-1/manastone.txt", "npc/011-1/treasure.txt", diff --git a/npc/011-1/_mobs.txt b/npc/011-1/_mobs.txt deleted file mode 100644 index 6ab25f2..0000000 --- a/npc/011-1/_mobs.txt +++ /dev/null @@ -1,7 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 011-1: Depleted Mana Stones Mine mobs -011-1,99,100,79,79 monster Mana Ghost 1068,40,20000,20000 -011-1,98,101,79,79 monster Fire Goblin 1067,90,60000,60000 -011-1,100,99,79,79 monster Lava Slime 1097,30,60000,60000 -011-1,101,98,79,79 monster Red Slime 1092,100,60000,60000 -011-1,97,102,79,79 monster Mineral Bif 1058,20,60000,60000 diff --git a/npc/011-1/_warps.txt b/npc/011-1/_warps.txt index bba2aa0..489359e 100644 --- a/npc/011-1/_warps.txt +++ b/npc/011-1/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 011-1: Depleted Mana Stones Mine warps -011-1,177,178,0 warp #011-1_177_178 0,0,009-1,119,41 +011-1,177,178,0 warp #011-1_177_178 0,0,033-1,72,191 diff --git a/npc/011-1/manastone.txt b/npc/011-1/manastone.txt deleted file mode 100644 index 3d8df2b..0000000 --- a/npc/011-1/manastone.txt +++ /dev/null @@ -1,136 +0,0 @@ -// TMW2 Script -// Author: -// Jesusalva -// Description: -// The last Mana Stone in the whole world, which is not owned by the Magic Council -// or the Monster King. -// It actually hates (or rather, fears) everybody, and is not always willing to -// talk with people. May hide itself within the walls during these occasions. -// It may not hate some very specific things which are lore-related. -// -// Notes: During sieges, Monster King and Human Council apparitions, it may hide -// itself. -// -// Variables: -// $MANA_BINT => Base Intelligence for Mana Stone -// $MANA_BLVL => Base Level for Mana Stone -// $MANA_JLVL => Base Job Level for Mana Stone -// .int => Int Increment -// .lvl => Lvl Increment -// .jlvl => Jlv Increment - -011-1,0,0,0 script Mana Stone NPC_MANA_STONE,{ - function dearLord; - - if (BaseLevel < $MANA_BLVL) goto L_NotWorthy; - mesn; - mes l("The mighty Mana Stone does not reacts against you."); - mes l("Although this particular one seems to hate everyone and everything, it recognizes your strength."); - mes l("If you fell ready, perhaps you should touch it?"); - mes ""; - menu - l("Touch it!"), L_Level, - l("Take it!"), L_NotWorthy2, - l("Break it!"), L_NotWorthy2, - l("Leave it alone!"), -; - close; - - - -L_NotWorthy2: - if (is_gm()) movenpc .name$, 20+rand(150), 20+rand(150); - if (is_gm()) close; - npctalk3 l("You are not worthy!"); - percentheal -20, -50; - if (!MAGIC_LVL) - dispbottom l("I should train my intelligence, have full MP, and don't neglect even Job Level."); - end; - -L_Level: - // See functions/util.txt for *mstone() details - if (mstone(0)) goto L_LevelUp; - if (mstone(1)) goto L_LevelUp; - if (mstone(2)) goto L_LevelUp; - if (mstone(3)) goto L_LevelUp; - if (mstone(4)) goto L_LevelUp; - if (mstone(5)) goto L_LevelUp; - if (mstone(6)) goto L_LevelUp; - if (MAGIC_LVL >= 7) dearLord(); - if (MAGIC_LVL >= 7) npctalk3 l("You already got all power I could grant you!"); - if (is_gm()) percentheal -20, -50; - if (MAGIC_LVL >= 7 || is_gm()) close; - -L_NotWorthy: - if (readparam(Sp) != readparam(MaxSp)) - dispbottom l("I must have full MP to touch it... Which I don't."); - else - dispbottom l("I should train my intelligence, and level up, both my base as my Job Level."); - npctalk3 l("You are not worthy!"); - percentheal min(-10, -70+BaseLevel), min(-10, -100+BaseLevel); - end; - -L_LevelUp: - mes ""; - mes l("A great rush of mana flows though you."); - if (!MAGIC_LVL) mes l("Magic Power is granted to you, but you die from it."); - if (MAGIC_LVL) mes l("More Magic Power is granted to you, but you die from it."); - MAGIC_LVL = MAGIC_LVL+1; - sk_lvup(AL_DP); - // No penalty for death provoked by Mana Stone, see npc/001-8/hub.txt for more info - sc_start SC_CASH_DEATHPENALTY, 1000, 1; - /* - @deathpenalty_realvalue=readparam(BaseExp); - @deathpenalty_realvaljob=readparam(JobExp); - @deathpenalty_override=1; - */ - die(); - close; - -function dearLord { - if ($MANASTONE_WINNER$ == "") { - $MANASTONE_WINNER$=strcharinfo(0); - channelmes("#world", $MANASTONE_WINNER$+" is the first player to reach "+get_race()+"'s magic limit since the Monster King! %%N"); - announce "All hail ##B"+$MANASTONE_WINNER$+"##b, first to reach "+get_race()+"'s magic limit since the Monster King! %%N", bc_all|bc_npc; - getexp 0, 2000; - getitem SupremeGift, 1; - mesc l("CONGRATULATIONS! You are the first player to harness all power the Mana Stone would willingly give!"), 2; - mesc l("You just gained a Supreme Gift, and 2000 Job Exp for your bravery!"), 2; - next; - } - return; -} - -OnInit: - movenpc .name$, 20+rand(150), 20+rand(150); - .sex = G_OTHER; - .distance = 6; - end; - -OnClock0030: -OnClock0120: -OnClock0210: -OnClock0300: -OnClock0450: -OnClock0540: -OnClock0630: -OnClock0720: -OnClock0810: -OnClock0900: -OnClock1050: -OnClock1140: -OnClock1230: -OnClock1320: -OnClock1410: -OnClock1500: -OnClock1650: -OnClock1740: -OnClock1830: -OnClock1920: -OnClock2010: -OnClock2100: -OnClock2250: -OnClock2340: - npctalk "Those who are worthy, may get my magic. For the others, death awaits!"; - movenpc .name$, 20+rand(150), 20+rand(150); - end; -} diff --git a/npc/015-8/_import.txt b/npc/015-8/_import.txt index 27ea890..0258f7c 100644 --- a/npc/015-8/_import.txt +++ b/npc/015-8/_import.txt @@ -1,6 +1,5 @@ // Map 015-8: Ancient Hideout // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/015-8/015-8_blackbox.txt", "npc/015-8/_mobs.txt", "npc/015-8/config.txt", "npc/015-8/puzzle.txt", diff --git a/npc/017-1/_import.txt b/npc/017-1/_import.txt index 42925f9..7df9ce6 100644 --- a/npc/017-1/_import.txt +++ b/npc/017-1/_import.txt @@ -1,6 +1,5 @@ // Map 017-1: Land Of Fire Village // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/017-1/017-1_stranger_blackbox.txt", "npc/017-1/_mobs.txt", "npc/017-1/_warps.txt", "npc/017-1/boringnpc.txt", diff --git a/npc/017-2-2/_import.txt b/npc/017-2-2/_import.txt index 1f63289..9ce80e0 100644 --- a/npc/017-2-2/_import.txt +++ b/npc/017-2-2/_import.txt @@ -1,4 +1,3 @@ // Map 017-2-2: Skull Cave // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/017-2-2/_mobs.txt", "npc/017-2-2/_warps.txt", diff --git a/npc/017-2-2/_mobs.txt b/npc/017-2-2/_mobs.txt deleted file mode 100644 index d409717..0000000 --- a/npc/017-2-2/_mobs.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 017-2-2: Skull Cave mobs -017-2-2,70,57,16,20 monster Shadow Plant 1189,4,60000,10000 -017-2-2,70,55,14,20 monster Dark Lizard 1051,18,25000,25000 diff --git a/npc/017-2-2/_warps.txt b/npc/017-2-2/_warps.txt index 7ee8b20..90434b5 100644 --- a/npc/017-2-2/_warps.txt +++ b/npc/017-2-2/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 017-2-2: Skull Cave warps -017-2-2,71,78,0 warp #017-2-2_71_78 1,0,017-2-1,39,24 +017-2-2,71,78,0 warp #017-2-2_71_78 1,0,033-1,72,191 diff --git a/npc/018-2-1/mapflags.txt b/npc/018-2-1/mapflags.txt index e148e82..914bfeb 100644 --- a/npc/018-2-1/mapflags.txt +++ b/npc/018-2-1/mapflags.txt @@ -1,6 +1,6 @@ // The whole Heroes Hold but outside area is a MMO area. -018-2-2 mapflag zone MMO -018-2-3 mapflag zone MMO -018-2-4 mapflag zone MMO 018-2-5 mapflag zone MMO +018-2-6 mapflag zone MMO +018-2-7 mapflag zone MMO +018-2-8 mapflag zone MMO diff --git a/npc/018-2/_warps.txt b/npc/018-2/_warps.txt index d529700..0bad548 100644 --- a/npc/018-2/_warps.txt +++ b/npc/018-2/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 018-2: Heroes' Hold - Outside warps -018-2,63,106,0 warp #018-2_63_106 0,0,017-1,180,194 +018-2,63,106,0 warp #018-2_63_106 0,0,033-1,72,191 018-2,72,63,0 warp #018-2_72_63 3,0,018-2-1,26,32 diff --git a/npc/018-7-1/_import.txt b/npc/018-7-1/_import.txt index cefe635..c18bacb 100644 --- a/npc/018-7-1/_import.txt +++ b/npc/018-7-1/_import.txt @@ -1,6 +1,5 @@ // Map 018-7-1: Developers' Lair (Lilit Palace) // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/018-7-1/018-7-1_demure_blackbox.txt", "npc/018-7-1/_mobs.txt", "npc/018-7-1/_warps.txt", "npc/018-7-1/demure.txt", diff --git a/npc/023-4/_import.txt b/npc/023-4/_import.txt index ebd1020..22fe61c 100644 --- a/npc/023-4/_import.txt +++ b/npc/023-4/_import.txt @@ -1,6 +1,5 @@ // Map 023-4: Ice Caves // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/023-4/023-4_blackbox.txt", "npc/023-4/_mobs.txt", "npc/023-4/_warps.txt", "npc/023-4/traps.txt", diff --git a/npc/025-2-4/_import.txt b/npc/025-2-4/_import.txt index e9181f3..a012b10 100644 --- a/npc/025-2-4/_import.txt +++ b/npc/025-2-4/_import.txt @@ -1,6 +1,5 @@ // Map 025-2-4: Mana Tree Cave // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/025-2-4/025-2-4_aegis_blackbox.txt", "npc/025-2-4/_mobs.txt", "npc/025-2-4/_warps.txt", "npc/025-2-4/tree.txt", diff --git a/npc/031-1/_import.txt b/npc/031-1/_import.txt index 9de05ba..16f725f 100644 --- a/npc/031-1/_import.txt +++ b/npc/031-1/_import.txt @@ -1,4 +1,3 @@ // Map 031-1: Aethyr // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/031-1/_mobs.txt", "npc/031-1/_warps.txt", diff --git a/npc/031-1/_mobs.txt b/npc/031-1/_mobs.txt deleted file mode 100644 index 61c846d..0000000 --- a/npc/031-1/_mobs.txt +++ /dev/null @@ -1,8 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 031-1: Aethyr mobs -031-1,56,62,52,44 monster Pollet 1219,24,90000,30000 -031-1,68,82,43,23 monster Iced Fluffy 1041,13,60000,30000 -031-1,89,40,15,16 monster White Slime 1094,6,90000,30000 -031-1,24,59,10,44 monster Wind Fairy 1185,4,75000,30000 -031-1,56,48,29,23 monster Santa Slime 1096,7,30000,30000 -031-1,24,23,3,4 monster Whirly Bird 1232,1,300000,300000 diff --git a/npc/031-1/_warps.txt b/npc/031-1/_warps.txt index 88cef18..f58c587 100644 --- a/npc/031-1/_warps.txt +++ b/npc/031-1/_warps.txt @@ -1,7 +1,7 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 031-1: Aethyr warps 031-1,68,30,0 warp #031-1_68_30 0,0,031-0,127,46 -031-1,58,104,0 warp #031-1_58_104 0,0,023-4,24,21 +031-1,58,104,0 warp #031-1_58_104 0,0,033-1,105,149 031-1,25,25,0 warp #031-1_25_25 0,0,031-0,25,61 031-1,56,47,0 warp #031-1_56_47 0,0,031-7,56,51 031-1,84,58,0 warp #031-1_84_58 0,0,031-5,95,48 diff --git a/npc/033-1/_import.txt b/npc/033-1/_import.txt index 247d96f..90c62d6 100644 --- a/npc/033-1/_import.txt +++ b/npc/033-1/_import.txt @@ -1,3 +1,4 @@ // Map 033-1: Porthos - Town of Portals // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/033-1/_warps.txt", +"npc/033-1/misc.txt", diff --git a/npc/033-1/_warps.txt b/npc/033-1/_warps.txt index cd8747f..83bb3bc 100644 --- a/npc/033-1/_warps.txt +++ b/npc/033-1/_warps.txt @@ -3,4 +3,13 @@ 033-1,189,94,0 warp #033-1_189_94 0,0,033-5,29,48 033-1,167,89,0 warp #033-1_167_89 0,0,033-4,35,42 033-1,172,101,0 warp #033-1_172_101 0,0,033-2,40,48 -033-1,72,190,0 warp #033-1_72_190 0,0,020-1,69,41 +033-1,49,192,0 script #033-1_49_192 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 153,87; end; +} +033-1,153,86,0 script #033-1_153_86 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 49,193; end; +} diff --git a/npc/033-1/misc.txt b/npc/033-1/misc.txt new file mode 100644 index 0000000..50fc9de --- /dev/null +++ b/npc/033-1/misc.txt @@ -0,0 +1,38 @@ +// Moubootaur Legends Script +// Author: +// Jesusalva +// Description: +// Guild House + +033-1,134,79,0 script #GDoor NPC_NO_SPRITE,0,0,{ + end; +OnTouch: + if (getcharid(2) < 1) { + dispbottom l("You do not belong to a guild."); + end; + } + // Warp you to your guild house if exist. + // Build the instance otherwise. + + // Well, "checking if instance exist by mapname" is an illusion. + // So we try to build and if we fail, we warp the player to the instance. + .@ID=getcharid(2); + @MAP_NAME$="guild@"+str(.@ID); // Max 4 chars for map name + + .@INSTID = instance_create("guilds@a"+(.@ID), getcharid(2), IOT_GUILD); + + // Instance already exists - .@INSTID returns "-4" + if (.@INSTID == -4) { + warp @MAP_NAME$, any(34,35), 48; + end; + } + + .@instanceMapName$ = instance_attachmap("guilds", .@INSTID, 0, @MAP_NAME$); + + instance_set_timeout(0, 0, .@INSTID); + instance_init(.@INSTID); + warp @MAP_NAME$, any(34,35), 48; + end; + +} + diff --git a/npc/_import.txt b/npc/_import.txt index 1d7d82c..a1bfbd9 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,10 +1,7 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -@include "npc/000-0-0/_import.txt" -@include "npc/000-0-1/_import.txt" @include "npc/000-0/_import.txt" @include "npc/000-1/_import.txt" -@include "npc/001-1/_import.txt" @include "npc/001-10-1/_import.txt" @include "npc/001-10/_import.txt" @include "npc/001-11/_import.txt" @@ -15,285 +12,26 @@ @include "npc/001-13/_import.txt" @include "npc/001-14/_import.txt" @include "npc/001-2/_import.txt" -@include "npc/001-3-1/_import.txt" @include "npc/001-3/_import.txt" @include "npc/001-4/_import.txt" -@include "npc/001-5/_import.txt" -@include "npc/001-6/_import.txt" -@include "npc/001-7/_import.txt" @include "npc/001-8/_import.txt" @include "npc/001-9/_import.txt" -@include "npc/002-1/_import.txt" -@include "npc/002-2/_import.txt" -@include "npc/002-3/_import.txt" -@include "npc/002-4/_import.txt" -@include "npc/002-5/_import.txt" -@include "npc/003-0-1/_import.txt" -@include "npc/003-0-2/_import.txt" -@include "npc/003-0/_import.txt" -@include "npc/003-1-1/_import.txt" -@include "npc/003-1-2/_import.txt" -@include "npc/003-1-3/_import.txt" -@include "npc/003-1/_import.txt" -@include "npc/003-10/_import.txt" -@include "npc/003-13/_import.txt" -@include "npc/003-2-1/_import.txt" -@include "npc/003-2/_import.txt" @include "npc/003-3/_import.txt" -@include "npc/003-4-1/_import.txt" -@include "npc/003-4/_import.txt" -@include "npc/003-5/_import.txt" -@include "npc/003-6/_import.txt" -@include "npc/003-7/_import.txt" -@include "npc/003-8/_import.txt" -@include "npc/003-9-1/_import.txt" -@include "npc/003-9/_import.txt" -@include "npc/004-1/_import.txt" -@include "npc/004-2-1/_import.txt" -@include "npc/004-2-10/_import.txt" -@include "npc/004-2-11/_import.txt" -@include "npc/004-2-12/_import.txt" -@include "npc/004-2-2/_import.txt" -@include "npc/004-2-3/_import.txt" -@include "npc/004-2-4/_import.txt" -@include "npc/004-2-5/_import.txt" -@include "npc/004-2-6/_import.txt" -@include "npc/004-2-7/_import.txt" -@include "npc/004-2-8/_import.txt" -@include "npc/004-2-9/_import.txt" -@include "npc/004-2/_import.txt" -@include "npc/004-3-1/_import.txt" -@include "npc/004-3-2/_import.txt" -@include "npc/004-3-3/_import.txt" -@include "npc/004-3-4/_import.txt" -@include "npc/004-3-5/_import.txt" -@include "npc/004-3-6/_import.txt" -@include "npc/004-3/_import.txt" -@include "npc/005-1-1/_import.txt" -@include "npc/005-1/_import.txt" -@include "npc/005-2-1/_import.txt" -@include "npc/005-2/_import.txt" -@include "npc/005-3/_import.txt" -@include "npc/005-4/_import.txt" -@include "npc/005-5/_import.txt" -@include "npc/005-6/_import.txt" -@include "npc/005-7/_import.txt" -@include "npc/006-0/_import.txt" @include "npc/006-1/_import.txt" -@include "npc/006-10/_import.txt" -@include "npc/006-2-1/_import.txt" -@include "npc/006-2-2/_import.txt" -@include "npc/006-2-3/_import.txt" -@include "npc/006-2-4/_import.txt" -@include "npc/006-2-5/_import.txt" -@include "npc/006-2-6/_import.txt" -@include "npc/006-2/_import.txt" -@include "npc/006-3/_import.txt" @include "npc/006-4-1/_import.txt" @include "npc/006-4/_import.txt" @include "npc/006-5/_import.txt" -@include "npc/006-6/_import.txt" @include "npc/006-7/_import.txt" @include "npc/006-8/_import.txt" @include "npc/006-9/_import.txt" -@include "npc/007-1-1/_import.txt" -@include "npc/007-1-2/_import.txt" -@include "npc/007-1/_import.txt" -@include "npc/007-2/_import.txt" -@include "npc/008-0/_import.txt" -@include "npc/008-1/_import.txt" -@include "npc/008-2/_import.txt" -@include "npc/009-1/_import.txt" -@include "npc/009-2/_import.txt" -@include "npc/009-3/_import.txt" -@include "npc/009-4/_import.txt" -@include "npc/009-5/_import.txt" -@include "npc/009-6/_import.txt" -@include "npc/009-7/_import.txt" -@include "npc/010-1-1/_import.txt" -@include "npc/010-1-10/_import.txt" -@include "npc/010-1-11/_import.txt" -@include "npc/010-1-12/_import.txt" -@include "npc/010-1-2/_import.txt" -@include "npc/010-1-3/_import.txt" -@include "npc/010-1-4/_import.txt" -@include "npc/010-1-5/_import.txt" -@include "npc/010-1-6/_import.txt" -@include "npc/010-1-7/_import.txt" -@include "npc/010-1-8/_import.txt" -@include "npc/010-1-9/_import.txt" -@include "npc/010-1/_import.txt" -@include "npc/010-2-10/_import.txt" -@include "npc/010-2-11/_import.txt" -@include "npc/010-2-12/_import.txt" -@include "npc/010-2-13/_import.txt" -@include "npc/010-2-14/_import.txt" -@include "npc/010-2-15/_import.txt" -@include "npc/010-2-16/_import.txt" -@include "npc/010-2-2/_import.txt" -@include "npc/010-2-3/_import.txt" -@include "npc/010-2-4/_import.txt" -@include "npc/010-2-5/_import.txt" -@include "npc/010-2-6/_import.txt" -@include "npc/010-2-7/_import.txt" -@include "npc/010-2-8/_import.txt" -@include "npc/010-2-9/_import.txt" -@include "npc/010-2/_import.txt" -@include "npc/010-3/_import.txt" -@include "npc/010-4-1/_import.txt" -@include "npc/010-4-2/_import.txt" @include "npc/011-1/_import.txt" -@include "npc/011-2/_import.txt" -@include "npc/011-3/_import.txt" -@include "npc/012-1/_import.txt" -@include "npc/012-2/_import.txt" -@include "npc/012-3/_import.txt" -@include "npc/012-4/_import.txt" -@include "npc/012-5/_import.txt" -@include "npc/012-6/_import.txt" -@include "npc/012-7/_import.txt" -@include "npc/012-8/_import.txt" -@include "npc/013-1/_import.txt" -@include "npc/014-1/_import.txt" -@include "npc/014-2-1/_import.txt" -@include "npc/014-2-2/_import.txt" -@include "npc/014-2/_import.txt" -@include "npc/014-3/_import.txt" -@include "npc/014-4/_import.txt" -@include "npc/014-5-1/_import.txt" -@include "npc/014-5/_import.txt" -@include "npc/015-1/_import.txt" -@include "npc/015-2/_import.txt" -@include "npc/015-3-1/_import.txt" -@include "npc/015-3-2/_import.txt" -@include "npc/015-3-3/_import.txt" -@include "npc/015-3/_import.txt" -@include "npc/015-4/_import.txt" -@include "npc/015-5/_import.txt" -@include "npc/015-6/_import.txt" -@include "npc/015-7/_import.txt" -@include "npc/015-8-1/_import.txt" -@include "npc/015-8/_import.txt" -@include "npc/016-1/_import.txt" -@include "npc/016-6/_import.txt" -@include "npc/016-7/_import.txt" -@include "npc/017-0/_import.txt" -@include "npc/017-1/_import.txt" -@include "npc/017-10/_import.txt" -@include "npc/017-2-1/_import.txt" @include "npc/017-2-2/_import.txt" -@include "npc/017-2/_import.txt" -@include "npc/017-3/_import.txt" -@include "npc/017-4/_import.txt" -@include "npc/017-5/_import.txt" -@include "npc/017-6/_import.txt" -@include "npc/017-7/_import.txt" -@include "npc/017-8/_import.txt" -@include "npc/018-1-1/_import.txt" -@include "npc/018-1/_import.txt" @include "npc/018-2-1/_import.txt" -@include "npc/018-2-2/_import.txt" -@include "npc/018-2-3/_import.txt" -@include "npc/018-2-4/_import.txt" @include "npc/018-2-5/_import.txt" @include "npc/018-2-6/_import.txt" @include "npc/018-2-7/_import.txt" @include "npc/018-2-8/_import.txt" @include "npc/018-2/_import.txt" -@include "npc/018-3/_import.txt" -@include "npc/018-4-1/_import.txt" -@include "npc/018-4-2/_import.txt" -@include "npc/018-4/_import.txt" -@include "npc/018-5-0/_import.txt" -@include "npc/018-5-1/_import.txt" -@include "npc/018-5-2/_import.txt" -@include "npc/018-5-3/_import.txt" -@include "npc/018-5-4/_import.txt" -@include "npc/018-5-5/_import.txt" -@include "npc/018-5-boss/_import.txt" -@include "npc/018-5/_import.txt" -@include "npc/018-6-0/_import.txt" -@include "npc/018-6-1/_import.txt" -@include "npc/018-6-2/_import.txt" -@include "npc/018-6-3/_import.txt" -@include "npc/018-7-1/_import.txt" -@include "npc/018-7/_import.txt" -@include "npc/019-1-1/_import.txt" -@include "npc/019-1/_import.txt" -@include "npc/019-2/_import.txt" -@include "npc/019-3/_import.txt" -@include "npc/019-4-1/_import.txt" -@include "npc/019-4/_import.txt" -@include "npc/019-5-1/_import.txt" -@include "npc/019-5-2/_import.txt" -@include "npc/019-5-3/_import.txt" -@include "npc/019-5/_import.txt" -@include "npc/019-6/_import.txt" -@include "npc/020-1/_import.txt" -@include "npc/020-2/_import.txt" -@include "npc/020-3/_import.txt" -@include "npc/020-4/_import.txt" -@include "npc/020-5/_import.txt" -@include "npc/020-6/_import.txt" -@include "npc/020-7-1/_import.txt" -@include "npc/020-7-2/_import.txt" -@include "npc/020-7/_import.txt" -@include "npc/021-0/_import.txt" -@include "npc/021-1/_import.txt" -@include "npc/021-2/_import.txt" -@include "npc/021-3/_import.txt" -@include "npc/021-4/_import.txt" -@include "npc/022-1/_import.txt" -@include "npc/023-1/_import.txt" -@include "npc/023-2/_import.txt" -@include "npc/023-3-1/_import.txt" -@include "npc/023-3-2/_import.txt" -@include "npc/023-3/_import.txt" -@include "npc/023-4/_import.txt" -@include "npc/024-1/_import.txt" -@include "npc/024-10/_import.txt" -@include "npc/024-11/_import.txt" -@include "npc/024-12/_import.txt" -@include "npc/024-13/_import.txt" -@include "npc/024-14/_import.txt" -@include "npc/024-15/_import.txt" -@include "npc/024-16/_import.txt" -@include "npc/024-2/_import.txt" -@include "npc/024-3/_import.txt" -@include "npc/024-4/_import.txt" -@include "npc/024-5/_import.txt" -@include "npc/024-6/_import.txt" -@include "npc/024-7/_import.txt" -@include "npc/024-8/_import.txt" -@include "npc/024-9/_import.txt" -@include "npc/025-1/_import.txt" -@include "npc/025-2-1/_import.txt" -@include "npc/025-2-2/_import.txt" -@include "npc/025-2-3/_import.txt" -@include "npc/025-2-4/_import.txt" -@include "npc/025-2/_import.txt" -@include "npc/025-3/_import.txt" -@include "npc/026-0/_import.txt" -@include "npc/026-1/_import.txt" -@include "npc/026-2/_import.txt" -@include "npc/027-0/_import.txt" -@include "npc/027-1/_import.txt" -@include "npc/027-2/_import.txt" -@include "npc/027-3/_import.txt" -@include "npc/027-4/_import.txt" -@include "npc/027-5/_import.txt" -@include "npc/027-6/_import.txt" -@include "npc/027-7/_import.txt" -@include "npc/029-0/_import.txt" -@include "npc/029-1/_import.txt" -@include "npc/029-2/_import.txt" -@include "npc/029-3/_import.txt" -@include "npc/029-4/_import.txt" -@include "npc/029-5/_import.txt" -@include "npc/029-6/_import.txt" -@include "npc/029-7/_import.txt" -@include "npc/029-8/_import.txt" -@include "npc/029-9/_import.txt" @include "npc/030-01/_import.txt" @include "npc/030-02/_import.txt" @include "npc/030-03/_import.txt" @@ -379,37 +117,15 @@ @include "npc/031-7/_import.txt" @include "npc/031-8/_import.txt" @include "npc/031-9/_import.txt" -@include "npc/032-1/_import.txt" -@include "npc/032-2/_import.txt" -@include "npc/032-3/_import.txt" -@include "npc/032-4/_import.txt" -@include "npc/032-5/_import.txt" @include "npc/033-1/_import.txt" @include "npc/033-2/_import.txt" @include "npc/033-3/_import.txt" @include "npc/033-4/_import.txt" @include "npc/033-5/_import.txt" -@include "npc/034-1/_import.txt" -@include "npc/034-2/_import.txt" -@include "npc/034-3/_import.txt" -@include "npc/034-4/_import.txt" -@include "npc/042-0/_import.txt" -@include "npc/042-1/_import.txt" -@include "npc/042-10/_import.txt" -@include "npc/042-11/_import.txt" -@include "npc/042-2/_import.txt" -@include "npc/042-3/_import.txt" -@include "npc/042-4/_import.txt" -@include "npc/042-5/_import.txt" -@include "npc/042-6/_import.txt" -@include "npc/042-7/_import.txt" -@include "npc/042-8/_import.txt" -@include "npc/042-9/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" +@include "npc/fermi/_import.txt" @include "npc/guilds/_import.txt" @include "npc/sec_pri/_import.txt" -@include "npc/soren-2/_import.txt" -@include "npc/soren/_import.txt" @include "npc/test/_import.txt" @include "npc/testbg/_import.txt" diff --git a/npc/botcheck/_import.txt b/npc/botcheck/_import.txt index e6f4365..5f53d23 100644 --- a/npc/botcheck/_import.txt +++ b/npc/botcheck/_import.txt @@ -1,3 +1,2 @@ // Map botcheck: Botcheck Area // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/botcheck/botcheck_blackbox.txt", diff --git a/npc/003-3/_warps.txt b/npc/fermi/_import.txt index 3f24581..9c2eafa 100644 --- a/npc/003-3/_warps.txt +++ b/npc/fermi/_import.txt @@ -1,3 +1,3 @@ +// Map fermi: Three Fermi Land // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 003-3: Tulimshar Storage warps -003-3,39,41,0 warp #003-3_39_41 0,0,003-1,56,100 +"npc/fermi/_warps.txt", diff --git a/npc/fermi/_warps.txt b/npc/fermi/_warps.txt new file mode 100644 index 0000000..76c2131 --- /dev/null +++ b/npc/fermi/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map fermi: Three Fermi Land warps +fermi,29,19,0 warp #fermi_29_19 0,0,033-1,105,149 +fermi,21,19,0 warp #fermi_21_19 0,0,033-1,105,149 diff --git a/npc/functions/dungeon.txt b/npc/functions/dungeon.txt index 641d00d..8fa119b 100644 --- a/npc/functions/dungeon.txt +++ b/npc/functions/dungeon.txt @@ -9,9 +9,9 @@ // Main initialization OnInit: - setarray .heatmap$, "007-2"; + setarray .heatmap$, "011-1"; setarray .cursemap$, "006-4", "006-4-1", "025-1"; - setarray .sickmap$, "029-5"; + setarray .sickmap$, "018-2"; setarray .bleedmap$, "006-9"; end; @@ -152,11 +152,11 @@ OnBleed: ////////////////////////////// -007-2 mapflag nosave 007-1,99,189 -006-4 mapflag nosave 006-3,54,36 -006-4-1 mapflag nosave 006-3,54,36 -029-5 mapflag nosave 029-4,21,97 -006-9 mapflag nosave 006-6,46,27 +//007-2 mapflag nosave 033-1,72,191 +006-4 mapflag nosave 033-1,72,191 +006-4-1 mapflag nosave 033-1,72,191 +//029-5 mapflag nosave 033-1,72,191 +006-9 mapflag nosave 033-1,72,191 diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt index dc41128..048e649 100644 --- a/npc/functions/seasons.txt +++ b/npc/functions/seasons.txt @@ -95,15 +95,9 @@ function script sChristmas { addmonsterdrop(AzulSlime, XmasGift, 2*.@m); } - // Change maps for Christmas Season (Specially LoF maps) - addmapmask "003-1", MASK_CHRISTMAS; - addmapmask "005-1", MASK_CHRISTMAS; - addmapmask "009-1", MASK_CHRISTMAS; - addmapmask "012-1", MASK_CHRISTMAS; - addmapmask "017-2", MASK_CHRISTMAS; - addmapmask "017-2-1", MASK_CHRISTMAS; - addmapmask "017-3", MASK_CHRISTMAS; - addmapmask "020-2", MASK_CHRISTMAS; + // Change maps for Christmas Season + //addmapmask "031-1", MASK_CHRISTMAS; + //addmapmask "033-1", MASK_CHRISTMAS; // Enable event set $EVENT$, "Christmas"; @@ -297,9 +291,6 @@ OnSummerEnd: end; OnAutumnStart: - // Fancy trees - addmapmask "012-1", MASK_AUTUMN; - // Autumn's Drop addmonsterdrop(FafiDragon, PumpkandySeed, 10000); addmonsterdrop(BlackMamba, PumpkandySeed, 8000); @@ -327,7 +318,6 @@ OnAutumnEnd: } - removemapmask "012-1", MASK_AUTUMN; delmonsterdrop(FafiDragon, PumpkandySeed); delmonsterdrop(Mouboo, PumpkandySeed); delmonsterdrop(AlphaMouboo, PumpkandySeed); diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index 5c369e1..711497d 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -67,47 +67,20 @@ OnInit: .wcore = htnew; // Deserts - htput(.wcore, "003-1", "desert"); - htput(.wcore, "004-1", "desert"); - htput(.wcore, "004-2", "desert"); - htput(.wcore, "009-1", "desert"); - htput(.wcore, "010-1", "desert"); - htput(.wcore, "010-2", "desert"); - htput(.wcore, "032-1", "desert"); + //htput(.wcore, "032-1", "desert"); // Woodlands htput(.wcore, "001-4", "woodland"); htput(.wcore, "001-11", "woodland"); htput(.wcore, "001-12", "woodland"); - htput(.wcore, "005-1", "woodland"); - htput(.wcore, "012-1", "woodland"); - htput(.wcore, "014-1", "woodland"); - htput(.wcore, "014-2", "woodland"); - htput(.wcore, "014-3", "woodland"); - htput(.wcore, "014-4", "woodland"); - htput(.wcore, "014-5", "woodland"); - htput(.wcore, "017-1", "woodland"); - htput(.wcore, "018-1", "woodland"); htput(.wcore, "018-2", "woodland"); - htput(.wcore, "018-4", "woodland"); - htput(.wcore, "018-5", "woodland"); - htput(.wcore, "027-1", "woodland"); // Icelands - htput(.wcore, "001-7", "iceland"); - htput(.wcore, "019-1", "iceland"); - htput(.wcore, "019-2", "iceland"); - htput(.wcore, "019-3", "iceland"); - htput(.wcore, "019-4", "iceland"); - htput(.wcore, "019-5", "iceland"); - htput(.wcore, "019-6", "iceland"); - htput(.wcore, "020-1", "iceland"); - htput(.wcore, "022-1", "iceland"); - htput(.wcore, "024-1", "iceland"); htput(.wcore, "031-1", "iceland"); + htput(.wcore, "033-1", "iceland"); // Special - htput(.wcore, "011-3", "special"); + //htput(.wcore, "011-3", "special"); consoleinfo "[Weather.sys] Total Maps = " + htsize(.wcore); diff --git a/npc/guilds/_warps.txt b/npc/guilds/_warps.txt index 6e8c8f6..ad79521 100644 --- a/npc/guilds/_warps.txt +++ b/npc/guilds/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map guilds: Guild Hall warps -guilds,35,49,0 warp #guilds_35_49 1,0,017-1,57,34 +guilds,35,49,0 warp #guilds_35_49 1,0,033-1,134,80 diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt index ed1f464..07da98a 100644 --- a/npc/items/shovel.txt +++ b/npc/items/shovel.txt @@ -289,16 +289,7 @@ OnInit: .PlayerTiredTime = 25; // You can bury & dig on all mines - AddDigRect("007-1", 20, 20, 180, 190); AddDigRect("011-1", 20, 20, 180, 180); - AddDigRect("015-1", 20, 20, 180, 180); - AddDigRect("032-2", 20, 20, 180, 180); - - // Aeros can be used too (for events) - AddDigRect("001-1", 20, 20, 342, 158); - - // LoF Areas - AddDigRect("018-1", 20, 20, 80, 80); OnHour00: // Clear random treasure @@ -308,48 +299,6 @@ OnHour00: deletearray $@WBT_Random_x; deletearray $@WBT_Random_y; - - // Scatter Treasure. - // There are 25600 possible cells, and about 60% of them are collisions. - // As we don't prevent treasure from falling on collision, it is pretty high. - // If two treasures fall on same place, the previous treasure will be ignored. - // Theoretical chance of uncovering a treasure on an attempt is 0.12% to 0.70% - // 2019-05-27: Doubled ammount of treasures. New rates should be 0.24% ~ 1.40% - shovel_scatter("007-1", 20, 20, 180, 180, rand(60,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - CursedAmmoBox,ThornAmmoBox,SacredBullet); - shovel_scatter("011-1", 20, 20, 180, 180, rand(60,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - CursedAmmoBox,ThornAmmoBox,SacredBullet); - shovel_scatter("015-1", 20, 20, 180, 180, rand(60,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - CursedAmmoBox,ThornAmmoBox,SacredBullet); - - // Extra burried treasure (25~65 over 3600 tiles: aprox. 0.70% to 1.80%) - // New Rate: 1.40% ~ 3.60% since 2019-05-27 - shovel_scatter("018-1", 20, 20, 80, 80, rand(50,130), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - CursedAmmoBox,ThornAmmoBox,SacredBullet); - - // Aeros can't be forgotten, but only during Thanksgiving - if ($EVENT$ == "Thanksgiving") { - shovel_scatter("001-1", 171, 20, 340, 160, rand(160,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst); - shovel_scatter("001-1", 20, 20, 140, 140, rand(160,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst); - } end; } @@ -451,11 +400,7 @@ function script shovel_randomtreasure { } function script shovel_genrandtreasure { - if (getq(LoFQuest_EPISODE) >= 16) - .@m$=any("007-1", "011-1", "015-1", "018-1", "032-2", - "007-1", "011-1", "015-1", "018-1"); - else - .@m$=any("007-1", "011-1", "015-1", "018-1"); + .@m$=any("011-1"); // Dangerous do { .@x=rand2(20, getmapinfo(MAPINFO_SIZE_X, .@m$)-20); @@ -521,11 +466,7 @@ function script shovel_randomdungeon { } function script shovel_genranddungeon { - if (getq(LoFQuest_EPISODE) >= 16) - .@m$=any("007-1", "011-1", "015-1", "018-1", "032-2", - "007-1", "011-1", "015-1", "018-1"); - else - .@m$=any("007-1", "011-1", "015-1", "018-1"); + .@m$=any("011-1"); // Dangerous do { .@x=rand2(20, getmapinfo(MAPINFO_SIZE_X, .@m$)-20); diff --git a/npc/scripts.conf b/npc/scripts.conf index e51c7e4..71d2f60 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -143,14 +143,10 @@ // These are to be proccessed later "npc/functions/clientversion.txt", -"npc/functions/estate2.txt", "npc/functions/hub.txt", -"npc/functions/mkbot.txt", -"npc/functions/gmbot.txt", "npc/functions/instances.txt", "npc/functions/captcha.txt", "npc/functions/dungeon.txt", -"npc/config/easteregg_blackbox.txt", // Maps specific scripts @include "npc/_import.txt" |