diff --git a/MobBookUpdate/build/classes/.netbeans_automatic_build b/MobBookUpdate/build/classes/.netbeans_automatic_build new file mode 100644 index 0000000000..e69de29bb2 diff --git a/MobBookUpdate/build/classes/.netbeans_update_resources b/MobBookUpdate/build/classes/.netbeans_update_resources new file mode 100644 index 0000000000..e69de29bb2 diff --git a/MobBookUpdate/build/classes/mobbookupdate/MobBookUpdate.class b/MobBookUpdate/build/classes/mobbookupdate/MobBookUpdate.class index 838ae80ead..45dc15e916 100644 Binary files a/MobBookUpdate/build/classes/mobbookupdate/MobBookUpdate.class and b/MobBookUpdate/build/classes/mobbookupdate/MobBookUpdate.class differ diff --git a/MobBookUpdate/lib/MonsterBook_updated.img.xml b/MobBookUpdate/lib/MonsterBook_updated.img.xml index b3207248ce..559ad9277b 100644 --- a/MobBookUpdate/lib/MonsterBook_updated.img.xml +++ b/MobBookUpdate/lib/MonsterBook_updated.img.xml @@ -1268,11 +1268,12 @@ - - - - - + + + + + + @@ -6152,12 +6153,13 @@ - - - - - - + + + + + + + @@ -6185,14 +6187,15 @@ - - - - - - - - + + + + + + + + + @@ -11724,21 +11727,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/build/built-jar.properties b/build/built-jar.properties index 855c79c01b..2adb918f9f 100644 --- a/build/built-jar.properties +++ b/build/built-jar.properties @@ -1,4 +1,4 @@ -#Wed, 12 Jul 2017 02:19:32 -0300 +#Fri, 14 Jul 2017 20:30:46 -0300 C\:\\Nexon\\MapleSolaxia\\MapleSolaxiaV2= diff --git a/build/classes/client/MapleCharacter$1.class b/build/classes/client/MapleCharacter$1.class index 6f7d5ada4c..0505eb84cf 100644 Binary files a/build/classes/client/MapleCharacter$1.class and b/build/classes/client/MapleCharacter$1.class differ diff --git a/build/classes/client/MapleCharacter$10.class b/build/classes/client/MapleCharacter$10.class index 19bb5cb170..10d9dcaa08 100644 Binary files a/build/classes/client/MapleCharacter$10.class and b/build/classes/client/MapleCharacter$10.class differ diff --git a/build/classes/client/MapleCharacter$11.class b/build/classes/client/MapleCharacter$11.class index 50331945ac..af4aa3a79e 100644 Binary files a/build/classes/client/MapleCharacter$11.class and b/build/classes/client/MapleCharacter$11.class differ diff --git a/build/classes/client/MapleCharacter$12.class b/build/classes/client/MapleCharacter$12.class index f5c792b466..8b58c1dc5a 100644 Binary files a/build/classes/client/MapleCharacter$12.class and b/build/classes/client/MapleCharacter$12.class differ diff --git a/build/classes/client/MapleCharacter$13.class b/build/classes/client/MapleCharacter$13.class index 61acfb3c0d..cf93b81839 100644 Binary files a/build/classes/client/MapleCharacter$13.class and b/build/classes/client/MapleCharacter$13.class differ diff --git a/build/classes/client/MapleCharacter$14.class b/build/classes/client/MapleCharacter$14.class index 825c0cffdd..10397fa014 100644 Binary files a/build/classes/client/MapleCharacter$14.class and b/build/classes/client/MapleCharacter$14.class differ diff --git a/build/classes/client/MapleCharacter$15.class b/build/classes/client/MapleCharacter$15.class index 057b996d6f..f4f5ff2226 100644 Binary files a/build/classes/client/MapleCharacter$15.class and b/build/classes/client/MapleCharacter$15.class differ diff --git a/build/classes/client/MapleCharacter$16.class b/build/classes/client/MapleCharacter$16.class index ca55b3696d..0209201d5c 100644 Binary files a/build/classes/client/MapleCharacter$16.class and b/build/classes/client/MapleCharacter$16.class differ diff --git a/build/classes/client/MapleCharacter$17.class b/build/classes/client/MapleCharacter$17.class index 39befa9c84..b6567ae405 100644 Binary files a/build/classes/client/MapleCharacter$17.class and b/build/classes/client/MapleCharacter$17.class differ diff --git a/build/classes/client/MapleCharacter$18.class b/build/classes/client/MapleCharacter$18.class index 33d4c63a18..7a42d4725b 100644 Binary files a/build/classes/client/MapleCharacter$18.class and b/build/classes/client/MapleCharacter$18.class differ diff --git a/build/classes/client/MapleCharacter$19.class b/build/classes/client/MapleCharacter$19.class index 0c47dc9b44..d0806ddda6 100644 Binary files a/build/classes/client/MapleCharacter$19.class and b/build/classes/client/MapleCharacter$19.class differ diff --git a/build/classes/client/MapleCharacter$2.class b/build/classes/client/MapleCharacter$2.class index 3f87a304c2..db810ee408 100644 Binary files a/build/classes/client/MapleCharacter$2.class and b/build/classes/client/MapleCharacter$2.class differ diff --git a/build/classes/client/MapleCharacter$3.class b/build/classes/client/MapleCharacter$3.class index 3a4da799e2..9600770849 100644 Binary files a/build/classes/client/MapleCharacter$3.class and b/build/classes/client/MapleCharacter$3.class differ diff --git a/build/classes/client/MapleCharacter$4.class b/build/classes/client/MapleCharacter$4.class index d181e52e75..c2887c186a 100644 Binary files a/build/classes/client/MapleCharacter$4.class and b/build/classes/client/MapleCharacter$4.class differ diff --git a/build/classes/client/MapleCharacter$5.class b/build/classes/client/MapleCharacter$5.class index c850876aed..6f0f062a6e 100644 Binary files a/build/classes/client/MapleCharacter$5.class and b/build/classes/client/MapleCharacter$5.class differ diff --git a/build/classes/client/MapleCharacter$6.class b/build/classes/client/MapleCharacter$6.class index 44c477beb9..d93fafaeba 100644 Binary files a/build/classes/client/MapleCharacter$6.class and b/build/classes/client/MapleCharacter$6.class differ diff --git a/build/classes/client/MapleCharacter$7.class b/build/classes/client/MapleCharacter$7.class index be2953d211..ad52d7a26c 100644 Binary files a/build/classes/client/MapleCharacter$7.class and b/build/classes/client/MapleCharacter$7.class differ diff --git a/build/classes/client/MapleCharacter$8.class b/build/classes/client/MapleCharacter$8.class index 99d970f250..f9c44ddd8f 100644 Binary files a/build/classes/client/MapleCharacter$8.class and b/build/classes/client/MapleCharacter$8.class differ diff --git a/build/classes/client/MapleCharacter$9.class b/build/classes/client/MapleCharacter$9.class index 3e0725f005..ac54f970b6 100644 Binary files a/build/classes/client/MapleCharacter$9.class and b/build/classes/client/MapleCharacter$9.class differ diff --git a/build/classes/client/MapleCharacter$CancelCooldownAction.class b/build/classes/client/MapleCharacter$CancelCooldownAction.class index d162d51733..42d625d2bd 100644 Binary files a/build/classes/client/MapleCharacter$CancelCooldownAction.class and b/build/classes/client/MapleCharacter$CancelCooldownAction.class differ diff --git a/build/classes/client/MapleCharacter$FameStatus.class b/build/classes/client/MapleCharacter$FameStatus.class index d5b0a4ea20..053bbb8a6c 100644 Binary files a/build/classes/client/MapleCharacter$FameStatus.class and b/build/classes/client/MapleCharacter$FameStatus.class differ diff --git a/build/classes/client/MapleCharacter$MapleBuffStatValueHolder.class b/build/classes/client/MapleCharacter$MapleBuffStatValueHolder.class index cc36e663a2..57823446a1 100644 Binary files a/build/classes/client/MapleCharacter$MapleBuffStatValueHolder.class and b/build/classes/client/MapleCharacter$MapleBuffStatValueHolder.class differ diff --git a/build/classes/client/MapleCharacter$MapleCoolDownValueHolder.class b/build/classes/client/MapleCharacter$MapleCoolDownValueHolder.class index feba4f7fca..fad21f871d 100644 Binary files a/build/classes/client/MapleCharacter$MapleCoolDownValueHolder.class and b/build/classes/client/MapleCharacter$MapleCoolDownValueHolder.class differ diff --git a/build/classes/client/MapleCharacter$SkillEntry.class b/build/classes/client/MapleCharacter$SkillEntry.class index 05d32cd5ee..26db7907ce 100644 Binary files a/build/classes/client/MapleCharacter$SkillEntry.class and b/build/classes/client/MapleCharacter$SkillEntry.class differ diff --git a/build/classes/client/MapleCharacter.class b/build/classes/client/MapleCharacter.class index 4aa71e3700..cc1fdb292c 100644 Binary files a/build/classes/client/MapleCharacter.class and b/build/classes/client/MapleCharacter.class differ diff --git a/build/classes/client/command/Commands$1.class b/build/classes/client/command/Commands$1.class index 691006eb8e..666de64143 100644 Binary files a/build/classes/client/command/Commands$1.class and b/build/classes/client/command/Commands$1.class differ diff --git a/build/classes/client/command/Commands.class b/build/classes/client/command/Commands.class index 101db7ae1e..c11e79ce4a 100644 Binary files a/build/classes/client/command/Commands.class and b/build/classes/client/command/Commands.class differ diff --git a/build/classes/scripting/AbstractPlayerInteraction.class b/build/classes/scripting/AbstractPlayerInteraction.class index 7e8adfe927..256e7256f2 100644 Binary files a/build/classes/scripting/AbstractPlayerInteraction.class and b/build/classes/scripting/AbstractPlayerInteraction.class differ diff --git a/build/classes/scripting/event/EventInstanceManager$3.class b/build/classes/scripting/event/EventInstanceManager$3.class index 5647b0478b..20466f0ca5 100644 Binary files a/build/classes/scripting/event/EventInstanceManager$3.class and b/build/classes/scripting/event/EventInstanceManager$3.class differ diff --git a/build/classes/scripting/event/EventInstanceManager.class b/build/classes/scripting/event/EventInstanceManager.class index 415c801347..10b989fe1a 100644 Binary files a/build/classes/scripting/event/EventInstanceManager.class and b/build/classes/scripting/event/EventInstanceManager.class differ diff --git a/build/classes/scripting/reactor/ReactorActionManager$1.class b/build/classes/scripting/reactor/ReactorActionManager$1.class new file mode 100644 index 0000000000..40e4f65fcf Binary files /dev/null and b/build/classes/scripting/reactor/ReactorActionManager$1.class differ diff --git a/build/classes/scripting/reactor/ReactorActionManager$2.class b/build/classes/scripting/reactor/ReactorActionManager$2.class new file mode 100644 index 0000000000..f024c6e970 Binary files /dev/null and b/build/classes/scripting/reactor/ReactorActionManager$2.class differ diff --git a/build/classes/scripting/reactor/ReactorActionManager.class b/build/classes/scripting/reactor/ReactorActionManager.class index d428a60617..fbedb443bc 100644 Binary files a/build/classes/scripting/reactor/ReactorActionManager.class and b/build/classes/scripting/reactor/ReactorActionManager.class differ diff --git a/build/classes/scripting/reactor/ReactorScriptManager.class b/build/classes/scripting/reactor/ReactorScriptManager.class index 0ca9a21885..d02660fd8c 100644 Binary files a/build/classes/scripting/reactor/ReactorScriptManager.class and b/build/classes/scripting/reactor/ReactorScriptManager.class differ diff --git a/build/classes/server/MapleItemInformationProvider$1.class b/build/classes/server/MapleItemInformationProvider$1.class index c1720a4b6f..def2e8a947 100644 Binary files a/build/classes/server/MapleItemInformationProvider$1.class and b/build/classes/server/MapleItemInformationProvider$1.class differ diff --git a/build/classes/server/MapleItemInformationProvider$RewardItem.class b/build/classes/server/MapleItemInformationProvider$RewardItem.class index b1484b85c7..9d55b0c8ca 100644 Binary files a/build/classes/server/MapleItemInformationProvider$RewardItem.class and b/build/classes/server/MapleItemInformationProvider$RewardItem.class differ diff --git a/build/classes/server/MapleItemInformationProvider$scriptedItem.class b/build/classes/server/MapleItemInformationProvider$scriptedItem.class index f8ca9b5ab5..19b4aed669 100644 Binary files a/build/classes/server/MapleItemInformationProvider$scriptedItem.class and b/build/classes/server/MapleItemInformationProvider$scriptedItem.class differ diff --git a/build/classes/server/MapleItemInformationProvider.class b/build/classes/server/MapleItemInformationProvider.class index 975fd3e446..ea4745fcd9 100644 Binary files a/build/classes/server/MapleItemInformationProvider.class and b/build/classes/server/MapleItemInformationProvider.class differ diff --git a/build/classes/server/MapleStatEffect.class b/build/classes/server/MapleStatEffect.class index 3a8b5077df..4c852e6c2f 100644 Binary files a/build/classes/server/MapleStatEffect.class and b/build/classes/server/MapleStatEffect.class differ diff --git a/build/classes/server/expeditions/MapleExpedition$1.class b/build/classes/server/expeditions/MapleExpedition$1.class index 15a5660996..7764991837 100644 Binary files a/build/classes/server/expeditions/MapleExpedition$1.class and b/build/classes/server/expeditions/MapleExpedition$1.class differ diff --git a/build/classes/server/expeditions/MapleExpedition.class b/build/classes/server/expeditions/MapleExpedition.class index 55dbc178fd..2cb4ca5e37 100644 Binary files a/build/classes/server/expeditions/MapleExpedition.class and b/build/classes/server/expeditions/MapleExpedition.class differ diff --git a/build/classes/server/maps/MapleMap$27.class b/build/classes/server/maps/MapleMap$27.class index 9ff6326bad..a1f3dbd8c9 100644 Binary files a/build/classes/server/maps/MapleMap$27.class and b/build/classes/server/maps/MapleMap$27.class differ diff --git a/build/classes/server/maps/MapleMap$28$1.class b/build/classes/server/maps/MapleMap$28$1.class index f61bd29250..84be300174 100644 Binary files a/build/classes/server/maps/MapleMap$28$1.class and b/build/classes/server/maps/MapleMap$28$1.class differ diff --git a/build/classes/server/maps/MapleMap$28.class b/build/classes/server/maps/MapleMap$28.class index ae36c43763..16124c73eb 100644 Binary files a/build/classes/server/maps/MapleMap$28.class and b/build/classes/server/maps/MapleMap$28.class differ diff --git a/build/classes/server/maps/MapleMap$29.class b/build/classes/server/maps/MapleMap$29.class index 9ce46a2721..68bbbcaf24 100644 Binary files a/build/classes/server/maps/MapleMap$29.class and b/build/classes/server/maps/MapleMap$29.class differ diff --git a/build/classes/server/maps/MapleMap$ActivateItemReactor$1.class b/build/classes/server/maps/MapleMap$ActivateItemReactor$1.class index ff10373e81..63f1525495 100644 Binary files a/build/classes/server/maps/MapleMap$ActivateItemReactor$1.class and b/build/classes/server/maps/MapleMap$ActivateItemReactor$1.class differ diff --git a/build/classes/server/maps/MapleMap$ActivateItemReactor.class b/build/classes/server/maps/MapleMap$ActivateItemReactor.class index 081bfd7086..d54ec89ea1 100644 Binary files a/build/classes/server/maps/MapleMap$ActivateItemReactor.class and b/build/classes/server/maps/MapleMap$ActivateItemReactor.class differ diff --git a/build/classes/server/maps/MapleMap$ExpireMapItemJob.class b/build/classes/server/maps/MapleMap$ExpireMapItemJob.class index 0f6cc3b924..54096ed509 100644 Binary files a/build/classes/server/maps/MapleMap$ExpireMapItemJob.class and b/build/classes/server/maps/MapleMap$ExpireMapItemJob.class differ diff --git a/build/classes/server/maps/MapleMap.class b/build/classes/server/maps/MapleMap.class index 393a0493ef..1e7f873e91 100644 Binary files a/build/classes/server/maps/MapleMap.class and b/build/classes/server/maps/MapleMap.class differ diff --git a/build/classes/server/maps/MapleMiniDungeon.class b/build/classes/server/maps/MapleMiniDungeon.class index 9c0c975bd7..59a90e4c87 100644 Binary files a/build/classes/server/maps/MapleMiniDungeon.class and b/build/classes/server/maps/MapleMiniDungeon.class differ diff --git a/build/classes/server/quest/actions/ItemAction$ItemData.class b/build/classes/server/quest/actions/ItemAction$ItemData.class index eeed57fcb4..bbef8dd355 100644 Binary files a/build/classes/server/quest/actions/ItemAction$ItemData.class and b/build/classes/server/quest/actions/ItemAction$ItemData.class differ diff --git a/build/classes/server/quest/actions/ItemAction.class b/build/classes/server/quest/actions/ItemAction.class index ac918006d8..9754437172 100644 Binary files a/build/classes/server/quest/actions/ItemAction.class and b/build/classes/server/quest/actions/ItemAction.class differ diff --git a/dist/MapleSolaxia.jar b/dist/MapleSolaxia.jar index 5d26d10c73..c339772c35 100644 Binary files a/dist/MapleSolaxia.jar and b/dist/MapleSolaxia.jar differ diff --git a/feature_list.txt b/feature_list.txt index 72187675cf..e81bdcd398 100644 --- a/feature_list.txt +++ b/feature_list.txt @@ -10,9 +10,11 @@ Feature list: PQs: * HPQ/KPQ/LPQ/LMPQ/OPQ/EllinPQ/PiratePQ 100%. * CWKPQ as Expedition-based event 100%. +* Expeditions: Scarga 100%. * GuildPQ 100% + Guild queue with multi-lobby systems available. * Brand-new PQ: Boss Rush PQ 100%. * BalrogPQ semi-functional. +* Capt. Latanica remade as an event (parties can now fight the boss). Quests: * Doll house quest 100%. @@ -39,7 +41,8 @@ Server potentials: * Player level rates. * Gain fame by quests. * Every monsterbook card is now droppable by overworld mobs. -* Added Boss HP Bar for dozens of bosses (needs provided custom wz); +* Monsterbook displays drop data info conformant with the underlying DB (needs custom wz). See more on the MobBookUpdate feature. +* Added Boss HP Bar for dozens of bosses (needs provided custom wz). * Custom jail system (needs provided custom wz). * Delete Character 100% (requires ENABLE_PIC activated). diff --git a/mychanges_ptbr.txt b/mychanges_ptbr.txt index 40900dbcf7..5957ce62f8 100644 --- a/mychanges_ptbr.txt +++ b/mychanges_ptbr.txt @@ -365,4 +365,12 @@ Abertas novas quests para a regi Codificados novos NPCs para a regiใo de Masteria. Adicionado drop data para mobs na Pendergast Mansion. Corrigido Mystic Doors podendo ser lan็adas em declives, potencialmente mal-colocando players em mapas-alvo. -Corrigido mount equipado por player de nivel baixo potencialmente crashando o client. \ No newline at end of file +Corrigido mount equipado por player de nivel baixo potencialmente crashando o client. + +12 - 14 Julho 2017, +Corrigido quests onde player pode escolher recompensa nใo recompensando corretamente. +Corrigido mapas em CBD/Singapore fazendo jogador "cair" do mapa. +Adicionado no sql lojas de NPCs de Malaysia. +Adicionado minidungeon "ByeBye station" (Malaysia). +Codificada expedi็ใo Scarlion/Targa. +Corrigido exploit com mini-dungeons (toda party, independente de localiza็ใo atual, movida para dentro da MD). \ No newline at end of file diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 9c4ee12962..9f8dd3d7bb 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,21 +3,43 @@ - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/RecvOpcode.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/1032102.js - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/MapleServerHandler.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleDoor.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/2091005.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/expeditions/MapleExpeditionType.java file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/MapleStatEffect.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/PacketProcessor.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/server/channel/handlers/DoorHandler.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/constants/ServerConstants.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/provider/MapleDataTool.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleDoorObject.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/event/ScargaBattle.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/scripting/AbstractPlayerInteraction.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/event/KerningPQ.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/portal/captinsg00.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/event/GuildQuest.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/event/CWKPQ.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/9270033.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/scripting/event/EventInstanceManager.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/9201113.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/2091005_old.js file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleMap.java file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/client/MapleCharacter.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/server/channel/handlers/CharInfoRequestHandler.java - file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/MapleItemInformationProvider.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/reactor/5511001.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/event/PiratePQ.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/scripting/event/EventManager.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/scripting/reactor/ReactorActionManager.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/server/channel/Channel.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/9270047.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/expeditions/MapleExpedition.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/reactor/5511000.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleReactor.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/2133004.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/portal/MD_high.js file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/tools/MaplePacketCreator.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/life/MapleMonster.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/TimerManager.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/scripting/reactor/ReactorScriptManager.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/event/HenesysPQ.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/portal/MD_drakeroom.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/event/BossRushPQ.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/scripting/npc/NPCConversationManager.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/9020001.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/event/LatanicaBattle.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/client/MapleClient.java diff --git a/scripts/NPC Base.js b/scripts/NPC Base.js index 4255527eef..5d62b852e9 100644 --- a/scripts/NPC Base.js +++ b/scripts/NPC Base.js @@ -27,19 +27,26 @@ var status; function start() { - status = -1; - action(1, 0, 0); + status = -1; + action(1, 0, 0); } function action(mode, type, selection) { - if (mode < 0) - cm.dispose(); - else { - if (mode == 1) - status++; - else - status--; - if (status == 0 && mode == 1) { - } - } + if (mode == -1) { + cm.dispose(); + } else { + if (mode == 0 && status == 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + if(status == 0) { + cm.sendOk("Sample text."); + cm.dispose(); + } + } } \ No newline at end of file diff --git a/scripts/event/BossRushPQ.js b/scripts/event/BossRushPQ.js index b4c83d0cdb..39bdf6cf5f 100644 --- a/scripts/event/BossRushPQ.js +++ b/scripts/event/BossRushPQ.js @@ -5,7 +5,7 @@ var isPq = true; var minPlayers = 1, maxPlayers = 6; -var minLevel = 1, maxLevel = 200; +var minLevel = 1, maxLevel = 255; var entryMap = 970030100; var exitMap = 970030000; var recruitMap = 970030000; diff --git a/scripts/event/GuildQuest.js b/scripts/event/GuildQuest.js index 7c1c2ef6bb..70e0360191 100644 --- a/scripts/event/GuildQuest.js +++ b/scripts/event/GuildQuest.js @@ -26,7 +26,7 @@ var isPq = true; var minPlayers = 1, maxPlayers = 30; -var minLevel = 1, maxLevel = 200; +var minLevel = 1, maxLevel = 255; var entryMap = 990000000; var exitMap = 990001100; var recruitMap = 101030104; diff --git a/scripts/event/HenesysPQ.js b/scripts/event/HenesysPQ.js index c49068f6d3..382b1beff9 100644 --- a/scripts/event/HenesysPQ.js +++ b/scripts/event/HenesysPQ.js @@ -5,7 +5,7 @@ var isPq = true; var minPlayers = 3, maxPlayers = 6; -var minLevel = 10, maxLevel = 200; +var minLevel = 10, maxLevel = 255; var entryMap = 910010000; var exitMap = 910010300; var recruitMap = 100000200; diff --git a/scripts/event/LatanicaBattle.js b/scripts/event/LatanicaBattle.js new file mode 100644 index 0000000000..b2346be44c --- /dev/null +++ b/scripts/event/LatanicaBattle.js @@ -0,0 +1,208 @@ +/** + * @author: Ronan + * @event: Vs Latanica +*/ + +var isPq = true; +var minPlayers = 1, maxPlayers = 6; +var minLevel = 1, maxLevel = 255; +var entryMap = 541010100; +var exitMap = 541010110; +var recruitMap = 541010060; +var clearMap = 541010110; + +var minMapId = 541010100; +var maxMapId = 541010100; + +var eventTime = 10; // 10 minutes + +var lobbyRange = [0, 0]; + +function init() { + setEventRequirements(); +} + +function setLobbyRange() { + return lobbyRange; +} + +function setEventRequirements() { + var reqStr = ""; + + reqStr += "\r\n Number of players: "; + if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; + else reqStr += minPlayers; + + reqStr += "\r\n Level range: "; + if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; + else reqStr += minLevel; + + reqStr += "\r\n Time limit: "; + reqStr += eventTime + " minutes"; + + em.setProperty("party", reqStr); +} + +function setEventExclusives(eim) { + var itemSet = []; + eim.setExclusiveItems(itemSet); +} + +function setEventRewards(eim) { + var itemSet, itemQty, evLevel, expStages; + + evLevel = 1; //Rewards at clear PQ + itemSet = []; + itemQty = []; + eim.setEventRewards(evLevel, itemSet, itemQty); + + expStages = []; //bonus exp given on CLEAR stage signal + eim.setEventClearStageExp(expStages); +} + +function getEligibleParty(party) { //selects, from the given party, the team that is allowed to attempt this event + var eligible = []; + var hasLeader = false; + + if(party.size() > 0) { + var partyList = party.toArray(); + + for(var i = 0; i < party.size(); i++) { + var ch = partyList[i]; + + if(ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { + if(ch.isLeader()) hasLeader = true; + eligible.push(ch); + } + } + } + + if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; + return eligible; +} + +function setup(level, lobbyid) { + var eim = em.newInstance("Latanica" + lobbyid); + eim.setProperty("level", level); + eim.setProperty("boss", "0"); + + eim.getInstanceMap(541010100).resetPQ(level); + + respawnStages(eim); + eim.startEventTimer(eventTime * 60000); + setEventRewards(eim); + setEventExclusives(eim); + return eim; +} + +function afterSetup(eim) {} + +function respawnStages(eim) {} + +function playerEntry(eim, player) { + var map = eim.getMapInstance(entryMap); + player.changeMap(map, map.getPortal(0)); +} + +function scheduledTimeout(eim) { + end(eim); +} + +function playerUnregistered(eim, player) {} + +function playerExit(eim, player) { + eim.unregisterPlayer(player); + player.changeMap(exitMap, 0); +} + +function changedMap(eim, player, mapid) { + if (mapid < minMapId || mapid > maxMapId) { + if (eim.isEventTeamLackingNow(true, minPlayers, player)) { + eim.unregisterPlayer(player); + end(eim); + } + else + eim.unregisterPlayer(player); + } +} + +function changedLeader(eim, leader) { + var mapid = leader.getMapId(); + if (!eim.isEventCleared() && (mapid < minMapId || mapid > maxMapId)) { + end(eim); + } +} + +function playerDead(eim, player) {} + +function playerRevive(eim, player) { // player presses ok on the death pop up. + if (eim.isEventTeamLackingNow(true, minPlayers, player)) { + eim.unregisterPlayer(player); + end(eim); + } + else + eim.unregisterPlayer(player); +} + +function playerDisconnected(eim, player) { + if (eim.isEventTeamLackingNow(true, minPlayers, player)) { + eim.unregisterPlayer(player); + end(eim); + } + else + eim.unregisterPlayer(player); +} + +function leftParty(eim, player) { + if (eim.isEventTeamLackingNow(false, minPlayers, player)) { + eim.unregisterPlayer(player); + end(eim); + } + else + eim.unregisterPlayer(player); +} + +function disbandParty(eim) { + end(eim); +} + +function monsterValue(eim, mobId) { + return 1; +} + +function end(eim) { + var party = eim.getPlayers(); + + for (var i = 0; i < party.size(); i++) { + playerExit(eim, party.get(i)); + } + eim.dispose(); +} + +function giveRandomEventReward(eim, player) { + eim.giveEventReward(player); +} + +function clearPQ(eim) { + eim.stopEventTimer(); + eim.setEventCleared(); +} + +function isLatanica(mob) { + var mobid = mob.getId(); + return mobid == 9420513; +} + +function monsterKilled(mob, eim) { + if(isLatanica(mob)) { + eim.showClearEffect(); + eim.clearPQ(); + } +} + +function allMonstersDead(eim) {} + +function cancelSchedule() {} + +function dispose(eim) {} + diff --git a/scripts/event/PiratePQ.js b/scripts/event/PiratePQ.js index 043f353638..2304b9012b 100644 --- a/scripts/event/PiratePQ.js +++ b/scripts/event/PiratePQ.js @@ -257,8 +257,13 @@ function clearPQ(eim) { eim.warpEventTeam(925100600); } +function isLordPirate(mob) { + var mobid = mob.getId(); + return (mobid == 9300105) || (mobid == 9300106) || (mobid == 9300107) || (mobid == 9300119); +} + function monsterKilled(mob, eim) { - if(mob.isBoss()) { // lord pirate defeated, spawn the little fella! + if(isLordPirate(mob)) { // lord pirate defeated, spawn the little fella! mob.getMap().broadcastStringMessage(5, "As Lord Pirate dies, Wu Yang is released!"); eim.spawnNpc(2094001, new java.awt.Point(777, 140), mob.getMap()); } diff --git a/scripts/event/ScargaBattle.js b/scripts/event/ScargaBattle.js index e351695e69..ecb5f00600 100644 --- a/scripts/event/ScargaBattle.js +++ b/scripts/event/ScargaBattle.js @@ -1,163 +1,188 @@ -/* - * This file is part of the OdinMS Maple Story Server - Copyright (C) 2008 Patrick Huy - Matthias Butz - Jan Christian Meyer +/** + * @author: Ronan + * @event: Scarga Battle +*/ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License version 3 - as published by the Free Software Foundation. You may not use, modify - or distribute this program under any other version of the - GNU Affero General Public License. +var isPq = true; +var minPlayers = 6, maxPlayers = 30; +var minLevel = 70, maxLevel = 255; +var entryMap = 551030200; +var exitMap = 551030100; +var recruitMap = 551030100; +var clearMap = 551030100; - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. +var minMapId = 551030200; +var maxMapId = 551030200; - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - */ +var eventTime = 60; // 60 minutes for boss stg -/* - * @Author SharpAceX(Alan) - * Scarga Battle - */ - -var exitMap; -var battleMap; -var minPlayers = 1; -var fightTime = 60; +var lobbyRange = [0, 0]; function init() { - em.setProperty("shuffleReactors","false"); - exitMap = em.getChannelServer().getMapFactory().getMap(551030100); - battleMap = em.getChannelServer().getMapFactory().getMap(551030200); + setEventRequirements(); } -function setup() { - var eim = em.newInstance("ScargaBattle_" + em.getProperty("channel")); - var timer = 1000 * 60 * fightTime; - eim.setProperty("summoned", "false"); - em.schedule("timeOut", eim, timer); - eim.startEventTimer(timer); - return eim; +function setLobbyRange() { + return lobbyRange; +} + +function setEventRequirements() { + var reqStr = ""; + + reqStr += "\r\n Number of players: "; + if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; + else reqStr += minPlayers; + + reqStr += "\r\n Level range: "; + if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; + else reqStr += minLevel; + + reqStr += "\r\n Time limit: "; + reqStr += eventTime + " minutes"; + + em.setProperty("party", reqStr); +} + +function setEventExclusives(eim) { + var itemSet = []; + eim.setExclusiveItems(itemSet); +} + +function setEventRewards(eim) { + var itemSet, itemQty, evLevel, expStages, mesoStages; + + evLevel = 1; //Rewards at clear PQ + itemSet = []; + itemQty = []; + eim.setEventRewards(evLevel, itemSet, itemQty); + + expStages = []; //bonus exp given on CLEAR stage signal + eim.setEventClearStageExp(expStages); + + mesoStages = []; //bonus meso given on CLEAR stage signal + eim.setEventClearStageMeso(mesoStages); } function afterSetup(eim) {} -function playerEntry(eim,player) { - var battle = eim.getMapInstance(battleMap.getId()); - player.changeMap(battle, battle.getPortal(0)); +function setup(channel) { + var eim = em.newInstance("Scarga" + channel); + eim.setProperty("canJoin", 1); + eim.setProperty("defeatedBoss", 1); - if (battle == null) - debug(eim, "The battle map was not properly linked."); + var level = 1; + eim.getInstanceMap(551030200).resetPQ(level); + + eim.startEventTimer(eventTime * 60000); + setEventRewards(eim); + setEventExclusives(eim); + + return eim; } -function playerRevive(eim,player) { - player.setHp(500); - player.setStance(0); - eim.unregisterPlayer(player); - player.changeMap(exitMap, exitMap.getPortal(0)); - var exped = eim.getPlayers(); - if (exped.size() < minPlayers) - end(eim,"There are not enough players remaining, the battle is over."); - return false; +function playerEntry(eim, player) { + eim.dropMessage(5, "[Expedition] " + player.getName() + " has entered the map."); + var map = eim.getMapInstance(entryMap); + player.changeMap(map, map.getPortal(0)); } -function playerDead(eim,player) { +function scheduledTimeout(eim) { + end(eim); } -function playerDisconnected(eim,player) { - var exped = eim.getPlayers(); - if (player.getName().equals(eim.getProperty("leader"))) { - var iter = exped.iterator(); - while (iter.hasNext()) { - iter.next().getPlayer().dropMessage(6, "The leader of the expedition has disconnected."); - } - } - //If the expedition is too small. - if (exped.size() < minPlayers) { - end(eim,"There are not enough players remaining. The Battle is over."); +function changedMap(eim, player, mapid) { + if (mapid < minMapId || mapid > maxMapId) { + if (eim.isEventTeamLackingNow(true, minPlayers, player)) { + eim.dropMessage(5, "[Expedition] Either the leader has quitted the event or there is no longer the minimum number of members required to continue this event."); + eim.unregisterPlayer(player); + end(eim); + } + else { + eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the event."); + eim.unregisterPlayer(player); + } } } -function monsterValue(eim,mobId) { // potentially display time of death? does not seem to work - return -1; +function changedLeader(eim, leader) {} + +function playerDead(eim, player) {} + +function playerRevive(eim, player) { + if (eim.isEventTeamLackingNow(true, minPlayers, player)) { + eim.unregisterPlayer(player); + eim.dropMessage(5, "[Expedition] Either the leader has quitted the event or there is no longer the minimum number of members required to continue this event."); + end(eim); + } + else { + eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the event."); + eim.unregisterPlayer(player); + } } -function leftParty(eim,player) { +function playerDisconnected(eim, player) { + if (eim.isEventTeamLackingNow(true, minPlayers, player)) { + eim.dropMessage(5, "[Expedition] Either the leader has quitted the event or there is no longer the minimum number of members required to continue this event."); + eim.unregisterPlayer(player); + end(eim); + } + else { + eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the event."); + eim.unregisterPlayer(player); + } } -function disbandParty(eim) { +function leftParty (eim, player) {} + +function disbandParty (eim) {} + +function monsterValue(eim, mobId) { + return 1; } function playerUnregistered(eim, player) {} -function playerExit(eim,player) { +function playerExit(eim, player) { eim.unregisterPlayer(player); - player.changeMap(exitMap, exitMap.getPortal(0)); - if (eim.getPlayers().size() < minPlayers) {//not enough after someone left - end(eim, "There are no longer enough players to continue, and those remaining shall be warped out."); - } + player.changeMap(exitMap, 0); } -function end(eim,msg) { - var iter = eim.getPlayers().iterator(); - while (iter.hasNext()) { - var player = iter.next(); - player.getPlayer().dropMessage(6,msg); - eim.unregisterPlayer(player); - if (player != null){ - player.changeMap(exitMap, exitMap.getPortal(0)); - } +function end(eim) { + var party = eim.getPlayers(); + for (var i = 0; i < party.size(); i++) { + playerExit(eim, party.get(i)); } eim.dispose(); } -function removePlayer(eim,player) { - eim.unregisterPlayer(player); - player.getMap().removePlayer(player); - player.setMap(exitMap); +function giveRandomEventReward(eim, player) { + eim.giveEventReward(player); } -function clearPQ(eim) { //When the hell does this get executed? - end(eim,"As the sound of battle fades away, you feel strangely unsatisfied."); +function clearPQ(eim) { + eim.stopEventTimer(); + eim.setEventCleared(); } -function finish(eim) { - var iter = eim.getPlayers().iterator(); - while (iter.hasNext()) { - var player = iter.next(); - eim.unregisterPlayer(player); - player.changeMap(exitMap, exitMap.getPortal(0)); +function isScarga(mob) { + var mobid = mob.getId(); + return (mobid == 9420544) || (mobid == 9420549); +} + +function monsterKilled(mob, eim) { + if(isScarga(mob)) { + var killed = eim.getIntProperty("defeatedBoss"); + if(killed == 1) { + eim.showClearEffect(); + eim.clearPQ(); + } + + eim.setIntProperty("defeatedBoss", killed + 1); } - eim.dispose(); } -function monsterKilled(mob, eim) {} - function allMonstersDead(eim) {} function cancelSchedule() {} -function timeOut(eim) { - if (eim != null) { - if (eim.getPlayerCount() > 0) { - var pIter = eim.getPlayers().iterator(); - while (pIter.hasNext()){ - var player = pIter.next(); - player.dropMessage(6, "You have run out of time to defeat Scarlion and Targa!"); - playerExit(eim, player); - } - } - eim.dispose(); - } -} - -function debug(eim,msg) { - var iter = eim.getPlayers().iterator(); - while (iter.hasNext()) { - iter.next().getClient().getSession().write(Packages.tools.MaplePacketCreator.serverNotice(6,msg)); - } -} \ No newline at end of file +function dispose(eim) {} \ No newline at end of file diff --git a/scripts/npc/2091005.js b/scripts/npc/2091005.js index f306439748..6e77b61afe 100644 --- a/scripts/npc/2091005.js +++ b/scripts/npc/2091005.js @@ -146,13 +146,13 @@ function action(mode, type, selection) { cm.dispose(); return; } else { - for (var i = 1 ; i < 39; i++) { //only 32 stages, but 38 maps - if(cm.getClient().getChannelServer().getMapFactory().getMap(925020000 + 100 * i).getCharacters().size() > 0) { - cm.sendOk("Someone is already in the Dojo."); - cm.dispose(); - return; - } - } + for (var i = 1 ; i < 39; i++) { //only 32 stages, but 38 maps + if(cm.getClient().getChannelServer().getMapFactory().getMap(925020000 + 100 * i).getCharacters().size() > 0) { + cm.sendOk("Someone is already in the Dojo."); + cm.dispose(); + return; + } + } cm.getClient().getChannelServer().getMapFactory().getMap(925020100).resetReactors(); cm.getClient().getChannelServer().getMapFactory().getMap(925020100).killAllMonsters(); cm.warpParty(925020100); diff --git a/scripts/npc/2091005_old.js b/scripts/npc/2091005_old.js index 326ab962ad..4a4af5d907 100644 --- a/scripts/npc/2091005_old.js +++ b/scripts/npc/2091005_old.js @@ -133,13 +133,13 @@ function action(mode, type, selection) { } else if (!isBetween30) { cm.sendNext("Your partys level ranges are too broad to enter. Please make sure all of your party members are within #r30 levels#k of each other."); } else { - for (var i = 1 ; i < 39; i++) { //only 32 stages, but 38 maps - if(cm.getClient().getChannelServer().getMapFactory().getMap(925020000 + 100 * i).getCharacters().size() > 0) { - cm.sendOk("Someone is already in the Dojo."); - cm.dispose(); - return; - } - } + for (var i = 1 ; i < 39; i++) { //only 32 stages, but 38 maps + if(cm.getClient().getChannelServer().getMapFactory().getMap(925020000 + 100 * i).getCharacters().size() > 0) { + cm.sendOk("Someone is already in the Dojo."); + cm.dispose(); + return; + } + } cm.getClient().getChannelServer().getMapFactory().getMap(925020100).resetReactors(); cm.getClient().getChannelServer().getMapFactory().getMap(925020100).killAllMonsters(); cm.warpParty(925020100); diff --git a/scripts/npc/2133001.js b/scripts/npc/2133001.js index f7a6505c5d..b5c77a8319 100644 --- a/scripts/npc/2133001.js +++ b/scripts/npc/2133001.js @@ -21,11 +21,11 @@ function action(mode, type, selection) { cm.sendNext("We have to eliminate all these contaminated reactors!"); break; case 930000300: - cm.warpParty(930000400); + cm.getEventInstance().warpEventTeam(930000400); break; case 930000400: if (cm.haveItem(4001169,20)) { - cm.warpParty(930000500); + cm.getEventInstance().warpEventTeam(930000500); cm.gainItem(4001169,-20); } else if (!cm.haveItem(2270004)) { if(cm.canHold(2270004,10)) { diff --git a/scripts/npc/2133004.js b/scripts/npc/2133004.js index a5133e59b8..922c582d6f 100644 --- a/scripts/npc/2133004.js +++ b/scripts/npc/2133004.js @@ -15,7 +15,7 @@ function action(mode, type, selection) { if (!cm.haveItem(4001163)) { cm.sendNext("Get me the Purple Stone of Magic from here."); } else { - cm.warpParty(930000600); + cm.getEventInstance().warpEventTeam(930000600); } break; } diff --git a/scripts/npc/9201113.js b/scripts/npc/9201113.js index 33ce5ee0fa..e85cf4189d 100644 --- a/scripts/npc/9201113.js +++ b/scripts/npc/9201113.js @@ -20,7 +20,7 @@ */ /*Jack * - *@author SharpAceX (Alan) + *@author SharpAceX (Alan), Ronan */ importPackage(Packages.server.expeditions); importPackage(Packages.tools); diff --git a/scripts/npc/9201134.js b/scripts/npc/9201134.js index 6b22ef7da5..a6ae74e252 100644 --- a/scripts/npc/9201134.js +++ b/scripts/npc/9201134.js @@ -21,31 +21,34 @@ */ /* Aldol * - * @Author Alan (SharpAceX) + * @Author Ronan */ - importPackage(Packages.server.expeditions); + +var status; function start() { - cm.sendYesNo("If you leave now, you won't be able to return. Are you sure you want to leave?"); + status = -1; + action(1, 0, 0); } function action(mode, type, selection) { - var scarga = MapleExpeditionType.SCARGA; - var expedition = cm.getExpedition(scarga); - if (mode < 1) - cm.dispose(); - else { - if (cm.getPlayer().getMap().getCharacters().size() < 2){ - cm.getPlayer().getMap().killAllMonsters(); - cm.getPlayer().getMap().resetReactors(); - if (expedition != null){ - cm.endExpedition(expedition); - } + if (mode == -1) { + cm.dispose(); + } else { + if (mode == 0 && status == 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + if (status == 0) { + cm.sendYesNo("If you leave now, you won't be able to return. Are you sure you want to leave?"); + } else if (status == 1) { + cm.warp(551030100, 2); + cm.dispose(); + } } - if (cm.getPlayer().getEventInstance() != null) - cm.getPlayer().getEventInstance().removePlayer(cm.getPlayer()); - else - cm.warp(551030100); - cm.dispose(); - } } \ No newline at end of file diff --git a/scripts/npc/9270023.js b/scripts/npc/9270023.js index fadd5ae962..a376184a51 100644 --- a/scripts/npc/9270023.js +++ b/scripts/npc/9270023.js @@ -31,22 +31,30 @@ var fface = Array(21001, 21002, 21003, 21004, 21005, 21006, 21008, 21012, 21014, var facenew = Array(); function start() { - cm.sendSimple("If you use this regular coupon, your face may transform into a random new look...do you still want to do it using #b#t5152037##k, I will do it anyways for you. But don't forget, it will be random!\r\n\#L2#OK!#l"); + cm.sendSimple("If you use this regular coupon, your face may transform into a random new look...do you still want to do it using #b#t5152037##k, I will do it anyways for you. But don't forget, it will be random!\r\n\#L2#OK! (Uses #i5152037# #t5152037#)#l"); } function action(mode, type, selection) { if (mode == -1) cm.dispose(); else { - if (mode == 0 && status == 0) + if (mode == 0 && status >= 0) { cm.dispose(); + return; + } + if (mode == 1) status++; else status--; - if (status == 1) - cm.dispose(); - else if (selection == 2) { + + if (status == 1) { + if (!cm.haveItem(5152037)) { + cm.sendOk("Hmm ... it looks like you don't have the coupon specifically for this place. Sorry to say this, but without the coupon, there's no plastic surgery for you..."); + cm.dispose(); + return; + } + facenew = Array(); if (cm.getPlayer().getGender() == 0) for(var i = 0; i < mface.length; i++) @@ -56,13 +64,11 @@ function action(mode, type, selection) { facenew.push(fface[i] + cm.getPlayer().getFace()% 1000 - (cm.getPlayer().getFace()% 100)); cm.sendYesNo("If you use the regular coupon, your face may transform into a random new look...do you still want to do it using #b#t5152037##k?"); } else if (status == 2){ + cm.gainItem(5152037 , -1); + cm.setFace(facenew[Math.floor(Math.random() * facenew.length)]); + cm.sendOk("Enjoy your new and improved face!"); + cm.dispose(); - if (cm.haveItem(5152037)){ - cm.gainItem(5152037 , -1); - cm.setFace(facenew[Math.floor(Math.random() * facenew.length)]); - cm.sendOk("Enjoy your new and improved face!"); - } else - cm.sendOk("Hmm ... it looks like you don't have the coupon specifically for this place. Sorry to say this, but without the coupon, there's no plastic surgery for you..."); } } } diff --git a/scripts/npc/9270024.js b/scripts/npc/9270024.js index 287147ef28..e633bb9686 100644 --- a/scripts/npc/9270024.js +++ b/scripts/npc/9270024.js @@ -37,18 +37,25 @@ function start() { function action(mode, type, selection) { if (mode == -1) cm.dispose(); - else { - if (mode == 0 && status == 0) + else { + if (mode == 0 && status >= 0) { cm.dispose(); + return; + } if (mode == 1) status++; else status--; if (status == 0) { - cm.sendSimple("Let's see...I can totally transform your face into something new. Don't you want to try it? For #b#t5152038##k, you can get the face of your liking. Take your time in choosing the face of your preference...\r\n\#L2#Let me get my dream face!#l"); - cm.dispose(); - } else if (selection == 2) { + cm.sendSimple("Let's see...I can totally transform your face into something new. Don't you want to try it? For #b#t5152038##k, you can get the face of your liking. Take your time in choosing the face of your preference...\r\n\#L2#Let me get my dream face! (Uses #i5152038# #t5152038#)#l"); + } else if (status == 1) { + if (!cm.haveItem(5152038)) { + cm.sendOk("Hmm ... it looks like you don't have the coupon specifically for this place. Sorry to say this, but without the coupon, there's no plastic surgery for you..."); + cm.dispose(); + return; + } + facenew = Array(); if (cm.getPlayer().getGender() == 0) { for(var i = 0; i < mface.length; i++) @@ -62,14 +69,11 @@ function action(mode, type, selection) { cm.sendStyle("Let's see... I can totally transform your face into something new. Don't you want to try it? For #b#t5152038##k, you can get the face of your liking. Take your time in choosing the face of your preference...", facenew); } else if (status == 2){ + cm.gainItem(5152038, -1); + cm.setFace(facenew[selection]); + cm.sendOk("Enjoy your new and improved face!"); + cm.dispose(); - if (cm.haveItem(5152038)){ - cm.gainItem(5152038, -1); - cm.setFace(facenew[selection]); - cm.sendOk("Enjoy your new and improved face!"); - } else { - cm.sendOk("Hmm ... it looks like you don't have the coupon specifically for this place. Sorry to say this, but without the coupon, there's no plastic surgery for you..."); - } } } } diff --git a/scripts/npc/9270025.js b/scripts/npc/9270025.js index 79750771d8..a6fdc0c2af 100644 --- a/scripts/npc/9270025.js +++ b/scripts/npc/9270025.js @@ -24,24 +24,42 @@ by Moogra */ var skin = Array(0, 1, 2, 3, 4); +var status; function start() { - cm.sendSimple("Well, hello! Welcome to the Lian Hua Hua Skin-Care! Would you like to have a firm, tight, healthy looking skin like mine? With #b#tCBD Skin Coupon##k, you can let us take care of the rest and have the kind of skin you've always wanted!\r\n\#L1#Sounds Good!#l"); + status = -1; + action(1, 0, 0); } function action(mode, type, selection) { if (mode < 1) cm.dispose(); else { - if (selection == 1) - cm.sendStyle("With our specialized service, you can see the way you'll look after the treatment in advance. What kind of a skin-treatment would you like to do? Go ahead and choose the style of your liking...", skin); - else { - if (cm.haveItem(5153010)){ - cm.gainItem(5153010 , -1); - cm.setSkin(selection); - cm.sendOk("Enjoy your new and improved skin!"); - } else + if (mode == 0 && status >= 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + if (status == 0) { + cm.sendSimple("Well, hello! Welcome to the Lian Hua Hua Skin-Care! Would you like to have a firm, tight, healthy looking skin like mine? With #b#tCBD Skin Coupon##k, you can let us take care of the rest and have the kind of skin you've always wanted!\r\n\#L1#Sounds Good! (uses #i5153010# #t5153010#)#l"); + } + else if (status == 1) { + if (!cm.haveItem(5153010)) { cm.sendOk("It looks like you don't have the coupon you need to receive the treatment. I'm sorry but it looks like we cannot do it for you."); + cm.dispose(); + return; + } + cm.sendStyle("With our specialized service, you can see the way you'll look after the treatment in advance. What kind of a skin-treatment would you like to do? Go ahead and choose the style of your liking...", skin); + } + else { + cm.gainItem(5153010, -1); + cm.setSkin(selection); + cm.sendOk("Enjoy your new and improved skin!"); + cm.dispose(); } } diff --git a/scripts/npc/9270031.js b/scripts/npc/9270031.js new file mode 100644 index 0000000000..8901c233e4 --- /dev/null +++ b/scripts/npc/9270031.js @@ -0,0 +1,31 @@ +/* + This file is part of the OdinMS Maple Story Server + Copyright (C) 2008 Patrick Huy + Matthias Butz + Jan Christian Meyer + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation version 3 as published by + the Free Software Foundation. You may not use, modify or distribute + this program under any other version of the GNU Affero General Public + License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ +/* Dave & Iris + () + + +*/ + +function start() { + cm.sendOk("We had our wedding at Amoria, such a beautiful place, and their people are even more amiable. Now our honeymoon on this paradisiac place... Ah, glorious, glorious!"); + cm.dispose(); +} diff --git a/scripts/npc/9270033.js b/scripts/npc/9270033.js index 216614f76b..fa038e915e 100644 --- a/scripts/npc/9270033.js +++ b/scripts/npc/9270033.js @@ -20,9 +20,48 @@ along with this program. If not, see . */ /* Engine room - Bob - * @author Moogra + * @author Ronan */ + +var eim; +var status = 0; + function start() { - cm.warp(541010110); - cm.dispose(); -} \ No newline at end of file + status = -1; + action(1, 0, 0); +} + +function action(mode, type, selection) { + if (mode == -1) { + cm.dispose(); + } else { + if (mode == 0 && status == 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + eim = cm.getEventInstance(); + if(status == 0) { + if(!eim.isEventCleared()) { + cm.sendYesNo("Are you ready to leave this place?"); + } else { + cm.sendYesNo("You have defeated Capt. Latanica, well done! Are you ready to leave this place?"); + } + } else if(status == 1) { + if(eim.isEventCleared()) { + if(!eim.giveEventReward(cm.getPlayer)) { + cm.sendOk("Please make a room on your inventory to receive the loot."); + cm.dispose(); + return; + } + } + + cm.warp(541010110); + cm.dispose(); + } + } +} diff --git a/scripts/npc/9270038.js b/scripts/npc/9270038.js index 2264221458..ba4855a2f7 100644 --- a/scripts/npc/9270038.js +++ b/scripts/npc/9270038.js @@ -53,11 +53,17 @@ function action(mode, type, selection) { oldSelection = selection; }else if(status == 1){ if(oldSelection == 0){ - if (cm.getPlayer().getMeso() > 4999 && cm.getPlayer().haveItem(4031732) == false) { - cm.gainMeso(-5000); - cm.gainItem(4031732); - cm.sendOk("Thank you for choosing Wizet Airline! Enjoy your flight!"); - cm.dispose(); + if (cm.getPlayer().getMeso() > 4999 && !cm.getPlayer().haveItem(4031732)) { + if(cm.getPlayer().canHold(4031732, 1)) { + cm.gainMeso(-5000); + cm.gainItem(4031732); + cm.sendOk("Thank you for choosing Wizet Airline! Enjoy your flight!"); + cm.dispose(); + } + else { + cm.sendOk("You don't have a free slot on your ETC inventory for the ticket, please make a room beforehand."); + cm.dispose(); + } } else { cm.sendOk("You do not have enough mesos or you've already purchased a ticket."); cm.dispose(); diff --git a/scripts/npc/9270041.js b/scripts/npc/9270041.js index 5edb71938e..22d62468ef 100644 --- a/scripts/npc/9270041.js +++ b/scripts/npc/9270041.js @@ -53,11 +53,17 @@ function action(mode, type, selection) { oldSelection = selection; }else if(status == 1){ if(oldSelection == 0){ - if (cm.getPlayer().getMeso() > 4999 && cm.getPlayer().haveItem(4031731) == false) { - cm.gainMeso(-5000); - cm.gainItem(4031731); - cm.sendOk("Thank you for choosing Wizet Airline! Enjoy your flight!"); - cm.dispose(); + if (cm.getPlayer().getMeso() > 4999 && !cm.getPlayer().haveItem(4031731)) { + if(cm.canHold(4031731, 1)) { + cm.gainMeso(-5000); + cm.gainItem(4031731); + cm.sendOk("Thank you for choosing Wizet Airline! Enjoy your flight!"); + cm.dispose(); + } + else { + cm.sendOk("You don't have a free slot on your ETC inventory for the ticket, please make a room beforehand."); + cm.dispose(); + } } else { cm.sendOk("You do not have enough mesos or you've already purchased a ticket."); cm.dispose(); diff --git a/scripts/npc/9270047.js b/scripts/npc/9270047.js index 409c03e065..55f5c99d78 100644 --- a/scripts/npc/9270047.js +++ b/scripts/npc/9270047.js @@ -18,9 +18,9 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -/*Adobis +/*Aldol * - *@author SharpAceX (Alan) + *@author SharpAceX (Alan), Ronan */ importPackage(Packages.server.expeditions); importPackage(Packages.tools); @@ -30,7 +30,11 @@ var status = 0; var expedition; var player; var em; -var scarga = MapleExpeditionType.SCARGA; +var exped = MapleExpeditionType.SCARGA; +var expedBoss = "Scarlion and Targa"; +var expedMap = "Spooky World"; +var expedItem = 4032246; + var list = "What would you like to do?#b\r\n\r\n#L1#View current Expedition members#l\r\n#L2#Start the fight!#l\r\n#L3#Stop the expedition.#l"; function start() { @@ -40,114 +44,139 @@ function start() { function action(mode, type, selection) { player = cm.getPlayer(); - expedition = cm.getExpedition(scarga); + expedition = cm.getExpedition(exped); em = cm.getEventManager("ScargaBattle"); - if (mode < 1) { + if (mode == -1) { cm.dispose(); - return; - } - if (status == 0) { - //cm.removeExpedition(expedition); - if (player.getClient().getChannel() != 1) { //Only channel 1 - cm.sendOk("Sorry, Scarlion and Targa may only be challenged on #bChannel 1#k."); - cm.dispose(); - } else if (player.getLevel() < scarga.getMinLevel() && player.getLevel() > scarga.getMaxLevel()) { //Don't fit requirement - cm.sendOk("You do not meet the criteria to take on Scarlion and Targa!"); - cm.dispose(); - } else if (expedition == null) { //Start an expedition - cm.sendSimple("Would you like to assemble a team to take on #rScarlion and Targa#k?\r\n#b#L1#Lets get this going!#l\r\n\#L2#No, I think I'll wait a bit...#l"); - status = 1; - } else if (expedition.isLeader(player)) { //If you're the leader, manage the exped - cm.sendSimple(list); - status = 2; - } else if (expedition.isRegistering()) { //If the expedition is registering - if (expedition.contains(player)) { //If you're in it but it hasn't started, be patient - cm.sendOk("You have already registered for the expedition. Please wait for " + expedition.getLeader().getName() + " to begin the expedition."); - cm.dispose(); - } else { //If you aren't in it, you're going to get added - cm.sendOk(expedition.addMember(cm.getPlayer())); - cm.dispose(); - } - } else if (expedition.isInProgress()) { //Only if the expedition is in progress - if (expedition.contains(player)) { //If you're registered, warp you in - em.getInstance("ScargaBattle_" + player.getClient().getChannel()).registerPlayer(player); - cm.dispose(); - } else { //If you're not in by now, tough luck - cm.sendOk("Another expedition has taken the initiative to fight Scarlion and Targa, lets pray for those brave souls."); - cm.dispose(); - } - } - } else if (status == 1) { - if (selection == 1) { - cm.createExpedition(scarga); - cm.sendOk("The #rScarlion and Targa Expedition#k has been created.\r\n\r\nTalk to me again to view the current team, or start the fight!"); - cm.dispose(); - return; - } else if (selection == 2) { - cm.sendOk("Sure, not everyone's up to challenging the might of Scarlion and Targa."); + } else { + if (mode == 0) { cm.dispose(); return; } - } else if (status == 2) { - if (selection == 1) { - if (expedition == null) { - cm.sendOk("The expedition could not be loaded."); + + if (status == 0) { + if (player.getLevel() < exped.getMinLevel() && player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement + cm.sendOk("You do not meet the criteria to battle " + expedBoss + "!"); + cm.dispose(); + } else if (expedition == null) { //Start an expedition + cm.sendSimple("#e#b\r\n#k#n" + em.getProperty("party") + "\r\n\r\nWould you like to assemble a team to take on #r" + expedBoss + "#k?\r\n#b#L1#Lets get this going!#l\r\n\#L2#No, I think I'll wait a bit...#l"); + status = 1; + } else if (expedition.isLeader(player)) { //If you're the leader, manage the exped + cm.sendSimple(list); + status = 2; + } else if (expedition.isRegistering()) { //If the expedition is registering + if (expedition.contains(player)) { //If you're in it but it hasn't started, be patient + cm.sendOk("You have already registered for the expedition. Please wait for #r" + expedition.getLeader().getName() + "#k to begin the expedition."); + cm.dispose(); + } else { //If you aren't in it, you're going to get added + cm.sendOk(expedition.addMember(cm.getPlayer())); + cm.dispose(); + } + } else if (expedition.isInProgress()) { //Only if the expedition is in progress + if (expedition.contains(player)) { //If you're registered, warp you in + var eim = em.getInstance("Scarga" + player.getClient().getChannel()); + if(eim.getIntProperty("canJoin") == 1) { + eim.registerPlayer(player); + } else { + cm.sendOk("Your expedition already started the battle against " + expedBoss + ". Lets pray for those brave souls."); + } + + cm.dispose(); + } else { //If you're not in by now, tough luck + cm.sendOk("Another expedition has taken the initiative to challenge " + expedBoss + ", lets pray for those brave souls."); + cm.dispose(); + } + } + } else if (status == 1) { + if (selection == 1) { + if (!cm.haveItem(expedItem)) { + cm.sendOk("As the expedition leader, you must have on your inventory a #b#t" + expedItem + "##k to battle " + expedBoss + "!"); + cm.dispose(); + return; + } + + expedition = cm.getExpedition(exped); + if(expedition != null) { + cm.sendOk("Someone already taken the initiative to be the leader of the expedition. Try joining them!"); + cm.dispose(); + return; + } + + cm.createExpedition(exped); + cm.sendOk("The #r" + expedBoss + " Expedition#k has been created.\r\n\r\nTalk to me again to view the current team, or start the fight!"); + cm.dispose(); + return; + } else if (selection == 2) { + cm.sendOk("Sure, not everyone's up to challenging " + expedBoss + "."); cm.dispose(); return; } - var size = expedition.getMembers().size(); - if (size == 1) { - cm.sendOk("You are the only member of the expedition."); + } else if (status == 2) { + if (selection == 1) { + if (expedition == null) { + cm.sendOk("The expedition could not be loaded."); + cm.dispose(); + return; + } + var size = expedition.getMembers().size(); + if (size == 1) { + cm.sendOk("You are the only member of the expedition."); + cm.dispose(); + return; + } + var text = "The following members make up your expedition (Click on them to expel them):\r\n"; + text += "\r\n\t\t1." + expedition.getLeader().getName(); + for (var i = 1; i < size; i++) { + text += "\r\n#b#L" + (i + 1) + "#" + (i + 1) + ". " + expedition.getMembers().get(i).getName() + "#l\n"; + } + cm.sendSimple(text); + status = 6; + } else if (selection == 2) { + var min = exped.getMinSize(); + var size = expedition.getMembers().size(); + if (size < min) { + cm.sendOk("You need at least " + min + " players registered in your expedition."); + cm.dispose(); + return; + } + + cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k."); + status = 4; + } else if (selection == 3) { + player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); + cm.endExpedition(expedition); + cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); cm.dispose(); return; } - var text = "The following members make up your expedition (Click on them to expel them):\r\n"; - text += "\r\n\t\t1." + expedition.getLeader().getName(); - for (var i = 1; i < size; i++) { - text += "\r\n#b#L" + (i + 1) + "#" + (i + 1) + ". " + expedition.getMembers().get(i).getName() + "#l\n"; + } else if (status == 4) { + if (em == null) { + cm.sendOk("The event could not be initialized, please report this on the forum."); + cm.dispose(); + return; } - cm.sendSimple(text); - status = 6; - } else if (selection == 2) { - cm.sendOk("The expedition will begin and you will now be escorted to the #bSpooky World#k."); - status = 4; - } else if (selection == 3) { - player.getMap().broadcastMessage(MaplePacketCreator.removeClock()); - player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition.")); - cm.endExpedition(expedition); - cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away."); - cm.dispose(); - return; - } - } else if (status == 4) { - var min = 1; //scarga.getMinSize(); - var size = expedition.getMembers().size(); - if (size < min) { - cm.sendOk("You need at least " + min + " players registered in your expedition."); + + em.setProperty("leader", player.getName()); + em.setProperty("channel", player.getClient().getChannel()); + if(!em.startInstance(expedition)) { + cm.sendOk("Another expedition has taken the initiative to challenge " + expedBoss + ", lets pray for those brave souls."); + cm.dispose(); + return; + } + cm.dispose(); return; - } - if (em == null) { - cm.sendOk("The event could not be found, please report this on the forum."); - cm.dispose(); - return; - } - cm.sendOk("Good luck! Scarlion and Targa are worthy foes!"); - em.setProperty("leader", player.getName()); - em.setProperty("channel", player.getClient().getChannel()); - em.startInstance(expedition); - cm.dispose(); - return; - } else if (status == 6) { - if (selection > 0) { - var banned = expedition.getMembers().get(selection); - expedition.ban(banned); - cm.sendOk("You have banned " + banned.getName() + " from the expedition."); - cm.dispose(); - } else { - cm.sendSimple(list); - status = 2; + } else if (status == 6) { + if (selection > 0) { + var banned = expedition.getMembers().get(selection - 1); + expedition.ban(banned); + cm.sendOk("You have banned " + banned.getName() + " from the expedition."); + cm.dispose(); + } else { + cm.sendSimple(list); + status = 2; + } } } -} \ No newline at end of file +} diff --git a/scripts/portal/MD_drakeroom.js b/scripts/portal/MD_drakeroom.js index f24f062c48..bdf6c3eda1 100644 --- a/scripts/portal/MD_drakeroom.js +++ b/scripts/portal/MD_drakeroom.js @@ -36,7 +36,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_golem.js b/scripts/portal/MD_golem.js index ff4ff190db..84abdc35db 100644 --- a/scripts/portal/MD_golem.js +++ b/scripts/portal/MD_golem.js @@ -38,7 +38,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_high.js b/scripts/portal/MD_high.js new file mode 100644 index 0000000000..f06301773b --- /dev/null +++ b/scripts/portal/MD_high.js @@ -0,0 +1,63 @@ +/* + This file is part of the OdinMS Maple Story Server + Copyright (C) 2008 Patrick Huy + Matthias Butz + Jan Christian Meyer + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License version 3 + as published by the Free Software Foundation. You may not use, modify + or distribute this program under any other version of the + GNU Affero General Public License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +/* +MiniDungeon - Longest Ride on ByeBye Station +*/ + +var baseid = 551030000; +var dungeonid = 551030001; +var dungeons = 19; + +function enter(pi) { + if (pi.getMapId() == baseid) { + if (pi.getPlayer().getFame() < 10) { + pi.playerMessage(5, "You need 10 Fame to enter."); + return; + } + if (pi.getParty() != null) { + if (pi.isLeader()) { + for (var i = 0; i < dungeons; i++) { + if (pi.getPlayerCount(dungeonid + i) == 0) { + pi.warpParty(dungeonid + i); + return true; + } + } + } else { + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); + return false; + } + } else { + for (var i = 0; i < dungeons; i++) { + if (pi.getPlayerCount(dungeonid + i) == 0) { + pi.warp(dungeonid + i); + return true; + } + } + } + pi.playerMessage(5, "All of the Mini-Dungeons are in use right now, please try again later."); + return false; + } else { + pi.playPortalSound(); + pi.warp(baseid, "MD00"); + return true; + } +} \ No newline at end of file diff --git a/scripts/portal/MD_mushroom.js b/scripts/portal/MD_mushroom.js index 00959437c6..ffafdfe3d8 100644 --- a/scripts/portal/MD_mushroom.js +++ b/scripts/portal/MD_mushroom.js @@ -38,7 +38,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_pig.js b/scripts/portal/MD_pig.js index a658aa8ed2..ee976c5006 100644 --- a/scripts/portal/MD_pig.js +++ b/scripts/portal/MD_pig.js @@ -38,7 +38,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_protect.js b/scripts/portal/MD_protect.js index f841266045..f84717d8dd 100644 --- a/scripts/portal/MD_protect.js +++ b/scripts/portal/MD_protect.js @@ -36,7 +36,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_rabbit.js b/scripts/portal/MD_rabbit.js index 39fcc467b8..eba7e2823e 100644 --- a/scripts/portal/MD_rabbit.js +++ b/scripts/portal/MD_rabbit.js @@ -36,7 +36,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_remember.js b/scripts/portal/MD_remember.js index cf193984c4..1eac064a38 100644 --- a/scripts/portal/MD_remember.js +++ b/scripts/portal/MD_remember.js @@ -36,7 +36,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_roundTable.js b/scripts/portal/MD_roundTable.js index 4552b02add..4b169e40c7 100644 --- a/scripts/portal/MD_roundTable.js +++ b/scripts/portal/MD_roundTable.js @@ -36,7 +36,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_sand.js b/scripts/portal/MD_sand.js index e5dc60524b..d8e39deb72 100644 --- a/scripts/portal/MD_sand.js +++ b/scripts/portal/MD_sand.js @@ -36,7 +36,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/MD_treasure.js b/scripts/portal/MD_treasure.js index 28fe853839..d51e09eba7 100644 --- a/scripts/portal/MD_treasure.js +++ b/scripts/portal/MD_treasure.js @@ -36,7 +36,7 @@ function enter(pi) { } } } else { - pi.playerMessage(5, "You are not the leader of the party."); + pi.playerMessage(5, "Only solo or party leaders are supposed to enter the Mini-Dungeon."); return false; } } else { diff --git a/scripts/portal/captinsg00.js b/scripts/portal/captinsg00.js index 32e638a27f..afd398df00 100644 --- a/scripts/portal/captinsg00.js +++ b/scripts/portal/captinsg00.js @@ -1,36 +1,32 @@ -//importPackage(server.maps); -//importPackage(net.channel); -//importPackage(tools); -// -//function enter(pi) { -// var mapid = 541010100; -// var map = ChannelServer.getInstance(pi.getPlayer().getClient().getChannel()).getMapFactory().getMap(mapid); -// var mapchars = map.getCharacters(); -// if (mapchars.isEmpty()) { -// var mapobjects = map.getMapObjects(); -// var iter = mapobjects.iterator(); -// while (iter.hasNext()) { -// o = iter.next(); -// if (o.getType() == MapleMapObjectType.MONSTER){ -// map.removeMapObject(o); -// } -// } -// map.resetReactors(); -// } else { -// var mapobjects = map.getMapObjects(); -// var boss = null; -// var iter = mapobjects.iterator(); -// while (iter.hasNext()) { -// o = iter.next(); -// if (o.getType() == MapleMapObjectType.MONSTER){ -// boss = o; -// } -// } -// if (boss != null) { -// pi.getPlayer().dropMessage(5, "The battle against the boss has already begun, so you may not enter this place."); -// return false; -// } -// } -// pi.warp(541010100, "sp"); -// return true; -//} \ No newline at end of file +/* By RonanLana */ + +function enter(pi) { + if (!pi.haveItem(4000381)) { + pi.playerMessage(5, "You do not have White Essence."); + return false; + } else { + var em = pi.getEventManager("LatanicaBattle"); + + if (pi.getParty() == null) { + pi.playerMessage(5, "You are currently not in a party, create one to attempt the boss."); + return false; + } else if(!pi.isLeader()) { + pi.playerMessage(5, "Your party leader must enter the portal to start the battle."); + return false; + } else { + var eli = em.getEligibleParty(pi.getParty()); + if(eli.size() > 0) { + if(!em.startInstance(pi.getParty(), pi.getPlayer().getMap(), 1)) { + pi.playerMessage(5, "The battle against the boss has already begun, so you may not enter this place."); + return false; + } + } + else { //this should never appear + pi.playerMessage(5, "You cannot start this battle yet, because either your party is not in the range size, some of your party members are not eligible to attempt it or they are not in this map. If you're having trouble finding party members, try Party Search."); + return false; + } + + return true; + } + } +} \ No newline at end of file diff --git a/scripts/portal/jail_in.js b/scripts/portal/jail_in.js index 7084b03d40..25620f65e2 100644 --- a/scripts/portal/jail_in.js +++ b/scripts/portal/jail_in.js @@ -4,6 +4,6 @@ */ function enter(pi) { - pi.warp(300000012,0); + pi.warp(300000012,"portal"); return(true); } \ No newline at end of file diff --git a/scripts/portal/jail_out.js b/scripts/portal/jail_out.js index 6e3adff30a..590022b03c 100644 --- a/scripts/portal/jail_out.js +++ b/scripts/portal/jail_out.js @@ -7,7 +7,7 @@ function enter(pi) { var jailedTime = pi.getJailTimeLeft(); if(jailedTime <= 0) { - pi.warp(300000010,0); + pi.warp(300000010,"in01"); return(true); } else { diff --git a/scripts/portal/market00.js b/scripts/portal/market00.js index dd6bd5603f..52bd0eda82 100644 --- a/scripts/portal/market00.js +++ b/scripts/portal/market00.js @@ -20,8 +20,9 @@ along with this program. If not, see . */ function enter(pi) { - try { - pi.warp(pi.getPlayer().getSavedLocation("FREE_MARKET")); + try { + var toMap = pi.getPlayer().getSavedLocation("FREE_MARKET"); + pi.warp(toMap, pi.getMarketPortalId(toMap)); } catch(err) { pi.warp(100000000); } diff --git a/scripts/reactor/5411000.js b/scripts/reactor/5411000.js index c4a84b2fd4..8279dc0300 100644 --- a/scripts/reactor/5411000.js +++ b/scripts/reactor/5411000.js @@ -22,5 +22,6 @@ function act(){ rm.changeMusic("Bgm09/TimeAttack"); rm.spawnMonster(9420513, -146, 225); + rm.getEventInstance().setIntProperty("boss", 1); rm.mapMessage(5, "As you wish, here comes Capt Latanica."); } \ No newline at end of file diff --git a/scripts/reactor/5511000.js b/scripts/reactor/5511000.js index 4d92c36bcc..748aabe1aa 100644 --- a/scripts/reactor/5511000.js +++ b/scripts/reactor/5511000.js @@ -2,10 +2,14 @@ * 5511000.js: Summons Targa. */ +function summonBoss() { + rm.spawnMonster(9420542,-527,637); + rm.changeMusic("Bgm09/TimeAttack"); + rm.mapMessage(6, "Beware! The furious Targa has shown himself!"); +} + function act() { if (rm.getReactor().getMap().getMonsterById(9420542) == null) { - rm.spawnMonster(9420542,-527,637); - rm.changeMusic("Bgm09/TimeAttack"); - rm.mapMessage(6, "Beware! The furious Targa has shown himself!"); + rm.schedule("summonBoss", 3200); } } \ No newline at end of file diff --git a/scripts/reactor/5511001.js b/scripts/reactor/5511001.js index 0c4985fdf0..8dc042274d 100644 --- a/scripts/reactor/5511001.js +++ b/scripts/reactor/5511001.js @@ -2,10 +2,14 @@ * 5511001.js: Summons Scarlion. */ +function summonBoss() { + rm.spawnMonster(9420547,-238,636); + rm.changeMusic("Bgm09/TimeAttack"); + rm.mapMessage(6, "Beware! The furious Scarlion has shown himself!"); +} + function act() { if (rm.getReactor().getMap().getMonsterById(9420547) == null) { - rm.spawnMonster(9420547,-238,636); - rm.changeMusic("Bgm09/TimeAttack"); - rm.mapMessage(6, "Beware! The furious Scarlion has shown himself!"); + rm.schedule("summonBoss", 3200); } } \ No newline at end of file diff --git a/sql/db_database.sql b/sql/db_database.sql index 636c9da263..afa7d5ea81 100644 --- a/sql/db_database.sql +++ b/sql/db_database.sql @@ -20762,7 +20762,196 @@ INSERT INTO `shopitems` (`shopitemid`, `shopid`, `itemid`, `price`, `pitch`, `po (20061, 9201099, 2020013, 5000, 0, 15), (20062, 9201099, 2020012, 4500, 0, 16), (20063, 9201099, 2050000, 200, 0, 17), -(20064, 9201099, 2050004, 400, 0, 18); +(20064, 9201099, 2050004, 400, 0, 18), +(20065, 9270057, 2022015, 12000, 0, 1), +(20066, 9270057, 2061000, 1, 0, 2), +(20067, 9270057, 2060000, 1, 0, 3), +(20068, 9270057, 2030000, 400, 0, 4), +(20069, 9270057, 2050003, 500, 0, 5), +(20070, 9270057, 2050002, 300, 0, 6), +(20071, 9270057, 2050001, 200, 0, 7), +(20072, 9270057, 2050000, 200, 0, 8), +(20073, 9270057, 2020028, 3000, 0, 9), +(20074, 9270057, 2010004, 310, 0, 10), +(20075, 9270057, 2010003, 100, 0, 11), +(20076, 9270057, 2010001, 106, 0, 12), +(20077, 9270057, 2010002, 50, 0, 13), +(20078, 9270057, 2010000, 30, 0, 14), +(20079, 9270057, 2001002, 4000, 0, 15), +(20080, 9270057, 2001001, 2300, 0, 16), +(20081, 9270057, 2001000, 3200, 0, 17), +(20082, 9270057, 2022000, 1650, 0, 18), +(20083, 9270057, 2022003, 1100, 0, 19), +(20084, 9270057, 2002005, 500, 0, 20), +(20085, 9270057, 2002004, 500, 0, 21), +(20086, 9270057, 2002002, 500, 0, 22), +(20087, 9270057, 2002001, 400, 0, 23), +(20088, 9270057, 2002000, 500, 0, 24), +(20089, 9270057, 2000006, 620, 0, 25), +(20090, 9270057, 2000003, 200, 0, 26), +(20091, 9270057, 2000002, 320, 0, 27), +(20092, 9270057, 2000001, 160, 0, 28), +(20093, 9270057, 2000000, 50, 0, 29), +(20094, 9270055, 1492006, 160000, 0, 1), +(20095, 9270055, 1492005, 100000, 0, 2), +(20096, 9270055, 1492004, 50000, 0, 3), +(20097, 9270055, 1492003, 22000, 0, 4), +(20098, 9270055, 1482006, 150000, 0, 5), +(20099, 9270055, 1482005, 100000, 0, 6), +(20100, 9270055, 1482004, 52000, 0, 7), +(20101, 9270055, 1482003, 20000, 0, 8), +(20102, 9270055, 1472007, 60000, 0, 9), +(20103, 9270055, 1472004, 30000, 0, 10), +(20104, 9270055, 1472001, 20000, 0, 11), +(20105, 9270055, 1462005, 250000, 0, 12), +(20106, 9270055, 1462004, 200000, 0, 13), +(20107, 9270055, 1462000, 30000, 0, 14), +(20108, 9270055, 1452007, 375000, 0, 15), +(20109, 9270055, 1452006, 250000, 0, 16), +(20110, 9270055, 1452005, 150000, 0, 17), +(20111, 9270055, 1442009, 300000, 0, 18), +(20112, 9270055, 1442003, 175000, 0, 19), +(20113, 9270055, 1442001, 60000, 0, 20), +(20114, 9270055, 1432005, 225000, 0, 21), +(20115, 9270055, 1432003, 175000, 0, 22), +(20116, 9270055, 1432002, 60000, 0, 23), +(20117, 9270055, 1422007, 250000, 0, 24), +(20118, 9270055, 1422008, 200000, 0, 25), +(20119, 9270055, 1422001, 45000, 0, 26), +(20120, 9270055, 1412005, 250000, 0, 27), +(20121, 9270055, 1412004, 200000, 0, 28), +(20122, 9270055, 1412006, 45000, 0, 29), +(20123, 9270055, 1402007, 450000, 0, 30), +(20124, 9270055, 1402006, 350000, 0, 31), +(20125, 9270055, 1402002, 150000, 0, 32), +(20126, 9270055, 1382002, 20000, 0, 33), +(20127, 9270055, 1372000, 400000, 0, 34), +(20128, 9270055, 1372001, 175000, 0, 35), +(20129, 9270055, 1372003, 38000, 0, 36), +(20130, 9270055, 1332011, 425000, 0, 37), +(20131, 9270055, 1332014, 375000, 0, 38), +(20132, 9270055, 1332001, 200000, 0, 39), +(20133, 9270055, 1332012, 40000, 0, 40), +(20134, 9270055, 1332009, 42000, 0, 41), +(20135, 9270055, 1322016, 175000, 0, 42), +(20136, 9270055, 1322015, 100000, 0, 43), +(20137, 9270055, 1322014, 40000, 0, 44), +(20138, 9270055, 1312007, 175000, 0, 45), +(20139, 9270055, 1312006, 100000, 0, 46), +(20140, 9270055, 1312005, 40000, 0, 47), +(20141, 9270055, 1302009, 225000, 0, 48), +(20142, 9270055, 1302004, 100000, 0, 49), +(20143, 9270055, 1302008, 40000, 0, 50), +(20144, 9270056, 1002625, 75000, 0, 104), +(20145, 9270056, 1052113, 120000, 0, 108), +(20146, 9270056, 1052110, 100000, 0, 112), +(20147, 9270056, 1061069, 160000, 0, 116), +(20148, 9270056, 1061070, 160000, 0, 120), +(20149, 9270056, 1060072, 160000, 0, 124), +(20150, 9270056, 1060071, 160000, 0, 128), +(20151, 9270056, 1060052, 108000, 0, 132), +(20152, 9270056, 1060050, 108000, 0, 136), +(20153, 9270056, 1060051, 108000, 0, 140), +(20154, 9270056, 1051009, 111000, 0, 144), +(20155, 9270056, 1051008, 111000, 0, 148), +(20156, 9270056, 1051007, 111000, 0, 152), +(20157, 9270056, 1041074, 180000, 0, 156), +(20158, 9270056, 1041075, 180000, 0, 160), +(20159, 9270056, 1040083, 180000, 0, 164), +(20160, 9270056, 1040082, 180000, 0, 168), +(20161, 9270056, 1040061, 114000, 0, 172), +(20162, 9270056, 1040062, 114000, 0, 176), +(20163, 9270056, 1040063, 114000, 0, 180), +(20164, 9270056, 1002180, 100000, 0, 184), +(20165, 9270056, 1002179, 100000, 0, 188), +(20166, 9270056, 1002178, 100000, 0, 192), +(20167, 9270056, 1002177, 100000, 0, 196), +(20168, 9270056, 1002176, 100000, 0, 200), +(20169, 9270056, 1061080, 160000, 0, 204), +(20170, 9270056, 1061081, 160000, 0, 208), +(20171, 9270056, 1061062, 108000, 0, 212), +(20172, 9270056, 1061060, 108000, 0, 216), +(20173, 9270056, 1061064, 108000, 0, 220), +(20174, 9270056, 1061061, 108000, 0, 224), +(20175, 9270056, 1060069, 160000, 0, 228), +(20176, 9270056, 1060070, 160000, 0, 232), +(20177, 9270056, 1060063, 108000, 0, 236), +(20178, 9270056, 1060061, 108000, 0, 240), +(20179, 9270056, 1060065, 108000, 0, 244), +(20180, 9270056, 1060062, 108000, 0, 248), +(20181, 9270056, 1041081, 180000, 0, 252), +(20182, 9270056, 1041082, 180000, 0, 256), +(20183, 9270056, 1041067, 114000, 0, 260), +(20184, 9270056, 1041065, 114000, 0, 264), +(20185, 9270056, 1041069, 114000, 0, 268), +(20186, 9270056, 1041066, 114000, 0, 272), +(20187, 9270056, 1040079, 180000, 0, 276), +(20188, 9270056, 1040081, 180000, 0, 280), +(20189, 9270056, 1040076, 114000, 0, 284), +(20190, 9270056, 1040074, 114000, 0, 288), +(20191, 9270056, 1040073, 114000, 0, 292), +(20192, 9270056, 1040072, 114000, 0, 296), +(20193, 9270056, 1002137, 100000, 0, 300), +(20194, 9270056, 1002135, 100000, 0, 304), +(20195, 9270056, 1002139, 100000, 0, 308), +(20196, 9270056, 1002138, 100000, 0, 312), +(20197, 9270056, 1061047, 120000, 0, 316), +(20198, 9270056, 1061048, 120000, 0, 320), +(20199, 9270056, 1051027, 450000, 0, 324), +(20200, 9270056, 1051024, 450000, 0, 328), +(20201, 9270056, 1051025, 450000, 0, 332), +(20202, 9270056, 1051023, 450000, 0, 336), +(20203, 9270056, 1050037, 450000, 0, 340), +(20204, 9270056, 1050036, 450000, 0, 344), +(20205, 9270056, 1050038, 450000, 0, 348), +(20206, 9270056, 1050035, 450000, 0, 352), +(20207, 9270056, 1050002, 300000, 0, 356), +(20208, 9270056, 1050031, 300000, 0, 360), +(20209, 9270056, 1041051, 120000, 0, 364), +(20210, 9270056, 1041052, 120000, 0, 368), +(20211, 9270056, 1002144, 96000, 0, 372), +(20212, 9270056, 1002143, 96000, 0, 376), +(20213, 9270056, 1002142, 96000, 0, 380), +(20214, 9270056, 1002141, 96000, 0, 384), +(20215, 9270056, 1092002, 200000, 0, 388), +(20216, 9270056, 1092001, 100000, 0, 392), +(20217, 9270056, 1061084, 180000, 0, 396), +(20218, 9270056, 1061083, 180000, 0, 400), +(20219, 9270056, 1060074, 180000, 0, 404), +(20220, 9270056, 1060075, 180000, 0, 408), +(20221, 9270056, 1051014, 112500, 0, 412), +(20222, 9270056, 1051001, 112500, 0, 416), +(20223, 9270056, 1050021, 112500, 0, 420), +(20224, 9270056, 1050000, 112500, 0, 424), +(20225, 9270056, 1041085, 200000, 0, 428), +(20226, 9270056, 1041084, 200000, 0, 432), +(20227, 9270056, 1040085, 200000, 0, 436), +(20228, 9270056, 1040000, 200000, 0, 440), +(20229, 9270056, 1002004, 160000, 0, 444), + +(20230, 9270065, 2061000, 1, 0, 1), +(20231, 9270065, 2060000, 1, 0, 2), +(20232, 9270065, 2030000, 400, 0, 3), +(20233, 9270065, 2050003, 500, 0, 4), +(20234, 9270065, 2050002, 300, 0, 5), +(20235, 9270065, 2050001, 200, 0, 6), +(20236, 9270065, 2050000, 200, 0, 7), +(20237, 9270065, 2022215, 6800, 0, 8), +(20238, 9270065, 2022214, 3200, 0, 9), +(20239, 9270065, 2022211, 6400, 0, 10), +(20240, 9270065, 2022210, 3200, 0, 11), +(20241, 9270065, 2022209, 1600, 0, 12), +(20242, 9270065, 2022208, 1000, 0, 13), +(20243, 9270065, 2022207, 2600, 0, 14), +(20244, 9270065, 2022206, 2200, 0, 15), +(20245, 9270065, 2022205, 1800, 0, 16), +(20246, 9270065, 2022204, 1200, 0, 17), +(20247, 9270065, 2022203, 800, 0, 18), +(20248, 9270065, 2022480, 12000, 0, 19), +(20249, 9270065, 2022479, 3800, 0, 20), +(20250, 9270065, 2022478, 3200, 0, 21), +(20251, 9270065, 2022477, 9200, 0, 22), +(20252, 9270065, 2022476, 4200, 0, 23); CREATE TABLE IF NOT EXISTS `shops` ( `shopid` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -20871,7 +21060,11 @@ INSERT INTO `shops` (`shopid`, `npcid`) VALUES (9999999, 9001002), (1337, 11000), (9000069, 9000069), -(1338, 9090000); +(1338, 9090000), +(9270055, 9270055), +(9270056, 9270056), +(9270057, 9270057), +(9270065, 9270065); -- Rudi Shop (Happyville) INSERT INTO `shops` (`shopid`, `npcid`) VALUES ( 57, 2002001 ); diff --git a/sql/db_drops.sql b/sql/db_drops.sql index e7aa889240..86c21bd006 100644 --- a/sql/db_drops.sql +++ b/sql/db_drops.sql @@ -11356,7 +11356,6 @@ (9300080, 1082204, 1, 1, 0, 700), (9300241, 1082204, 1, 1, 0, 700), (9420512, 4000383, 1, 1, 0, 200000), -(9420512, 4000381, 1, 1, 0, 200000), (9420512, 2070005, 1, 1, 0, 400), (9420512, 2041022, 1, 1, 0, 750), (9420512, 2043301, 1, 1, 0, 750), @@ -19129,10 +19128,51 @@ (9400640, 1002281, 1, 1, 0, 1500), (9400640, 1082074, 1, 1, 0, 2000), (9400640, 1002285, 1, 1, 0, 1500), -(9400640, 1002210, 1, 1, 0, 2000); +(9400640, 1002210, 1, 1, 0, 2000), +(9420544, 1003023, 1, 1, 0, 50000), +(9420544, 1003024, 1, 1, 0, 50000), +(9420549, 1003025, 1, 1, 0, 50000), +(9420549, 1003026, 1, 1, 0, 50000); # (dropperid, itemid, minqty, maxqty, questid, chance) + # delete item drops from other mobs named Freezer + DELETE FROM temp_data WHERE dropperid=9300090; + DELETE FROM temp_data WHERE dropperid=9420501; + + # reinsert other Freezer's data + INSERT IGNORE INTO temp_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) VALUES +(9420501, 0, 92, 138, 0, 400000), +(9420501, 4000372, 1, 1, 0, 300000), +(9420501, 400003, 1, 1, 0, 10000), +(9420501, 400002, 1, 1, 0, 10000), +(9420501, 404000, 1, 1, 0, 300), +(9420501, 4010005, 1, 1, 0, 300), +(9420501, 2043301, 1, 1, 0, 1000), +(9420501, 1072103, 1, 1, 0, 2000), +(9420501, 1032008, 1, 1, 0, 1800), +(9420501, 1050011, 1, 1, 0, 1800), +(9420501, 1040044, 1, 1, 0, 2000), +(9420501, 1060033, 1, 1, 0, 2000), +(9420501, 1302017, 1, 1, 0, 1800), +(9420501, 2048005, 1, 1, 0, 1000), +(9420501, 2020028, 1, 1, 0, 20000), +(9420501, 1050051, 1, 1, 0, 1800), +(9420501, 1040099, 1, 1, 0, 2000), +(9420501, 1060088, 1, 1, 0, 2000), +(9420501, 1050058, 1, 1, 0, 1800), +(9420501, 1332020, 1, 1, 0, 1500), +(9420501, 4006001, 1, 1, 0, 5000), +(9420501, 4030012, 1, 1, 0, 300), +(9420501, 1072297, 1, 1, 0, 2000), +(9420501, 1482001, 1, 1, 0, 2000), +(9420501, 1482005, 1, 1, 0, 2000), +(9420501, 1492005, 1, 1, 0, 2000); + + INSERT IGNORE INTO temp_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) VALUES +(9300090, 0, 1500, 4000, 0, 400000), +(9300090, 4001114, 1, 1, 0, 400000); + # delete item drops from Seruf in inactive form DELETE FROM temp_data WHERE dropperid=4220001; diff --git a/src/client/MapleCharacter.java b/src/client/MapleCharacter.java index aa9f0c6cec..227a9397a6 100644 --- a/src/client/MapleCharacter.java +++ b/src/client/MapleCharacter.java @@ -288,6 +288,8 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject { private long petLootCd; private long lastHpDec = 0; private int newWarpMap = -1; + private boolean canWarpMap = true; //only one "warp" must be used per call, and this will define the right one. + private int canWarpCounter = 0; //counts how many times "inner warps" have been called. private MapleCharacter() { useCS = false; @@ -1141,6 +1143,12 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject { private void eventChangedMap(int map) { if (getEventInstance() != null) getEventInstance().changedMap(this, map); } + + public void changeMapBanish(int mapid, String portal, String msg) { + dropMessage(5, msg); + MapleMap map_ = client.getChannelServer().getMapFactory().getMap(mapid); + changeMap(map_, map_.getPortal(portal)); + } public void changeMap(int map) { MapleMap warpMap; @@ -1190,21 +1198,31 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject { changeMap(to, to.getPortal(0)); } - public void changeMap(final MapleMap to, final MaplePortal pto) { - eventChangedMap(to.getId()); + // not always the MapleMap target will be the map the player will be inserted, why would this even exist? Whatever. + public void changeMap(final MapleMap target, final MaplePortal pto) { + canWarpCounter++; + + eventChangedMap(target.getId()); // player can be dropped from an event here, hence the new warping target. + MapleMap to = getWarpMap(target.getId()); changeMapInternal(to, pto.getPosition(), MaplePacketCreator.getWarpToMap(to, pto.getId(), this)); + canWarpMap = false; + + canWarpCounter--; + if(canWarpCounter == 0) canWarpMap = true; } - public void changeMap(final MapleMap to, final Point pos) { + public void changeMap(final MapleMap target, final Point pos) { + canWarpCounter++; + + eventChangedMap(target.getId()); + MapleMap to = getWarpMap(target.getId()); changeMapInternal(to, pos, MaplePacketCreator.getWarpToMap(to, 0x80, this));//Position :O (LEFT) + canWarpMap = false; + + canWarpCounter--; + if(canWarpCounter == 0) canWarpMap = true; } - - public void changeMapBanish(int mapid, String portal, String msg) { - dropMessage(5, msg); - MapleMap map_ = client.getChannelServer().getMapFactory().getMap(mapid); - changeMap(map_, map_.getPortal(portal)); - } - + private boolean buffMapProtection() { for(Entry mbs : effects.entrySet()) { if(mbs.getKey() == MapleBuffStat.MAP_PROTECTION) { @@ -1226,8 +1244,9 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject { } private void changeMapInternal(final MapleMap to, final Point pos, final byte[] warpPacket) { - this.closePlayerInteractions(); + if(!canWarpMap) return; + this.closePlayerInteractions(); client.announce(warpPacket); map.removePlayer(this); if (client.getChannelServer().getPlayerStorage().getCharacterById(getId()) != null) { @@ -1249,6 +1268,8 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject { //alas, new map has been specified when a warping was being processed... if(newWarpMap != -1) { + canWarpMap = true; + int temp = newWarpMap; newWarpMap = -1; changeMap(temp); diff --git a/src/client/command/Commands.java b/src/client/command/Commands.java index e472f4d1ab..2b84627e97 100644 --- a/src/client/command/Commands.java +++ b/src/client/command/Commands.java @@ -1041,11 +1041,10 @@ public class Commands { return true; } if (player.getEventInstance() != null) { - player.getEventInstance().removePlayer(player); + player.getEventInstance().leftParty(player); } - player.changeMap(target, target.getPortal(0)); + player.changeMap(target, target.getRandomPlayerSpawnpoint()); } catch (Exception ex) { - ex.printStackTrace(); player.yellowMessage("Map ID " + sub[1] + " is invalid."); return true; } diff --git a/src/scripting/AbstractPlayerInteraction.java b/src/scripting/AbstractPlayerInteraction.java index c3ff6a8460..f86479138c 100644 --- a/src/scripting/AbstractPlayerInteraction.java +++ b/src/scripting/AbstractPlayerInteraction.java @@ -89,9 +89,16 @@ public class AbstractPlayerInteraction { return c.getPlayer().getMap(); } + public int getMarketPortalId(int mapId) { + return getMarketPortalId(getWarpMap(mapId)); + } + + private int getMarketPortalId(MapleMap map) { + return (map.findMarketPortal() != null) ? map.findMarketPortal().getId() : map.getRandomPlayerSpawnpoint().getId(); + } + public void warp(int mapid) { - MapleMap map = getWarpMap(mapid); - getPlayer().changeMap(map, map.getRandomPlayerSpawnpoint()); + getPlayer().changeMap(mapid); } public void warp(int map, int portal) { @@ -107,11 +114,20 @@ public class AbstractPlayerInteraction { } public void warpParty(int id) { - for (MapleCharacter mc : getPartyMembers()) { - if (id == 925020100) { - mc.setDojoParty(true); - } - mc.changeMap(getWarpMap(id)); + if (getPlayer().getParty() != null) { + MaplePartyCharacter leader = getPlayer().getParty().getMemberById(getPlayer().getParty().getLeaderId()); + if(leader != null) { + int leaderMapId = leader.getMapId(); + + for (MapleCharacter mc : getPartyMembers()) { + if(mc.getMapId() == leaderMapId) { + if (id == 925020100) { + mc.setDojoParty(true); + } + mc.changeMap(id); + } + } + } } } diff --git a/src/scripting/event/EventInstanceManager.java b/src/scripting/event/EventInstanceManager.java index 0b0998a5d6..918f136215 100644 --- a/src/scripting/event/EventInstanceManager.java +++ b/src/scripting/event/EventInstanceManager.java @@ -524,12 +524,7 @@ public class EventInstanceManager { cancelSchedule(); killCount.clear(); - if (expedition != null) { - expedition.dispose(true); - em.getChannelServer().getExpeditions().remove(expedition); - - expedition = null; - } + disposeExpedition(); if(!eventCleared) em.disposeInstance(name); em = null; } @@ -863,9 +858,19 @@ public class EventInstanceManager { } } + private void disposeExpedition() { + if (expedition != null) { + expedition.dispose(eventCleared); + em.getChannelServer().getExpeditions().remove(expedition); + + expedition = null; + } + } + public final void setEventCleared() { eventCleared = true; em.disposeInstance(name); + disposeExpedition(); } public final boolean isEventCleared() { diff --git a/src/scripting/reactor/ReactorActionManager.java b/src/scripting/reactor/ReactorActionManager.java index a2735514ac..3e17b54adb 100644 --- a/src/scripting/reactor/ReactorActionManager.java +++ b/src/scripting/reactor/ReactorActionManager.java @@ -29,26 +29,34 @@ import java.awt.Point; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.concurrent.ScheduledFuture; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.script.Invocable; +import javax.script.ScriptException; import scripting.AbstractPlayerInteraction; +import scripting.event.EventInstanceManager; +import scripting.event.EventManager; import server.MapleItemInformationProvider; +import server.TimerManager; import server.life.MapleLifeFactory; -import server.life.MapleNPC; import server.maps.MapMonitor; import server.maps.MapleReactor; import server.maps.ReactorDropEntry; -import tools.MaplePacketCreator; /** - * @author Lerk + * @author Lerk, Ronan */ public class ReactorActionManager extends AbstractPlayerInteraction { private MapleReactor reactor; private MapleClient client; + private Invocable iv; - public ReactorActionManager(MapleClient c, MapleReactor reactor) { + public ReactorActionManager(MapleClient c, MapleReactor reactor, Invocable iv) { super(c); this.reactor = reactor; this.client = c; + this.iv = iv; } public void dropItems() { @@ -154,4 +162,32 @@ public class ReactorActionManager extends AbstractPlayerInteraction { public void spawnFakeMonster(int id) { reactor.getMap().spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(id), getPosition()); } + + public ScheduledFuture schedule(String methodName, long delay) { + return schedule(methodName, null, delay); + } + + public ScheduledFuture schedule(final String methodName, final EventInstanceManager eim, long delay) { + return TimerManager.getInstance().schedule(new Runnable() { + public void run() { + try { + iv.invokeFunction(methodName, eim); + } catch (ScriptException | NoSuchMethodException ex) { + Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + } + } + }, delay); + } + + public ScheduledFuture scheduleAtTimestamp(final String methodName, long timestamp) { + return TimerManager.getInstance().scheduleAtTimestamp(new Runnable() { + public void run() { + try { + iv.invokeFunction(methodName, (Object) null); + } catch (ScriptException | NoSuchMethodException ex) { + Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + } + } + }, timestamp); + } } \ No newline at end of file diff --git a/src/scripting/reactor/ReactorScriptManager.java b/src/scripting/reactor/ReactorScriptManager.java index 9e08424753..9ea6c59839 100644 --- a/src/scripting/reactor/ReactorScriptManager.java +++ b/src/scripting/reactor/ReactorScriptManager.java @@ -50,11 +50,10 @@ public class ReactorScriptManager extends AbstractScriptManager { public void onHit(MapleClient c, MapleReactor reactor) { try { - ReactorActionManager rm = new ReactorActionManager(c, reactor); Invocable iv = getInvocable("reactor/" + reactor.getId() + ".js", c); - if (iv == null) { - return; - } + if (iv == null) return; + + ReactorActionManager rm = new ReactorActionManager(c, reactor, iv); engine.put("rm", rm); iv.invokeFunction("hit"); } catch(final NoSuchMethodException e) { @@ -67,11 +66,10 @@ public class ReactorScriptManager extends AbstractScriptManager { public void act(MapleClient c, MapleReactor reactor) { try { - ReactorActionManager rm = new ReactorActionManager(c, reactor); Invocable iv = getInvocable("reactor/" + reactor.getId() + ".js", c); - if (iv == null) { - return; - } + if (iv == null) return; + + ReactorActionManager rm = new ReactorActionManager(c, reactor, iv); engine.put("rm", rm); iv.invokeFunction("act"); } catch (final ScriptException | NoSuchMethodException | NullPointerException e) { @@ -114,11 +112,10 @@ public class ReactorScriptManager extends AbstractScriptManager { public synchronized void touching(MapleClient c, MapleReactor reactor, boolean touching) { try { - ReactorActionManager rm = new ReactorActionManager(c, reactor); Invocable iv = getInvocable("reactor/" + reactor.getId() + ".js", c); - if (iv == null) { - return; - } + if (iv == null) return; + + ReactorActionManager rm = new ReactorActionManager(c, reactor, iv); engine.put("rm", rm); if (touching) { iv.invokeFunction("touch"); diff --git a/src/server/MapleItemInformationProvider.java b/src/server/MapleItemInformationProvider.java index 91aba8ebf6..ae338c88fc 100644 --- a/src/server/MapleItemInformationProvider.java +++ b/src/server/MapleItemInformationProvider.java @@ -561,7 +561,6 @@ public class MapleItemInformationProvider { Map stats = this.getEquipStats(scrollId); Map eqstats = this.getEquipStats(equip.getItemId()); - System.out.println("GM: " + isGM + "\tWS: " + usingWhiteScroll + "\tITEM: " + scrollId); if (((nEquip.getUpgradeSlots() > 0 || isCleanSlate(scrollId))) || isGM) { if(isGM || rollSuccessChance((double)stats.get("success"))) { short flag = nEquip.getFlag(); diff --git a/src/server/MapleStatEffect.java b/src/server/MapleStatEffect.java index d5ad7aeadc..ff2ee71593 100644 --- a/src/server/MapleStatEffect.java +++ b/src/server/MapleStatEffect.java @@ -861,7 +861,7 @@ public class MapleStatEffect { door.getTown().spawnDoor(door.getTownDoor()); } else { if(door.getOwnerId() == -1) applyto.dropMessage(5, "There are no door portals available for the town at this moment. Try again later."); - else applyto.dropMessage(5, "This position is not suitable for a Mystic Door, try elsewhere."); + else applyto.dropMessage(5, "Mystic Door cannot be cast on a slope, try elsewhere."); applyto.cancelBuffStats(MapleBuffStat.SOULARROW); // cancel door buff } diff --git a/src/server/expeditions/MapleExpedition.java b/src/server/expeditions/MapleExpedition.java index 1555951a3b..07899f87fd 100644 --- a/src/server/expeditions/MapleExpedition.java +++ b/src/server/expeditions/MapleExpedition.java @@ -111,9 +111,8 @@ public class MapleExpedition { leader.getClient().getChannelServer().getExpeditions().remove(exped); startMap.broadcastMessage(MaplePacketCreator.serverNotice(6, "Time limit has been reached. Expedition has been disbanded.")); - broadcastExped(MaplePacketCreator.removeClock()); + dispose(false); } - dispose(false); } }, type.getRegistrationTime() * 60 * 1000); } diff --git a/src/server/maps/MapleMap.java b/src/server/maps/MapleMap.java index 8e8c8e7b1c..610cdcd69a 100644 --- a/src/server/maps/MapleMap.java +++ b/src/server/maps/MapleMap.java @@ -1604,7 +1604,7 @@ public class MapleMap { } }, time); } - + public void addPlayer(final MapleCharacter chr) { chrWLock.lock(); try { @@ -1849,6 +1849,16 @@ public class MapleMap { } return closest; } + + public MaplePortal findMarketPortal() { + for (MaplePortal portal : portals.values()) { + String ptScript = portal.getScriptName(); + if(ptScript != null && ptScript.contains("market")) { + return portal; + } + } + return null; + } public Collection getPortals() { return Collections.unmodifiableCollection(portals.values()); @@ -2769,7 +2779,7 @@ public class MapleMap { private boolean specialEquip() {//Maybe I shouldn't use fieldType :\ return fieldType == 4 || fieldType == 19; } - + public void setCoconut(MapleCoconut nut) { this.coconut = nut; } diff --git a/src/server/maps/MapleMiniDungeon.java b/src/server/maps/MapleMiniDungeon.java index b702b62ec3..1acdc3a94a 100644 --- a/src/server/maps/MapleMiniDungeon.java +++ b/src/server/maps/MapleMiniDungeon.java @@ -42,7 +42,7 @@ public enum MapleMiniDungeon { THE_RESTORING_MEMORY(240040511, 240040800, 19), NEWT_SECURED_ZONE(240040520, 240040900, 19), PILLAGE_OF_TREASURE_ISLAND(251010402, 251010410, 30), - ; + LONGEST_RIDE_ON_BYEBYE_STATION(551030000, 551030001, 19); private int baseId; private int dungeonId; diff --git a/src/server/quest/actions/ItemAction.java b/src/server/quest/actions/ItemAction.java index 0ad572ee72..61fe2c5ad2 100644 --- a/src/server/quest/actions/ItemAction.java +++ b/src/server/quest/actions/ItemAction.java @@ -22,7 +22,6 @@ package server.quest.actions; import client.MapleCharacter; -import client.MapleJob; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; @@ -43,10 +42,10 @@ import tools.Randomizer; /** * - * @author Tyler (Twdtwd) + * @author Tyler (Twdtwd), Ronan */ public class ItemAction extends MapleQuestAction { - Map items = new HashMap<>(); + List items = new ArrayList<>(); public ItemAction(MapleQuest quest, MapleData data) { super(MapleQuestActionType.ITEM, quest); @@ -73,27 +72,25 @@ public class ItemAction extends MapleQuestAction { if (iEntry.getChildByPath("job") != null) job = MapleDataTool.getInt(iEntry.getChildByPath("job")); - items.put(id, new ItemData(id, count, prop, job, gender)); + items.add(new ItemData(id, count, prop, job, gender)); } } @Override public void run(MapleCharacter chr, Integer extSelection) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - Map props = new HashMap<>(); - for(ItemData item : items.values()) { + int props = 0, rndProps = 0, accProps = 0; + for(ItemData item : items) { if(item.getProp() != null && item.getProp() != -1 && canGetItem(item, chr)) { - for (int i = 0; i < item.getProp(); i++) { - props.put(props.size(), item.getId()); - } + props += item.getProp(); } } - int selection = 0; + int extNum = 0; - if (props.size() > 0) { - selection = props.get(Randomizer.nextInt(props.size())); + if (props > 0) { + rndProps = Randomizer.nextInt(props); } - for (ItemData iEntry : items.values()) { + for (ItemData iEntry : items) { if (!canGetItem(iEntry, chr)) { continue; } @@ -101,8 +98,15 @@ public class ItemAction extends MapleQuestAction { if(iEntry.getProp() == -1) { if(extSelection != extNum++) continue; - } else if(iEntry.getId() != selection) - continue; + } else { + accProps += iEntry.getProp(); + + if(accProps <= rndProps) { + continue; + } else { + accProps = Integer.MIN_VALUE; + } + } } if(iEntry.getCount() < 0) { // Remove Items @@ -135,7 +139,7 @@ public class ItemAction extends MapleQuestAction { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); EnumMap props = new EnumMap<>(MapleInventoryType.class); List> itemList = new ArrayList<>(); - for(ItemData item : items.values()) { + for(ItemData item : items) { if (!canGetItem(item, chr)) { continue; } @@ -188,17 +192,6 @@ public class ItemAction extends MapleQuestAction { break; } } - /* - if (!jobFound && item.jobEx > 0) { - final List codeEx = getJobBySimpleEncoding(item.jobEx); - for (int codec : codeEx) { - if ((codec / 100 % 10) == (chr.getJob().getId() / 100 % 10)) { - jobFound = true; - break; - } - } - } - */ return jobFound; } return true; diff --git a/todo.txt b/todo.txt index 179e6a1760..6d2da29ada 100644 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,5 @@ gaviota? cash drop from equipped -NPCs masteria -PQs \ No newline at end of file +PQs +quests doesnt need to have a free slot to give an stackable item... \ No newline at end of file diff --git a/wz/Map.wz/Map/Map5/541000000.img.xml b/wz/Map.wz/Map/Map5/541000000.img.xml index b0e0bf126c..c234a627f7 100644 --- a/wz/Map.wz/Map/Map5/541000000.img.xml +++ b/wz/Map.wz/Map/Map5/541000000.img.xml @@ -1,3883 +1,21 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -3888,202 +26,4101 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wz/Map.wz/Map/Map5/541000100.img.xml b/wz/Map.wz/Map/Map5/541000100.img.xml index 6a8e14ab17..f432b11d99 100644 --- a/wz/Map.wz/Map/Map5/541000100.img.xml +++ b/wz/Map.wz/Map/Map5/541000100.img.xml @@ -1,5016 +1,21 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -5021,70 +26,5054 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wz/Map.wz/Map/Map5/541000300.img.xml b/wz/Map.wz/Map/Map5/541000300.img.xml index e5d816bd64..6f55c337a2 100644 --- a/wz/Map.wz/Map/Map5/541000300.img.xml +++ b/wz/Map.wz/Map/Map5/541000300.img.xml @@ -1,5126 +1,21 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -5131,94 +26,5208 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wz/Map.wz/Map/Map5/541010110.img.xml b/wz/Map.wz/Map/Map5/541010110.img.xml index 7672572f28..0cc9b03c51 100644 --- a/wz/Map.wz/Map/Map5/541010110.img.xml +++ b/wz/Map.wz/Map/Map5/541010110.img.xml @@ -1,2002 +1,21 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -2007,22 +26,2092 @@ - - - - - - - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wz/String.wz/MonsterBook.img.xml b/wz/String.wz/MonsterBook.img.xml index d86ce09b45..559ad9277b 100644 --- a/wz/String.wz/MonsterBook.img.xml +++ b/wz/String.wz/MonsterBook.img.xml @@ -166,33 +166,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1269,11 +1268,12 @@ - - - - - + + + + + + @@ -2995,62 +2995,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6154,12 +6153,13 @@ - - - - - - + + + + + + + @@ -6187,14 +6187,15 @@ - - - - - - - - + + + + + + + + + @@ -13480,28 +13481,27 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -14059,7 +14059,7 @@ - + @@ -14069,7 +14069,7 @@ - +