From d3949f951be9c45781bfa790248a2ed17885f470 Mon Sep 17 00:00:00 2001 From: Ethan Date: Tue, 17 Mar 2020 17:06:45 -0400 Subject: [PATCH] Start to witchs house --- .idea/workspace.xml | 1157 +++++++++++++++-- .../RS-2009/META-INF/RS-2009.kotlin_module | Bin 0 -> 16 bytes .../RS-2009/org/crandor/ServerConstants.class | Bin 5385 -> 5575 bytes .../crandor/game/container/Container.class | Bin 14971 -> 15098 bytes .../content/ame/AntiMacroDialogue$1.class | Bin 1439 -> 1436 bytes .../content/dialogue/DialoguePlugin.class | Bin 5586 -> 5771 bytes .../game/content/eco/ge/GrandExchange$1.class | Bin 1648 -> 1648 bytes .../game/content/eco/ge/GrandExchange$2.class | Bin 2098 -> 2098 bytes .../game/content/eco/ge/GrandExchange$3.class | Bin 1497 -> 1497 bytes .../game/content/eco/ge/GrandExchange$4.class | Bin 1222 -> 1222 bytes .../game/content/eco/ge/GrandExchange.class | Bin 18855 -> 18685 bytes .../global/action/ClimbActionHandler$1.class | Bin 1700 -> 1699 bytes .../ClimbActionHandler$ClimbDialogue$1.class | Bin 1403 -> 1402 bytes .../ClimbActionHandler$ClimbDialogue$2.class | Bin 1405 -> 1404 bytes .../global/consumable/Consumables.class | Bin 14406 -> 14496 bytes .../game/content/global/jobs/Job.class | Bin 0 -> 734 bytes .../global/jobs/JobsMinigameManager.class | Bin 0 -> 1527 bytes .../impl/GatheringJob$GatheringJobs.class | Bin 0 -> 5938 bytes .../global/jobs/impl/GatheringJob.class | Bin 0 -> 2360 bytes .../jobs/impl/SlayingJob$SlayingJobs.class | Bin 0 -> 2249 bytes .../content/global/jobs/impl/SlayingJob.class | Bin 0 -> 2640 bytes .../game/content/global/shop/Shop.class | Bin 17875 -> 18047 bytes .../crandor/game/content/skill/Skills.class | Bin 15807 -> 16238 bytes .../limestone/ChiselLimestonePulse.class | Bin 0 -> 2667 bytes .../content/skill/free/magic/MagicSpell.class | Bin 11923 -> 11954 bytes .../skill/member/farming/patch/Bushes$1.class | Bin 1069 -> 1113 bytes .../member/farming/patch/FruitTrees$1.class | Bin 1016 -> 1060 bytes .../skill/member/hunter/bnet/BNetPulse.class | Bin 6799 -> 6871 bytes .../content/skill/member/slayer/Tasks$1.class | Bin 966 -> 916 bytes .../skill/member/slayer/Tasks$10.class | Bin 968 -> 0 bytes .../skill/member/slayer/Tasks$11.class | Bin 968 -> 0 bytes .../skill/member/slayer/Tasks$12.class | Bin 968 -> 0 bytes .../skill/member/slayer/Tasks$13.class | Bin 968 -> 0 bytes .../skill/member/slayer/Tasks$14.class | Bin 968 -> 0 bytes .../skill/member/slayer/Tasks$15.class | Bin 918 -> 0 bytes .../skill/member/slayer/Tasks$16.class | Bin 995 -> 0 bytes .../content/skill/member/slayer/Tasks$2.class | Bin 966 -> 0 bytes .../content/skill/member/slayer/Tasks$3.class | Bin 966 -> 0 bytes .../content/skill/member/slayer/Tasks$4.class | Bin 966 -> 0 bytes .../content/skill/member/slayer/Tasks$5.class | Bin 966 -> 0 bytes .../content/skill/member/slayer/Tasks$6.class | Bin 966 -> 0 bytes .../content/skill/member/slayer/Tasks$7.class | Bin 966 -> 0 bytes .../content/skill/member/slayer/Tasks$8.class | Bin 966 -> 0 bytes .../content/skill/member/slayer/Tasks$9.class | Bin 966 -> 0 bytes .../content/skill/member/slayer/Tasks.class | Bin 33079 -> 28775 bytes .../member/summoning/familiar/Familiar.class | Bin 20761 -> 20611 bytes .../skill/member/thieving/Pickpocket.class | Bin 12259 -> 12242 bytes .../crandor/game/node/entity/Entity$1.class | Bin 999 -> 999 bytes .../crandor/game/node/entity/Entity$2.class | Bin 1064 -> 1064 bytes .../crandor/game/node/entity/Entity$3.class | Bin 1068 -> 1068 bytes .../crandor/game/node/entity/Entity$4.class | Bin 1006 -> 1006 bytes .../crandor/game/node/entity/Entity$5.class | Bin 922 -> 922 bytes .../org/crandor/game/node/entity/Entity.class | Bin 18183 -> 18312 bytes .../node/entity/combat/CombatPulse$1.class | Bin 986 -> 974 bytes .../node/entity/combat/CombatPulse$2.class | Bin 3215 -> 3208 bytes .../node/entity/combat/CombatPulse$3.class | Bin 3102 -> 3095 bytes .../game/node/entity/combat/CombatPulse.class | Bin 15371 -> 16031 bytes .../entity/combat/CombatSwingHandler.class | Bin 16235 -> 16433 bytes .../combat/handlers/MagicSwingHandler.class | Bin 12244 -> 12262 bytes .../combat/handlers/MeleeSwingHandler.class | Bin 15053 -> 15071 bytes .../combat/handlers/RangeSwingHandler$1.class | Bin 2042 -> 2035 bytes .../combat/handlers/RangeSwingHandler.class | Bin 21183 -> 21209 bytes .../crandor/game/node/entity/npc/NPC$1.class | Bin 1066 -> 1046 bytes .../crandor/game/node/entity/npc/NPC.class | Bin 25030 -> 25421 bytes .../game/node/entity/player/Player.class | Bin 39809 -> 41403 bytes .../node/entity/player/ai/AIPlayer$2.class | Bin 1308 -> 1283 bytes .../player/info/login/PlayerParser.class | Bin 13230 -> 13321 bytes .../entity/player/link/ActivityData.class | Bin 7773 -> 8023 bytes .../node/entity/player/link/IronmanMode.class | Bin 1352 -> 1405 bytes .../mysql/impl/HighscoreSQLHandler.class | Bin 4813 -> 5188 bytes .../mysql/impl/ItemConfigSQLHandler.class | Bin 9070 -> 9135 bytes .../game/system/script/ScriptManager.class | Bin 3269 -> 3392 bytes .../org/crandor/game/world/GameWorld.class | Bin 10578 -> 10714 bytes .../crandor/net/event/LoginWriteEvent.class | Bin 2449 -> 2356 bytes .../net/packet/in/ActionButtonPacket$1.class | Bin 1198 -> 1195 bytes .../packet/in/InterfaceUseOnPacket$1.class | Bin 2449 -> 2451 bytes .../net/registry/AccountRegister.class | Bin 6453 -> 6671 bytes .../RS-2009/org/keldagrim/Main$1.class | Bin 1213 -> 0 bytes .../RS-2009/org/keldagrim/Main$2.class | Bin 849 -> 0 bytes .../RS-2009/org/keldagrim/Main$3.class | Bin 1955 -> 0 bytes .../RS-2009/org/keldagrim/Main$4.class | Bin 1514 -> 0 bytes .../RS-2009/org/keldagrim/Main$5.class | Bin 1192 -> 0 bytes .../RS-2009/org/keldagrim/Main$6.class | Bin 1041 -> 0 bytes .../RS-2009/org/keldagrim/Main$7.class | Bin 853 -> 0 bytes .../RS-2009/org/keldagrim/Main$8.class | Bin 1596 -> 0 bytes .../RS-2009/org/keldagrim/Main.class | Bin 4163 -> 0 bytes .../org/runite/jagex/KeyboardListener.class | Bin 6820 -> 6736 bytes .../runite/jagex/MouseListeningClass.class | Bin 8309 -> 8327 bytes .../bountyhunter/BountyLocateSpell$1.class | Bin 1022 -> 1010 bytes ...angingGuildPlugin$ArcheryTargetPulse.class | Bin 0 -> 4747 bytes .../RangingGuildPlugin$ArmourSalesman.class | Bin 4290 -> 4290 bytes .../RangingGuildPlugin$BowArrowSalesman.class | Bin 2403 -> 2403 bytes .../RangingGuildPlugin$GuardDialogue.class | Bin 2044 -> 2044 bytes ...ingGuildPlugin$LeatherWorkerDialogue.class | Bin 2787 -> 2787 bytes ...ngingGuildPlugin$RangingGuildDoorman.class | Bin 2596 -> 2596 bytes .../RangingGuildPlugin$TownAdvisor.class | Bin 2315 -> 3718 bytes ...gingGuildPlugin$TribalWeaponSalesman.class | Bin 2712 -> 2712 bytes .../RangingGuildPlugin$WarningInterface.class | Bin 2934 -> 2934 bytes .../activity/guild/RangingGuildPlugin.class | Bin 5315 -> 6738 bytes .../activity/jobs/WorkForOptionHandler.class | Bin 0 -> 5001 bytes .../KolodionNPC$KolodionType$1.class | Bin 3938 -> 3931 bytes .../magearena/KolodionSession$1.class | Bin 2103 -> 2096 bytes .../magearena/MageArenaPlugin$2.class | Bin 1469 -> 1462 bytes .../magearena/MageArenaPlugin$3.class | Bin 1922 -> 1915 bytes .../magearena/MageArenaPlugin$4.class | Bin 1697 -> 1690 bytes .../activity/magearena/MageArenaZone$1.class | Bin 1536 -> 1529 bytes .../activity/mta/TelekineticGrabSpell$1.class | Bin 3469 -> 3462 bytes .../activity/mta/impl/GraveyardZone$1.class | Bin 3028 -> 3027 bytes .../PestControlActivityPlugin$1.class | Bin 2598 -> 2595 bytes .../PestControlActivityPlugin$2.class | Bin 1250 -> 1247 bytes .../pestcontrol/monsters/PCShifterNPC$2.class | Bin 1592 -> 1585 bytes .../reward/PCRewardInterface.class | Bin 9991 -> 10026 bytes .../pyramidplunder/GuardMummyDialogue.class | Bin 2423 -> 3281 bytes .../pyramidplunder/PlunderObject.class | Bin 0 -> 1429 bytes .../pyramidplunder/PlunderObjectManager.class | Bin 0 -> 1581 bytes .../PyramidOptionHandler$1.class | Bin 0 -> 1324 bytes .../pyramidplunder/PyramidOptionHandler.class | Bin 3978 -> 5182 bytes .../PyramidPlunderMummyNPC.class | Bin 0 -> 1870 bytes .../pyramidplunder/PyramidPlunderNPC$1.class | Bin 0 -> 1137 bytes .../pyramidplunder/PyramidPlunderNPC.class | Bin 0 -> 4969 bytes .../PyramidPlunderOptions.class | Bin 0 -> 12182 bytes .../PyramidPlunderSwarmNPC.class | Bin 0 -> 1824 bytes .../StrongHoldSecurityPlugin$2.class | Bin 2461 -> 2458 bytes .../playersafety/GuardDialoguePlugin$1.class | Bin 1238 -> 1237 bytes .../tzhaar/TzhaarFightCaveNPC$1.class | Bin 1354 -> 1347 bytes .../tzhaar/TzhaarFightCavesPlugin$1.class | Bin 2111 -> 2104 bytes .../tzhaar/TzhaarFightCavesPlugin$2.class | Bin 1331 -> 1324 bytes .../tzhaar/TzhaarFightCavesPlugin$3.class | Bin 994 -> 987 bytes .../wguild/cyclopes/CyclopesRoom$1.class | Bin 4310 -> 4309 bytes .../wguild/shot/ShotPutRoom$1$1.class | Bin 1634 -> 1633 bytes .../activity/wguild/shot/ShotPutRoom$2.class | Bin 5072 -> 5069 bytes .../special/ChainhitSpecialHandler$1.class | Bin 1720 -> 1717 bytes .../special/ChainhitSpecialHandler$2.class | Bin 1726 -> 1719 bytes .../special/ChainhitSpecialHandler$3.class | Bin 2236 -> 2229 bytes .../special/SnapshotSpecialHandler$1.class | Bin 1957 -> 1950 bytes .../plugin/command/BetaCommandPlugin.class | Bin 19280 -> 19849 bytes .../command/PlayerCommandPlugin$1.class | Bin 1332 -> 1332 bytes .../plugin/command/PlayerCommandPlugin.class | Bin 14259 -> 14142 bytes .../plugin/cutscene/DBRCutscenePlugin$1.class | Bin 1345 -> 1342 bytes ...tscenePlugin$BrugsenBursenDialogue$1.class | Bin 1392 -> 1389 bytes .../plugin/cutscene/JulietDialogue$1.class | Bin 1736 -> 1735 bytes .../plugin/cutscene/JulietDialogue$2.class | Bin 1509 -> 1508 bytes .../RJCutscenePlugin$RomeoDialogue$1.class | Bin 2622 -> 2619 bytes .../RJCutscenePlugin$RomeoDialogue$2.class | Bin 2671 -> 2668 bytes .../plugin/dialogue/AablaDialogue$1.class | Bin 1491 -> 1488 bytes .../plugin/dialogue/AnnaIsaakson.class | Bin 0 -> 2048 bytes .../plugin/dialogue/ArdougneBaker.class | Bin 0 -> 2283 bytes .../dialogue/CaptainBentleyDialogue$1.class | Bin 2297 -> 2294 bytes .../dialogue/CookingDialoguePlugin$2.class | Bin 0 -> 1197 bytes ...aloguePlugin$MeatPlugin$MeatProperty.class | Bin 1171 -> 1171 bytes .../CookingDialoguePlugin$MeatPlugin.class | Bin 3274 -> 3274 bytes .../dialogue/CookingDialoguePlugin.class | Bin 5280 -> 5434 bytes .../dialogue/GertrudesCatDialogue$1.class | Bin 2802 -> 2799 bytes .../dialogue/GertrudesCatDialogue$2.class | Bin 2370 -> 2367 bytes .../dialogue/GertrudesCatDialogue$3.class | Bin 829 -> 826 bytes .../dialogue/GnomeSpiritTreeDialogue$1.class | Bin 2713 -> 2710 bytes .../dialogue/GrillieGroatsDialogue.class | Bin 4815 -> 0 bytes .../plugin/dialogue/HairdresserDialogue.class | Bin 5391 -> 5584 bytes .../plugin/dialogue/HansDialoguePlugin.class | Bin 3217 -> 9927 bytes .../dialogue/KittenInteractDialogue$1.class | Bin 1528 -> 1527 bytes .../dialogue/LokarSearunnerDialogue$1.class | Bin 2297 -> 2294 bytes .../plugin/dialogue/MagicTutorDialogue.class | Bin 8361 -> 8362 bytes .../dialogue/MithrilSeedsDialogue$1.class | Bin 2052 -> 2049 bytes .../plugin/dialogue/PrinceAliDialogue$1.class | Bin 850 -> 849 bytes .../plugin/dialogue/PrinceAliDialogue$2.class | Bin 920 -> 919 bytes .../ProfessorOddensteinPlugin$1.class | Bin 3641 -> 3638 bytes ...RugMerchantDialogue$RugDestination$1.class | Bin 3704 -> 3701 bytes .../plugin/dialogue/ShantayDialogue$1.class | Bin 2011 -> 2008 bytes .../plugin/dialogue/ShantayGuard$1.class | Bin 1394 -> 1391 bytes .../dialogue/SilkMerchantPlugin$1.class | Bin 1108 -> 1105 bytes .../plugin/dialogue/SimonTempleton.class | Bin 0 -> 7768 bytes .../plugin/dialogue/SorcceresDialouge$1.class | Bin 1278 -> 1275 bytes .../plugin/dialogue/ThessaliaDialogue.class | Bin 7201 -> 6773 bytes .../plugin/dialogue/TownCrierDialogue$1.class | Bin 668 -> 667 bytes .../plugin/dialogue/TraibornDialogue$1.class | Bin 1356 -> 1355 bytes ...asEvent$ChristmasEventOptionPlugin$1.class | Bin 2410 -> 2407 bytes .../ChristmasEvent$PeltOptionHandler$1.class | Bin 2204 -> 2201 bytes .../ChristmasEvent$SnowmanItemHandler$1.class | Bin 1100 -> 1099 bytes ...ketofEggsEvent$EasterBunnyDialogue$1.class | Bin 2229 -> 2226 bytes ...ketofEggsEvent$EasterBunnyDialogue$2.class | Bin 2230 -> 2227 bytes .../halloween/DeathMansionEvent$10.class | Bin 1097 -> 1094 bytes .../halloween/DeathMansionEvent$4.class | Bin 2304 -> 2301 bytes .../halloween/DeathMansionEvent$5.class | Bin 2161 -> 2158 bytes .../halloween/DeathMansionEvent$6.class | Bin 2925 -> 2922 bytes .../halloween/DeathMansionEvent$7.class | Bin 2821 -> 2818 bytes .../halloween/DeathMansionEvent$9.class | Bin 2285 -> 2282 bytes ...rkPortalHandler$DarkPortalDialogue$1.class | Bin 1482 -> 1479 bytes ...athMansionEvent$GrimReaperDialogue$1.class | Bin 1625 -> 1622 bytes .../DeathMansionEvent$MuncherDialogue$1.class | Bin 1250 -> 1247 bytes .../DeathMansionEvent$MuncherDialogue$2.class | Bin 1288 -> 1285 bytes .../DeathMansionEvent$MuncherDialogue$3.class | Bin 2374 -> 2371 bytes ...raynorNodePlugin$TelescopeCutscene$1.class | Bin 1015 -> 1012 bytes .../city/GnomeStrongholdPlugin$1.class | Bin 1023 -> 1020 bytes .../city/GnomeStrongholdPlugin$2.class | Bin 1020 -> 1017 bytes .../city/GnomeStrongholdPlugin.class | Bin 4306 -> 5888 bytes .../TrollheimPlugin$WarningCutscene$1.class | Bin 2217 -> 2210 bytes ...rockNodePlugin$KnockatDoorDialogue$1.class | Bin 1611 -> 1608 bytes ...zardTowerPlugin$AuburyDialoguePlugin.class | Bin 9171 -> 9234 bytes ...WizardTowerPlugin$SedridorDialogue$1.class | Bin 1690 -> 1687 bytes ...rdTowerPlugin$WizardMisgogDialogue$1.class | Bin 1741 -> 1734 bytes .../city/nardah/AliTheCarter.class | Bin 0 -> 3464 bytes .../city/nardah/ArtimeusDialogue.class | Bin 0 -> 2674 bytes .../interaction/city/nardah/Awusah.class | Bin 0 -> 1800 bytes .../interaction/city/nardah/Ghaslor.class | Bin 0 -> 1903 bytes .../city/nardah/Kazemde$KazemdeDialogue.class | Bin 0 -> 2513 bytes .../interaction/city/nardah/Kazemde.class | Bin 0 -> 2475 bytes .../city/nardah/Rokuh$RokuhDialogue.class | Bin 0 -> 3502 bytes .../interaction/city/nardah/Rokuh.class | Bin 0 -> 2461 bytes .../interaction/city/nardah/Seddu.class | Bin 0 -> 2299 bytes .../city/pollnivneach/AliCamelMan.class | Bin 0 -> 8209 bytes ...heCamelHandler$AliTheCamelDialogue$1.class | Bin 0 -> 1492 bytes ...iTheCamelHandler$AliTheCamelDialogue.class | Bin 0 -> 4048 bytes .../pollnivneach/AliTheCamelHandler.class | Bin 0 -> 2164 bytes .../city/pollnivneach/AliTheKebabSeller.class | Bin 0 -> 7343 bytes .../city/pollnivneach/BlackJackSeller.class | Bin 0 -> 1676 bytes .../DesertBandit$BanditDialogue.class | Bin 0 -> 1875 bytes .../city/pollnivneach/DesertBandit.class | Bin 0 -> 2132 bytes ...nakeCharmerBasket$AliTheSnakeCharmer.class | Bin 0 -> 4111 bytes .../pollnivneach/SnakeCharmerBasket.class | Bin 0 -> 2175 bytes .../pollnivneach/StreetUrchinDialogue.class | Bin 0 -> 1856 bytes .../city/sophanem/KlenterNPC.class | Bin 0 -> 1512 bytes .../city/sophanem/SphinxDialogue.class | Bin 0 -> 4370 bytes .../city/sophanem/TarikDialogue.class | Bin 0 -> 1811 bytes .../city/sophanem/WallShortcut$1.class | Bin 0 -> 2057 bytes .../city/sophanem/WallShortcut.class | Bin 0 -> 3526 bytes ...perienceLampInterface$SkillInterface.class | Bin 3249 -> 3249 bytes .../inter/ExperienceLampInterface.class | Bin 5954 -> 6022 bytes ...ingInterface$FancyDressOwnerDialogue.class | Bin 4552 -> 7205 bytes .../FurClothingInterface$FurClothing.class | Bin 6581 -> 6581 bytes .../inter/FurClothingInterface.class | Bin 3741 -> 2858 bytes .../inter/HairInterfacePlugin.class | Bin 5277 -> 5839 bytes .../inter/ThessaliaInterface.class | Bin 5446 -> 6918 bytes .../item/DragonfireShieldPlugin$1.class | Bin 3336 -> 3358 bytes .../GodBookPlugin$GodBookDialogue$1.class | Bin 1786 -> 1779 bytes .../plugin/interaction/item/LampPlugin.class | Bin 2249 -> 2359 bytes .../item/PharoahSceptre$SceptreDialog$1.class | Bin 0 -> 1717 bytes .../item/PharoahSceptre$SceptreDialog.class | Bin 0 -> 4910 bytes .../interaction/item/PharoahSceptre.class | Bin 0 -> 3196 bytes .../WaterSourcePlugin$WaterRecipient.class | Bin 5894 -> 6157 bytes .../BarcrawlPlugin$BarcrawlDialogue$1.class | Bin 1499 -> 1496 bytes .../npc/BarcrawlPlugin$BarcrawlType$9$1.class | Bin 1698 -> 1695 bytes .../plugin/interaction/npc/ProbitaNPC$1.class | Bin 2086 -> 2061 bytes .../RechargeSceptre$RechargeDialogue.class | Bin 0 -> 5567 bytes .../interaction/npc/RechargeSceptre.class | Bin 0 -> 2062 bytes .../npc/SimonScepterInteraction.class | Bin 0 -> 1924 bytes .../SorceressApprenticeDialogue$1.class | Bin 1560 -> 1557 bytes ...BankingPlugin$BankDepositInterface$1.class | Bin 2161 -> 2158 bytes .../BankingPlugin$BankingInterface$3.class | Bin 1612 -> 1609 bytes .../object/BrokenCartBypass$1.class | Bin 0 -> 1622 bytes .../interaction/object/BrokenCartBypass.class | Bin 0 -> 2948 bytes .../object/DoorManagingPlugin.class | Bin 3599 -> 4274 bytes .../object/LumbridgeBasementPlugin$1.class | Bin 2053 -> 2046 bytes .../object/ShootingStarPlugin$1.class | Bin 1660 -> 1659 bytes ...ngStarPlugin$ShootingStarMiningPulse.class | Bin 6380 -> 6472 bytes ...hootingStarPlugin$StarSpriteDialogue.class | Bin 6369 -> 6369 bytes .../object/WildernessLeverPlugin$1.class | Bin 1509 -> 1506 bytes .../sorceress/GardenObjectsPlugin$1.class | Bin 3266 -> 3271 bytes .../sorceress/GardenObjectsPlugin$2.class | Bin 2847 -> 2844 bytes .../sorceress/GardenObjectsPlugin$3.class | Bin 3646 -> 3651 bytes .../player/AttackOptionPlugin.class | Bin 1748 -> 2410 bytes .../RS-2009/plugin/npc/BorkNPC$1.class | Bin 2579 -> 2576 bytes .../RS-2009/plugin/npc/BorkNPC$2$1.class | Bin 1247 -> 1244 bytes .../RS-2009/plugin/npc/BorkNPC$2$2.class | Bin 3654 -> 3651 bytes .../RS-2009/plugin/npc/BorkNPC$2.class | Bin 1735 -> 1732 bytes .../plugin/npc/BorkNPC$BorkCutscene$1.class | Bin 1598 -> 1595 bytes ...aosElementalNPC$ChaosCombatHandler$1.class | Bin 1507 -> 1479 bytes ...aosElementalNPC$ChaosCombatHandler$2.class | Bin 1507 -> 1479 bytes ...ementalWizardNPC$MaligniusMortifer$1.class | Bin 1587 -> 1584 bytes .../RS-2009/plugin/npc/HansNPC.class | Bin 2025 -> 1946 bytes ...phiteQueenNPC$KQCombatSwingHandler$1.class | Bin 1979 -> 1972 bytes .../RS-2009/plugin/npc/Student.class | Bin 0 -> 1808 bytes .../CorporealBeastNPC$CombatHandler$1.class | Bin 1275 -> 1268 bytes .../CorporealBeastNPC$CombatHandler$2.class | Bin 4000 -> 3997 bytes .../plugin/npc/familiar/DreadfowlNPC$2.class | Bin 2390 -> 2387 bytes .../plugin/npc/familiar/MacawNPC$1.class | Bin 1346 -> 1339 bytes .../plugin/npc/familiar/SpiritWolfNPC$1.class | Bin 2049 -> 2046 bytes .../animal_mag/AliceHusbandDialogue$1.class | Bin 1689 -> 1686 bytes .../animal_mag/AliceHusbandDialogue$2.class | Bin 2310 -> 2307 bytes .../animal_mag/AliceHusbandDialogue$3.class | Bin 1807 -> 1804 bytes .../animal_mag/AliceHusbandDialogue$4.class | Bin 3072 -> 3069 bytes .../animal_mag/AliceHusbandDialogue$5.class | Bin 1780 -> 1777 bytes ...ayerCutscene$DelrithDialoguePlugin$1.class | Bin 2613 -> 2610 bytes ...DemonSlayerCutscene$DenathDialogue$1.class | Bin 4150 -> 4143 bytes .../demonslayer/GypsyArisDialogue$1.class | Bin 1033 -> 1030 bytes .../demonslayer/GypsyArisDialogue$2.class | Bin 3859 -> 3856 bytes .../demonslayer/SirPyrsinDialogue$1.class | Bin 5055 -> 5052 bytes .../demonslayer/TraibornDialogue$1.class | Bin 1419 -> 1416 bytes .../quest/dragonslayer/DragonSlayer$1.class | Bin 2146 -> 2139 bytes .../dragonslayer/DragonSlayerCutscene$1.class | Bin 2053 -> 2050 bytes ...DragonSlayerCutscene$DSNedDialogue$1.class | Bin 3423 -> 3420 bytes ...DragonSlayerCutscene$DSNedDialogue$2.class | Bin 1625 -> 1622 bytes ...DragonSlayerCutscene$DSNedDialogue$3.class | Bin 1336 -> 1333 bytes ...DragonSlayerCutscene$DSNedDialogue$4.class | Bin 6382 -> 6379 bytes ...DragonSlayerCutscene$DSNedDialogue$5.class | Bin 1769 -> 1766 bytes ...DragonSlayerCutscene$DSNedDialogue$6.class | Bin 1980 -> 1977 bytes .../quest/dragonslayer/ElvargNPC$1.class | Bin 1320 -> 1313 bytes .../quest/dragonslayer/ElvargNPC$2.class | Bin 2566 -> 2563 bytes .../quest/dragonslayer/OziachDialogue.class | Bin 9904 -> 9952 bytes ...macyCutscene$GoblinGeneralDialogue$1.class | Bin 4728 -> 4725 bytes .../merlincrystal/MerlinCrystalPlugin$1.class | Bin 1275 -> 1268 bytes .../quest/touristrap/AnaDialogue$1.class | Bin 1405 -> 1402 bytes ...DesertGuardDialogue$DesertGuardNPC$1.class | Bin 2690 -> 2687 bytes .../touristrap/MaleSlaveDialogue$1.class | Bin 2766 -> 2763 bytes .../touristrap/TouristTrapPlugin$1.class | Bin 1482 -> 1479 bytes .../touristrap/TouristTrapPlugin$2.class | Bin 2960 -> 2957 bytes .../touristrap/TouristTrapPlugin$3.class | Bin 1571 -> 1568 bytes .../touristrap/TouristTrapPlugin$4.class | Bin 1241 -> 1238 bytes .../touristrap/TouristTrapPlugin$5.class | Bin 1572 -> 1569 bytes .../touristrap/TouristTrapPlugin$6.class | Bin 1241 -> 1238 bytes .../TouristTrapPlugin$AnnaCartHandler$1.class | Bin 2505 -> 2502 bytes ...n$AnnaCartHandler$AnnaCartCutscene$1.class | Bin 4386 -> 4383 bytes .../TouristTrapPlugin$BarrelDialogue$1.class | Bin 1150 -> 1149 bytes .../TouristTrapPlugin$CartDialogue$1.class | Bin 3396 -> 3393 bytes ...TouristTrapPlugin$MineCartDialogue$1.class | Bin 1376 -> 1373 bytes ...ineCartDialogue$MiningCartCutscene$1.class | Bin 1985 -> 1982 bytes .../TouristTrapPlugin$WinchCutscene$1.class | Bin 1643 -> 1640 bytes .../quest/waterfall/AlmeraDialogue.class | Bin 5749 -> 5787 bytes .../quest/waterfall/GolrieDialogue.class | Bin 3588 -> 3730 bytes .../quest/waterfall/WaterfallPlugin$1.class | Bin 1922 -> 1922 bytes .../quest/waterfall/WaterfallPlugin$2.class | Bin 1543 -> 1543 bytes .../quest/waterfall/WaterfallPlugin$3.class | Bin 1488 -> 1488 bytes .../quest/waterfall/WaterfallPlugin$4.class | Bin 1469 -> 1469 bytes ...llPlugin$WaterfallUseWithHandler$1$1.class | Bin 2216 -> 2216 bytes ...fallPlugin$WaterfallUseWithHandler$1.class | Bin 2392 -> 2392 bytes ...fallPlugin$WaterfallUseWithHandler$2.class | Bin 1524 -> 1524 bytes ...fallPlugin$WaterfallUseWithHandler$3.class | Bin 2147 -> 2147 bytes ...fallPlugin$WaterfallUseWithHandler$4.class | Bin 1365 -> 1365 bytes ...fallPlugin$WaterfallUseWithHandler$5.class | Bin 1459 -> 1459 bytes ...erfallPlugin$WaterfallUseWithHandler.class | Bin 8709 -> 8709 bytes .../quest/waterfall/WaterfallPlugin.class | Bin 13316 -> 13370 bytes .../waterfall/WaterfallTreeDialogue$1.class | Bin 2163 -> 2160 bytes .../witchs_house/BoyDialoguePlugin.class | Bin 0 -> 3894 bytes .../plugin/quest/witchs_house/MouseNPC.class | Bin 0 -> 2107 bytes .../quest/witchs_house/NoraTHaggNPC$1.class | Bin 0 -> 2707 bytes .../quest/witchs_house/NoraTHaggNPC.class | Bin 0 -> 5073 bytes .../quest/witchs_house/WitchsHouse.class | Bin 0 -> 3119 bytes ...sePlugin$WitchsHouseUseWithHandler$1.class | Bin 0 -> 2753 bytes ...ousePlugin$WitchsHouseUseWithHandler.class | Bin 0 -> 3648 bytes .../witchs_house/WitchsHousePlugin.class | Bin 0 -> 6105 bytes .../quest/wlbelow/WLBelowCutscene$1.class | Bin 1652 -> 1651 bytes .../quest/wlbelow/WLBelowCutscene$2.class | Bin 1576 -> 1573 bytes .../quest/wlbelow/WLBelowCutscene$3.class | Bin 1488 -> 1485 bytes .../quest/wlbelow/WLBelowCutscene$4.class | Bin 1924 -> 1921 bytes .../quest/wlbelow/WLBelowCutscene$5.class | Bin 1068 -> 1065 bytes .../quest/wlbelow/WLBelowCutscene$6.class | Bin 816 -> 813 bytes .../agility/BarbarianOutpostCourse$1.class | Bin 1416 -> 1413 bytes .../agility/BarbarianOutpostCourse$2.class | Bin 3376 -> 3373 bytes .../skill/agility/GnomeStrongholdCourse.class | Bin 6664 -> 6669 bytes .../skill/agility/WildernessCourse.class | Bin 8339 -> 8343 bytes .../pyramid/AgilityPyramidCourse$1.class | Bin 2592 -> 2592 bytes .../pyramid/AgilityPyramidCourse$2.class | Bin 2117 -> 2117 bytes .../pyramid/AgilityPyramidCourse$3.class | Bin 1375 -> 1375 bytes .../pyramid/AgilityPyramidCourse$4.class | Bin 2394 -> 2394 bytes .../pyramid/AgilityPyramidCourse$5.class | Bin 871 -> 871 bytes .../pyramid/AgilityPyramidCourse.class | Bin 19546 -> 19703 bytes .../StaircasePlugin$ClimbPohLadder$1.class | Bin 1569 -> 1568 bytes .../StaircasePlugin$ClimbPohLadder$2.class | Bin 1569 -> 1568 bytes .../npc/HouseServantDialogue$1.class | Bin 1919 -> 1918 bytes .../npc/HouseServantDialogue$2.class | Bin 3694 -> 3693 bytes .../npc/HouseServantDialogue$3.class | Bin 1224 -> 1204 bytes .../cooking/CookingDialoguePlugin$2.class | Bin 0 -> 1232 bytes .../skill/cooking/CookingDialoguePlugin.class | Bin 5070 -> 5234 bytes .../plugin/skill/cooking/CookingPlugin.class | Bin 4627 -> 4645 bytes .../crafting/ChiselLimestonePlugin.class | Bin 0 -> 1768 bytes ...ltenGlassMakePlugin$MoltenGlassPulse.class | Bin 2535 -> 2535 bytes .../crafting/MoltenGlassMakePlugin.class | Bin 1882 -> 1894 bytes .../skill/herblore/SwampToadPlugin.class | Bin 0 -> 1958 bytes .../skill/magic/HouseTeleportPlugin.class | Bin 0 -> 4122 bytes .../skill/magic/ModernTeleportPlugin.class | Bin 6364 -> 6457 bytes .../skill/magic/lunar/DreamSpell$1.class | Bin 1402 -> 1395 bytes .../skill/magic/lunar/DreamSpell$2.class | Bin 1828 -> 1821 bytes .../magic/lunar/SpellbookSwapSpell$1.class | Bin 1444 -> 1437 bytes .../skill/slayer/SlayerMasterDialogue.class | Bin 19666 -> 19674 bytes .../LumbridgeDungeon$WallBeastNPC.class | Bin 4030 -> 3767 bytes ...Room$FluffyCutscene$FluffyDialogue$1.class | Bin 1949 -> 1946 bytes ...Room$FluffyCutscene$FluffyDialogue$2.class | Bin 1797 -> 1794 bytes ...Room$FluffyCutscene$FluffyDialogue$3.class | Bin 4072 -> 4069 bytes ...Room$FluffyCutscene$FluffyDialogue$4.class | Bin 1477 -> 1476 bytes ...Room$FluffyCutscene$FluffyDialogue$5.class | Bin 1868 -> 1865 bytes ...Room$FluffyCutscene$FluffyDialogue$6.class | Bin 3473 -> 3470 bytes .../plugin/tutorial/MasterChefDialogue.class | Bin 5390 -> 5544 bytes .../tutorial/TutorialCompletionDialogue.class | Bin 13687 -> 14670 bytes .../RS-2009/plugin/zone/DesertZone.class | Bin 8098 -> 8125 bytes .../GrandExchangeZone$CreditStore$1.class | Bin 1865 -> 1865 bytes .../GrandExchangeZone$CreditStore$2.class | Bin 2222 -> 2222 bytes .../zone/GrandExchangeZone$CreditStore.class | Bin 6314 -> 6410 bytes ...e$GnomeTravellerPlugin$GnomeDialogue.class | Bin 4502 -> 4502 bytes ...andExchangeZone$GnomeTravellerPlugin.class | Bin 4179 -> 4179 bytes ...andExchangeZone$RewardTraderDialogue.class | Bin 4194 -> 4194 bytes ...andExchangeZone$TeleporterDialogue$1.class | Bin 3565 -> 3562 bytes ...GrandExchangeZone$TeleporterDialogue.class | Bin 7961 -> 7961 bytes .../zone/rellekka/JarvaldDialogue$1.class | Bin 2389 -> 2386 bytes .../wbisland/WaterBirthDungeonZone$1$1.class | Bin 1328 -> 1325 bytes .../wbisland/WaterBirthDungeonZone$1.class | Bin 2793 -> 2790 bytes RS-2009.iml | 26 + .../org/crandor/game/container/Container.java | 9 + .../game/content/dialogue/DialoguePlugin.java | 8 + .../object/DoorManagingPlugin.java | 16 + .../quest/witchs_house/BoyDialoguePlugin.java | 128 ++ .../plugin/quest/witchs_house/MouseNPC.java | 97 ++ .../quest/witchs_house/NoraTHaggNPC.java | 147 +++ .../quest/witchs_house/WitchsHouse.java | 57 + .../quest/witchs_house/WitchsHousePlugin.java | 188 +++ 403 files changed, 1690 insertions(+), 143 deletions(-) create mode 100644 CompiledServer/production/RS-2009/META-INF/RS-2009.kotlin_module create mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/Job.class create mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/JobsMinigameManager.class create mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/GatheringJob$GatheringJobs.class create mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/GatheringJob.class create mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/SlayingJob$SlayingJobs.class create mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/SlayingJob.class create mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/free/crafting/limestone/ChiselLimestonePulse.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$10.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$11.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$12.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$13.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$14.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$15.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$16.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$2.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$3.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$4.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$5.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$6.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$7.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$8.class delete mode 100644 CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$9.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main$1.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main$2.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main$3.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main$4.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main$5.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main$6.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main$7.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main$8.class delete mode 100644 CompiledServer/production/RS-2009/org/keldagrim/Main.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$ArcheryTargetPulse.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/jobs/WorkForOptionHandler.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PlunderObject.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PlunderObjectManager.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidOptionHandler$1.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderMummyNPC.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderNPC$1.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderNPC.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderOptions.class create mode 100644 CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderSwarmNPC.class create mode 100644 CompiledServer/production/RS-2009/plugin/dialogue/AnnaIsaakson.class create mode 100644 CompiledServer/production/RS-2009/plugin/dialogue/ArdougneBaker.class create mode 100644 CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$2.class delete mode 100644 CompiledServer/production/RS-2009/plugin/dialogue/GrillieGroatsDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/dialogue/SimonTempleton.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/AliTheCarter.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/ArtimeusDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Awusah.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Ghaslor.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Kazemde$KazemdeDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Kazemde.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Rokuh$RokuhDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Rokuh.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Seddu.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliCamelMan.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler$AliTheCamelDialogue$1.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler$AliTheCamelDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheKebabSeller.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/BlackJackSeller.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/DesertBandit$BanditDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/DesertBandit.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/SnakeCharmerBasket$AliTheSnakeCharmer.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/SnakeCharmerBasket.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/StreetUrchinDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/KlenterNPC.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/SphinxDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/TarikDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/WallShortcut$1.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/WallShortcut.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre$SceptreDialog$1.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre$SceptreDialog.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/npc/RechargeSceptre$RechargeDialogue.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/npc/RechargeSceptre.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/npc/SimonScepterInteraction.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/object/BrokenCartBypass$1.class create mode 100644 CompiledServer/production/RS-2009/plugin/interaction/object/BrokenCartBypass.class create mode 100644 CompiledServer/production/RS-2009/plugin/npc/Student.class create mode 100644 CompiledServer/production/RS-2009/plugin/quest/witchs_house/BoyDialoguePlugin.class create mode 100644 CompiledServer/production/RS-2009/plugin/quest/witchs_house/MouseNPC.class create mode 100644 CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class create mode 100644 CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class create mode 100644 CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHouse.class create mode 100644 CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin$WitchsHouseUseWithHandler$1.class create mode 100644 CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin$WitchsHouseUseWithHandler.class create mode 100644 CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin.class create mode 100644 CompiledServer/production/RS-2009/plugin/skill/cooking/CookingDialoguePlugin$2.class create mode 100644 CompiledServer/production/RS-2009/plugin/skill/crafting/ChiselLimestonePlugin.class create mode 100644 CompiledServer/production/RS-2009/plugin/skill/herblore/SwampToadPlugin.class create mode 100644 CompiledServer/production/RS-2009/plugin/skill/magic/HouseTeleportPlugin.class create mode 100644 Server/src/plugin/quest/witchs_house/BoyDialoguePlugin.java create mode 100644 Server/src/plugin/quest/witchs_house/MouseNPC.java create mode 100644 Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java create mode 100644 Server/src/plugin/quest/witchs_house/WitchsHouse.java create mode 100644 Server/src/plugin/quest/witchs_house/WitchsHousePlugin.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e801e8310..32b98553f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,38 +1,428 @@ - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - -