From 9bb83652e4ec656390883c37afd725974f02d9c4 Mon Sep 17 00:00:00 2001 From: Rogiel Date: Wed, 18 May 2011 19:59:27 -0300 Subject: [PATCH] Signed-off-by: Rogiel --- data/script/ai/ai.xml | 23 ++ data/script/ai/script/AIInterest.java | 63 ++++ data/script/ai/script/AIScriptFactory.java | 52 +++ data/script/ai/script/ai/CharacterAI.java | 128 +++++++ .../ai/script/ai/scanner/AIScanner.java | 25 ++ .../character/AbstractCharacterTemplate.java | 13 +- .../AbstractDarkElfCharacterTemplate.java | 13 +- .../AbstractDwarfCharacterTemplate.java | 13 +- .../AbstractElfCharacterTemplate.java | 13 +- .../AbstractHumanCharacterTemplate.java | 13 +- .../AbstractKamaelCharacterTemplate.java | 13 +- .../AbstractOrcCharacterTemplate.java | 13 +- .../actor/character/AbyssWalkerTemplate.java | 58 ++-- .../actor/character/AdventurerTemplate.java | 58 ++-- .../actor/character/ArbalesterTemplate.java | 58 ++-- .../actor/character/ArcanaLordTemplate.java | 58 ++-- .../actor/character/ArchmageTemplate.java | 58 ++-- .../actor/character/ArtisanTemplate.java | 58 ++-- .../actor/character/AssassinTemplate.java | 58 ++-- .../actor/character/BersekerTemplate.java | 58 ++-- .../actor/character/BishopTemplate.java | 58 ++-- .../actor/character/BladedancerTemplate.java | 58 ++-- .../actor/character/BountyHunterTemplate.java | 58 ++-- .../actor/character/CardinalTemplate.java | 58 ++-- .../actor/character/ClericTemplate.java | 58 ++-- .../actor/character/DarkAvengerTemplate.java | 58 ++-- .../actor/character/DarkFighterTemplate.java | 58 ++-- .../actor/character/DarkMysticTemplate.java | 58 ++-- .../actor/character/DarkWizardTemplate.java | 58 ++-- .../actor/character/DestroyerTemplate.java | 58 ++-- .../actor/character/DominatorTemplate.java | 58 ++-- .../actor/character/DoombringerTemplate.java | 58 ++-- .../actor/character/DoomcryerTemplate.java | 58 ++-- .../actor/character/DreadnoughtTemplate.java | 58 ++-- .../actor/character/DuelistTemplate.java | 58 ++-- .../character/DwarvenFighterTemplate.java | 58 ++-- .../actor/character/ElderTemplate.java | 55 ++- .../character/ElementalMasterTemplate.java | 58 ++-- .../character/ElementalSummonerTemplate.java | 58 ++-- .../actor/character/ElvenFighterTemplate.java | 58 ++-- .../actor/character/ElvenKnightTemplate.java | 58 ++-- .../actor/character/ElvenMysticTemplate.java | 58 ++-- .../actor/character/ElvenScoutTemplate.java | 58 ++-- .../actor/character/ElvenWizardTemplate.java | 58 ++-- .../actor/character/EvaSaintTemplate.java | 58 ++-- .../actor/character/EvaTemplarTemplate.java | 58 ++-- .../character/FemaleSoldierTemplate.java | 58 ++-- .../character/FemaleSoulbreakerTemplate.java | 58 ++-- .../character/FemaleSouldhoundTemplate.java | 58 ++-- .../character/FortuneSeekerTemplate.java | 58 ++-- .../actor/character/GhostHunterTemplate.java | 58 ++-- .../character/GhostSentinelTemplate.java | 58 ++-- .../actor/character/GladiatorTemplate.java | 58 ++-- .../character/GrandKhauatariTemplate.java | 58 ++-- .../actor/character/HawkeyeTemplate.java | 58 ++-- .../actor/character/HellKnightTemplate.java | 58 ++-- .../actor/character/HierophantTemplate.java | 58 ++-- .../actor/character/HumanFighterTemplate.java | 58 ++-- .../actor/character/HumanMysticTemplate.java | 58 ++-- .../actor/character/InspectorTemplate.java | 58 ++-- .../actor/character/JudicatorTemplate.java | 58 ++-- .../actor/character/KnightTemplate.java | 58 ++-- .../actor/character/MaestroTemplate.java | 58 ++-- .../actor/character/MaleSoldierTemplate.java | 58 ++-- .../character/MaleSoulbreakerTemplate.java | 58 ++-- .../character/MaleSouldhoundTemplate.java | 58 ++-- .../character/MoonlightSentinelTemplate.java | 58 ++-- .../actor/character/MysticMuseTemplate.java | 58 ++-- .../actor/character/NecromancerTemplate.java | 58 ++-- .../actor/character/OracleTemplate.java | 58 ++-- .../actor/character/OrcFighterTemplate.java | 58 ++-- .../actor/character/OrcMonkTemplate.java | 58 ++-- .../actor/character/OrcMysticTemplate.java | 58 ++-- .../actor/character/OrcRaiderTemplate.java | 58 ++-- .../actor/character/OrcShamanTemplate.java | 58 ++-- .../actor/character/OverlordTemplate.java | 58 ++-- .../actor/character/PaladinTemplate.java | 58 ++-- .../actor/character/PalusKnightTemplate.java | 58 ++-- .../character/PhantomRangerTemplate.java | 58 ++-- .../character/PhantomSummonerTemplate.java | 58 ++-- .../character/PhoenixKnightTemplate.java | 58 ++-- .../actor/character/PlainsWalkerTemplate.java | 58 ++-- .../actor/character/ProphetTemplate.java | 58 ++-- .../actor/character/RogueTemplate.java | 55 ++- .../actor/character/SagittariusTemplate.java | 58 ++-- .../actor/character/ScavengerTemplate.java | 58 ++-- .../character/ShillieanSaintTemplate.java | 58 ++-- .../character/ShillienElderTemplate.java | 58 ++-- .../character/ShillienKnightTemplate.java | 58 ++-- .../character/ShillienOracleTemplate.java | 58 ++-- .../character/ShillienTemplarTemplate.java | 58 ++-- .../actor/character/SilverRangerTemplate.java | 58 ++-- .../actor/character/SorcerorTemplate.java | 58 ++-- .../actor/character/SoultakerTemplate.java | 58 ++-- .../character/SpectralMasterTemplate.java | 58 ++-- .../character/SpectraldancerTemplate.java | 58 ++-- .../actor/character/SpellhowlerTemplate.java | 58 ++-- .../actor/character/SpellsingerTemplate.java | 58 ++-- .../character/StormScreamerTemplate.java | 58 ++-- .../actor/character/SwordMuseTemplate.java | 58 ++-- .../actor/character/SwordSingerTemplate.java | 58 ++-- .../actor/character/TempleKnightTemplate.java | 58 ++-- .../actor/character/TitanTemplate.java | 55 ++- .../character/TreasureHunterTemplate.java | 58 ++-- .../actor/character/TricksterTemplate.java | 58 ++-- .../actor/character/TrooperTemplate.java | 58 ++-- .../actor/character/TyrantTemplate.java | 58 ++-- .../actor/character/WarcryerTemplate.java | 58 ++-- .../actor/character/WarderTemplate.java | 58 ++-- .../actor/character/WarlockTemplate.java | 58 ++-- .../actor/character/WarlordTemplate.java | 58 ++-- .../actor/character/WarriorTemplate.java | 58 ++-- .../actor/character/WarsmithTemplate.java | 58 ++-- .../actor/character/WindRiderTemplate.java | 58 ++-- .../actor/character/WizardTemplate.java | 58 ++-- .../java/com/l2jserver/L2JGameServerMain.java | 2 +- .../com/l2jserver/game/ProtocolVersion.java | 1 + .../game/net/codec/Lineage2PacketReader.java | 6 +- .../client/CharacterRequestActionUse.java | 112 ++++++ ...t.java => CharacterRequestMovePacket.java} | 14 +- .../packet/client/ProtocolVersionPacket.java | 2 +- .../packet/server/ActorMovementPacket.java | 64 ++++ .../server/CharacterMovementTypePacket.java | 54 +++ .../server/CharacterSelectionListPacket.java | 18 +- .../packet/server/UserInformationPacket.java | 33 +- .../model/id/template/NPCTemplateID.java | 2 +- .../model/template/ActorTemplate.java | 326 +++++++++++++++--- .../model/template/AugmentTemplate.java | 40 +++ .../model/template/CharacterTemplate.java | 22 +- .../model/template/EffectTemplate.java | 40 +++ .../l2jserver/model/template/NPCTemplate.java | 20 +- .../template/npc/AdventurerNPCTemplate.java | 39 +++ .../template/npc/ArtefactNPCTemplate.java | 39 +++ .../template/npc/AuctioneerNPCTemplate.java | 39 +++ .../template/npc/BabyPetNPCTemplate.java | 39 +++ .../model/template/npc/BlockNPCTemplate.java | 39 +++ .../template/npc/CabaleBufferNPCTemplate.java | 39 +++ .../npc/CastleBlacksmithNPCTemplate.java | 39 +++ .../npc/CastleChamberlainNPCTemplate.java | 39 +++ .../npc/CastleDoormenNPCTemplate.java | 39 +++ .../npc/CastleMagicianNPCTemplate.java | 39 +++ .../npc/CastleTeleporterNPCTemplate.java | 37 ++ .../npc/CastleWarehouseNPCTemplate.java | 37 ++ .../npc/CastleWyvernManagerNPCTemplate.java | 39 +++ .../model/template/npc/ChestNPCTemplate.java | 39 +++ .../npc/ChristmasTreeNPCTemplate.java | 39 +++ .../template/npc/ClanTraderNPCTemplate.java | 39 +++ .../npc/ClanhallDoormenNPCTemplate.java | 39 +++ .../npc/ClanhallManagerNPCTemplate.java | 39 +++ .../template/npc/ClassMasterNPCTemplate.java | 39 +++ .../template/npc/ControlTowerNPCTemplate.java | 39 +++ .../npc/DarkElfVillageMasterNPCTemplate.java | 39 +++ .../template/npc/DawnPriestNPCTemplate.java | 39 +++ .../model/template/npc/DecoyNPCTemplate.java | 39 +++ .../template/npc/DefenderNPCTemplate.java | 39 +++ .../template/npc/DoormenNPCTemplate.java | 39 +++ .../npc/DungeonGatekeeperNPCTemplate.java | 39 +++ .../template/npc/DuskPriestNPCTemplate.java | 39 +++ .../npc/DwarfVillageMasterNPCTemplate.java | 39 +++ .../template/npc/EffectPointNPCTemplate.java | 39 +++ .../template/npc/EventChestNPCTemplate.java | 39 +++ .../template/npc/FameManagerNPCTemplate.java | 39 +++ .../npc/FeedableBeastNPCTemplate.java | 39 +++ .../npc/FestivalGuideNPCTemplate.java | 39 +++ .../npc/FestivalMonsterNPCTemplate.java | 39 +++ .../npc/FightherVillageMasterNPCTemplate.java | 39 +++ .../template/npc/FishermanNPCTemplate.java | 39 +++ .../template/npc/FlameTowerNPCTemplate.java | 39 +++ .../template/npc/FlyMonsterNPCTemplate.java | 39 +++ .../model/template/npc/FlyNPCTemplate.java | 39 +++ .../template/npc/FlyRaidBossNPCTemplate.java | 39 +++ .../npc/FlyTerrainObjectNPCTemplate.java | 39 +++ .../template/npc/FortBallistaNPCTemplate.java | 39 +++ .../npc/FortCommanderNPCTemplate.java | 39 +++ .../template/npc/FortDoormenNPCTemplate.java | 39 +++ .../template/npc/FortEnvoyNPCTemplate.java | 39 +++ .../npc/FortLogisticsNPCTemplate.java | 39 +++ .../template/npc/FortManagerNPCTemplate.java | 39 +++ .../template/npc/FortSiegeNPCTemplate.java | 39 +++ .../npc/FortSupportCaptainNPCTemplate.java | 39 +++ .../npc/FortWyvernManagerNPCTemplate.java | 39 +++ .../npc/FriendlyMonsterNPCTemplate.java | 39 +++ .../template/npc/GrandeBossNPCTemplate.java | 39 +++ .../model/template/npc/GuardNPCTemplate.java | 39 +++ .../npc/KamaelVillageMasterNPCTemplate.java | 39 +++ .../template/npc/ManorManagerNPCTemplate.java | 39 +++ .../template/npc/MercManagerNPCTemplate.java | 39 +++ .../npc/MercenaryManagerNPCTemplate.java | 39 +++ .../template/npc/MerchantNPCTemplate.java | 39 +++ .../npc/MerchantSummonNPCTemplate.java | 39 +++ .../template/npc/MonsterNPCTemplate.java | 39 +++ .../template/npc/ObservationNPCTemplate.java | 39 +++ .../npc/OlympiadManagerNPCTemplate.java | 39 +++ .../npc/OrcVillageMasterNPCTemplate.java | 39 +++ .../template/npc/PenaltyNPCTemplate.java | 39 +++ .../template/npc/PetManagerNPCTemplate.java | 39 +++ .../npc/PriestVillageMasterNPCTemplate.java | 39 +++ .../template/npc/RaidBossNPCTemplate.java | 39 +++ .../template/npc/RiftInvaderNPCTemplate.java | 39 +++ .../npc/SepulcherMonsterNPCTemplate.java | 39 +++ .../model/template/npc/SiegeNPCTemplate.java | 39 +++ .../template/npc/SiegeSummonNPCTemplate.java | 39 +++ .../template/npc/SignsPriestsNPCTemplate.java | 39 +++ .../template/npc/SymbolMakerNPCTemplate.java | 39 +++ .../template/npc/TamedBeastNPCTemplate.java | 39 +++ .../template/npc/TeleporterNPCTemplate.java | 39 +++ .../npc/TerrainObjectNPCTemplate.java | 39 +++ .../npc/TerritoryWardNPCTemplate.java | 39 +++ .../template/npc/TownPetNPCTemplate.java | 39 +++ .../template/npc/TrainerNPCTemplate.java | 39 +++ .../npc/TransformManagerNPCTemplate.java | 39 +++ .../model/template/npc/WalkerNPCTemplate.java | 39 +++ .../template/npc/WarehouseNPCTemplate.java | 39 +++ .../l2jserver/model/world/L2Character.java | 93 +++-- .../java/com/l2jserver/model/world/NPC.java | 25 ++ .../ActorAttributes.java} | 12 +- .../character/CharacterBaseAttributes.java | 310 ----------------- .../CharacterCalculatedAttributes.java | 9 +- .../event/CharacterStopMoveEvent.java | 85 +++++ .../com/l2jserver/service/ServiceModule.java | 4 +- .../service/game/CharacterService.java | 27 ++ .../service/game/CharacterServiceImpl.java | 56 ++- .../l2jserver/service/game/ai/AIScript.java | 54 +++ .../l2jserver/service/game/ai/AIService.java | 38 ++ .../service/game/ai/AIServiceImpl.java | 82 +++++ .../game/ai/script/AttackAIScript.java | 27 ++ .../game/ai/script/ProximityAIScript.java | 35 ++ .../game/ai/script/WalkingAIScript.java | 30 ++ .../service/game/effect/EffectService.java | 38 ++ .../service/game/world/WorldService.java | 14 + .../service/game/world/WorldServiceImpl.java | 13 + .../world/event/WorldEventDispatcher.java | 13 + .../world/event/WorldEventDispatcherImpl.java | 14 +- .../game/world/filter/impl/IDFilter.java | 6 +- .../service/network/NettyNetworkService.java | 2 +- .../keygen}/BlowfishKeygenService.java | 2 +- .../PseudoRandomBlowfishKeygenService.java | 2 +- .../keygen}/SecureBlowfishKeygenService.java | 2 +- .../service/threading/ThreadService.java | 4 +- .../java/com/l2jserver/util/RGBColor.java | 2 +- .../util/dimensional/Coordinate.java | 9 +- .../chartemplate/CharacterTemplateBase.txt | 74 ++-- 242 files changed, 7180 insertions(+), 4199 deletions(-) create mode 100644 data/script/ai/ai.xml create mode 100644 data/script/ai/script/AIInterest.java create mode 100644 data/script/ai/script/AIScriptFactory.java create mode 100644 data/script/ai/script/ai/CharacterAI.java create mode 100644 data/script/ai/script/ai/scanner/AIScanner.java create mode 100644 src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java rename src/main/java/com/l2jserver/game/net/packet/client/{RequestMoveBackwardToLocationPacket.java => CharacterRequestMovePacket.java} (88%) create mode 100644 src/main/java/com/l2jserver/game/net/packet/server/ActorMovementPacket.java create mode 100644 src/main/java/com/l2jserver/game/net/packet/server/CharacterMovementTypePacket.java create mode 100644 src/main/java/com/l2jserver/model/template/AugmentTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/EffectTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/AdventurerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ArtefactNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/AuctioneerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/BabyPetNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/BlockNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/CabaleBufferNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/CastleBlacksmithNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/CastleChamberlainNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/CastleDoormenNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/CastleMagicianNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/CastleTeleporterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/CastleWarehouseNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/CastleWyvernManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ChestNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ChristmasTreeNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ClanTraderNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ClanhallDoormenNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ClanhallManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ClassMasterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ControlTowerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/DarkElfVillageMasterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/DawnPriestNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/DecoyNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/DefenderNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/DoormenNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/DungeonGatekeeperNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/DuskPriestNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/DwarfVillageMasterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/EffectPointNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/EventChestNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FameManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FeedableBeastNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FestivalGuideNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FestivalMonsterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FightherVillageMasterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FishermanNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FlameTowerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FlyMonsterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FlyNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FlyRaidBossNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FlyTerrainObjectNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortBallistaNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortCommanderNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortDoormenNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortEnvoyNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortLogisticsNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortSiegeNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortSupportCaptainNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FortWyvernManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/FriendlyMonsterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/GrandeBossNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/GuardNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/KamaelVillageMasterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ManorManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/MercManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/MercenaryManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/MerchantNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/MerchantSummonNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/MonsterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/ObservationNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/OlympiadManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/OrcVillageMasterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/PenaltyNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/PetManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/PriestVillageMasterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/RaidBossNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/RiftInvaderNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/SepulcherMonsterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/SiegeNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/SiegeSummonNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/SignsPriestsNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/SymbolMakerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/TamedBeastNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/TeleporterNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/TerrainObjectNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/TerritoryWardNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/TownPetNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/TrainerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/TransformManagerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/WalkerNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/template/npc/WarehouseNPCTemplate.java create mode 100644 src/main/java/com/l2jserver/model/world/NPC.java rename src/main/java/com/l2jserver/model/world/{character/CharacterAttributes.java => actor/ActorAttributes.java} (87%) delete mode 100644 src/main/java/com/l2jserver/model/world/character/CharacterBaseAttributes.java create mode 100644 src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java create mode 100644 src/main/java/com/l2jserver/service/game/ai/AIScript.java create mode 100644 src/main/java/com/l2jserver/service/game/ai/AIService.java create mode 100644 src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java create mode 100644 src/main/java/com/l2jserver/service/game/ai/script/AttackAIScript.java create mode 100644 src/main/java/com/l2jserver/service/game/ai/script/ProximityAIScript.java create mode 100644 src/main/java/com/l2jserver/service/game/ai/script/WalkingAIScript.java create mode 100644 src/main/java/com/l2jserver/service/game/effect/EffectService.java rename src/main/java/com/l2jserver/service/{blowfish => network/keygen}/BlowfishKeygenService.java (94%) rename src/main/java/com/l2jserver/service/{blowfish => network/keygen}/PseudoRandomBlowfishKeygenService.java (97%) rename src/main/java/com/l2jserver/service/{blowfish => network/keygen}/SecureBlowfishKeygenService.java (97%) diff --git a/data/script/ai/ai.xml b/data/script/ai/ai.xml new file mode 100644 index 000000000..ba472b608 --- /dev/null +++ b/data/script/ai/ai.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/data/script/ai/script/AIInterest.java b/data/script/ai/script/AIInterest.java new file mode 100644 index 000000000..ba987a13d --- /dev/null +++ b/data/script/ai/script/AIInterest.java @@ -0,0 +1,63 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package script; + +/** + * The {@link AIInterest} defines what the AI is interested in doing. + * + * @author Rogiel + */ +public enum AIInterest { + /** + * Idle + */ + INTEREST_IDLE, + /** + * Will scan for attackable targets, if mob is aggressive or if it is + * aggrided. + */ + INTEREST_ACTIVE, + /** + * Rest (sit until attacked) + */ + INTEREST_REST, + /** + * Attack target (cast combat magic, go to target, combat), may be ignored, + * if target is locked on another character or a peacefull zone and so on + */ + INTEREST_ATTACK, + /** + * Cast a spell, depending on the spell - may start or stop attacking + */ + INTEREST_CAST, + /** + * Just move to another location + */ + INTEREST_MOVE_TO, + /** + * Like move, but check target's movement and follow it + */ + INTEREST_FOLLOW, + /** + * PickUp and item, (got to item, pickup it, become idle + */ + INTEREST_PICK_UP, + /** + * Move to target, then interact + */ + INTEREST_INTERACT; +} \ No newline at end of file diff --git a/data/script/ai/script/AIScriptFactory.java b/data/script/ai/script/AIScriptFactory.java new file mode 100644 index 000000000..a5fb860ee --- /dev/null +++ b/data/script/ai/script/AIScriptFactory.java @@ -0,0 +1,52 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package script; + +import script.ai.CharacterAI; + +import com.google.inject.Inject; +import com.l2jserver.game.net.Lineage2Connection; +import com.l2jserver.model.id.object.CharacterID; +import com.l2jserver.model.world.L2Character; +import com.l2jserver.model.world.WorldObject; +import com.l2jserver.service.game.ai.AIScript; +import com.l2jserver.service.game.world.event.WorldEventDispatcher; +import com.l2jserver.service.network.NetworkService; + +/** + * @author Rogiel + */ +public class AIScriptFactory { + private final WorldEventDispatcher eventDispatcher; + private final NetworkService networkService; + + @Inject + public AIScriptFactory(WorldEventDispatcher eventDispatcher, + NetworkService networkService) { + this.eventDispatcher = eventDispatcher; + this.networkService = networkService; + } + + public AIScript create(WorldObject object) { + if (object instanceof L2Character) { + final Lineage2Connection conn = networkService + .discover((CharacterID) object.getID()); + return new CharacterAI((L2Character) object, conn, eventDispatcher); + } + return null; + } +} diff --git a/data/script/ai/script/ai/CharacterAI.java b/data/script/ai/script/ai/CharacterAI.java new file mode 100644 index 000000000..f5178c94e --- /dev/null +++ b/data/script/ai/script/ai/CharacterAI.java @@ -0,0 +1,128 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package script.ai; + +import script.AIInterest; + +import com.l2jserver.game.net.Lineage2Connection; +import com.l2jserver.game.net.packet.server.ActorMovementPacket; +import com.l2jserver.model.world.L2Character; +import com.l2jserver.model.world.capability.Attackable; +import com.l2jserver.model.world.capability.Positionable; +import com.l2jserver.model.world.character.event.CharacterMoveEvent; +import com.l2jserver.service.game.ai.AIScript; +import com.l2jserver.service.game.ai.script.AttackAIScript; +import com.l2jserver.service.game.ai.script.WalkingAIScript; +import com.l2jserver.service.game.world.WorldService; +import com.l2jserver.service.game.world.event.WorldEventDispatcher; +import com.l2jserver.util.dimensional.Coordinate; + +/** + * This {@link AIScript} is for {@link L2Character} object instances + * + * @author Rogiel + */ +public class CharacterAI implements AIScript, WalkingAIScript, AttackAIScript { + /** + * The {@link L2Character} being controlled by this AI + */ + private final L2Character character; + /** + * The {@link Lineage2Connection} instance for this character + */ + private final Lineage2Connection conn; + /** + * The {@link WorldService} event dispatcher + */ + private final WorldEventDispatcher eventDispatcher; + /** + * The AI interest + */ + private AIInterest interest; + + // walking + /** + * Walking destination coordinate + */ + private Coordinate coordinate; + + public CharacterAI(L2Character character, Lineage2Connection conn, + WorldEventDispatcher eventDispatcher) { + this.character = character; + this.conn = conn; + this.eventDispatcher = eventDispatcher; + } + + @Override + public void start() { + // TODO implement listener + } + + @Override + public void run(double time) { + if (interest == AIInterest.INTEREST_IDLE) + return; + + switch (interest) { + case INTEREST_MOVE_TO: + final Coordinate source = character.getPosition(); + character.setPosition(coordinate); + conn.write(new ActorMovementPacket(character, source)); + eventDispatcher.dispatch(new CharacterMoveEvent(character, + coordinate.toPoint())); + // double speed = character.getAttributes().getMoveSpeed(); + // double move = time * speed; + // // Calculate movement angles needed + // final double distance = coordinate.getDistance(character + // .getPosition()); + // final int dy = coordinate.getY() - character.getPoint().getY(); + // final int dx = coordinate.getX() - character.getPoint().getX(); + // + // double sin = dy / distance; + // double cos = dx / distance; + // + // double angleTarget = Math.toDegrees(Math.atan2(sin, cos)); + // if (angleTarget < 0) + // angleTarget = 360 + angleTarget; + // final int angle = (int) (angleTarget * 182.044444444); + this.interest = AIInterest.INTEREST_IDLE; + break; + default: + break; + } + } + + @Override + public void stop() { + // TODO Auto-generated method stub + + } + + @Override + public void walk(Coordinate coordinate) { + this.interest = AIInterest.INTEREST_MOVE_TO; + this.coordinate = coordinate; + } + + @Override + public void follow(Positionable positionable) { + } + + @Override + public void attack(Attackable target) { + } +} diff --git a/data/script/ai/script/ai/scanner/AIScanner.java b/data/script/ai/script/ai/scanner/AIScanner.java new file mode 100644 index 000000000..c603c42b4 --- /dev/null +++ b/data/script/ai/script/ai/scanner/AIScanner.java @@ -0,0 +1,25 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package script.ai.scanner; + +/** + * @author Rogiel + * + */ +public interface AIScanner { + +} diff --git a/data/script/template/script/template/actor/character/AbstractCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractCharacterTemplate.java index e5cc3331f..438fdb7f1 100644 --- a/data/script/template/script/template/actor/character/AbstractCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractCharacterTemplate.java @@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point; public abstract class AbstractCharacterTemplate extends CharacterTemplate { protected AbstractCharacterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, maxWeigth, moveSpeed, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java index 03b5f3d00..1e9533caa 100644 --- a/data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java @@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point; public abstract class AbstractDarkElfCharacterTemplate extends AbstractCharacterTemplate { protected AbstractDarkElfCharacterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - false, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java index 2c36d34f2..3a27eb23d 100644 --- a/data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java @@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point; public abstract class AbstractDwarfCharacterTemplate extends AbstractCharacterTemplate { protected AbstractDwarfCharacterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - false, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java index 9ed2b8f70..e89a8920e 100644 --- a/data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java @@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point; public abstract class AbstractElfCharacterTemplate extends AbstractCharacterTemplate { protected AbstractElfCharacterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - false, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java index 659ef7225..f049d9ca3 100644 --- a/data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java @@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point; public abstract class AbstractHumanCharacterTemplate extends AbstractCharacterTemplate { protected AbstractHumanCharacterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - false, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java index d9d9572db..4833e1696 100644 --- a/data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java @@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point; public abstract class AbstractKamaelCharacterTemplate extends AbstractCharacterTemplate { protected AbstractKamaelCharacterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - false, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java index 3cdc07a74..2199d7e17 100644 --- a/data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java @@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point; public abstract class AbstractOrcCharacterTemplate extends AbstractCharacterTemplate { protected AbstractOrcCharacterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - false, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AbyssWalkerTemplate.java b/data/script/template/script/template/actor/character/AbyssWalkerTemplate.java index 01e19fde5..cf1c036fd 100644 --- a/data/script/template/script/template/actor/character/AbyssWalkerTemplate.java +++ b/data/script/template/script/template/actor/character/AbyssWalkerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class AbyssWalkerTemplate extends AssassinTemplate { @Inject public AbyssWalkerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ABYSS_WALKER.id), - CharacterClass.ABYSS_WALKER, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.ABYSS_WALKER.id), CharacterClass.ABYSS_WALKER, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected AbyssWalkerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AdventurerTemplate.java b/data/script/template/script/template/actor/character/AdventurerTemplate.java index 0ab80c2b3..7db1a47f6 100644 --- a/data/script/template/script/template/actor/character/AdventurerTemplate.java +++ b/data/script/template/script/template/actor/character/AdventurerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class AdventurerTemplate extends TreasureHunterTemplate { @Inject public AdventurerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ADVENTURER.id), - CharacterClass.ADVENTURER, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.ADVENTURER.id), CharacterClass.ADVENTURER, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected AdventurerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ArbalesterTemplate.java b/data/script/template/script/template/actor/character/ArbalesterTemplate.java index e1a5688b6..e879c2251 100644 --- a/data/script/template/script/template/actor/character/ArbalesterTemplate.java +++ b/data/script/template/script/template/actor/character/ArbalesterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ArbalesterTemplate extends WarderTemplate { @Inject public ArbalesterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ARBALESTER.id), - CharacterClass.ARBALESTER, - // ATTRIBUTES - 28,// INT - 39,// STR - 30,// CON - 27,// MEN - 35,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.ARBALESTER.id), CharacterClass.ARBALESTER, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 28; + attributes.strength = 39; + attributes.concentration = 30; + attributes.mentality = 27; + attributes.dexterity = 35; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected ArbalesterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ArcanaLordTemplate.java b/data/script/template/script/template/actor/character/ArcanaLordTemplate.java index 233918843..c1e4db813 100644 --- a/data/script/template/script/template/actor/character/ArcanaLordTemplate.java +++ b/data/script/template/script/template/actor/character/ArcanaLordTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ArcanaLordTemplate extends WarlockTemplate { @Inject public ArcanaLordTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ARCANA_LORD.id), - CharacterClass.ARCANA_LORD, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.ARCANA_LORD.id), CharacterClass.ARCANA_LORD, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected ArcanaLordTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ArchmageTemplate.java b/data/script/template/script/template/actor/character/ArchmageTemplate.java index 9c89d91d4..fda10a911 100644 --- a/data/script/template/script/template/actor/character/ArchmageTemplate.java +++ b/data/script/template/script/template/actor/character/ArchmageTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ArchmageTemplate extends SorcerorTemplate { @Inject public ArchmageTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ARCHMAGE.id), - CharacterClass.ARCHMAGE, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.ARCHMAGE.id), CharacterClass.ARCHMAGE, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected ArchmageTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ArtisanTemplate.java b/data/script/template/script/template/actor/character/ArtisanTemplate.java index 0d1ea551a..20a935742 100644 --- a/data/script/template/script/template/actor/character/ArtisanTemplate.java +++ b/data/script/template/script/template/actor/character/ArtisanTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ArtisanTemplate extends DwarvenFighterTemplate { @Inject public ArtisanTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ARTISAN.id), - CharacterClass.ARTISAN, - // ATTRIBUTES - 20,// INT - 39,// STR - 45,// CON - 27,// MEN - 29,// DEX - 10,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 43,// critical - 33,// evasion - 115,// move speed - 83000,// max inventory weight - true,// can craft - Point.fromXYZ(108512, -174026, -400)// spawn location - ); + super(factory.createID(CharacterClass.ARTISAN.id), CharacterClass.ARTISAN, Point.fromXYZ(108512, -174026, -400)); + // ATTRIBUTES + attributes.intelligence = 20; + attributes.strength = 39; + attributes.concentration = 45; + attributes.mentality = 27; + attributes.dexterity = 29; + attributes.witness = 10; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 43; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 83000; + attributes.craft = true; } - + protected ArtisanTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/AssassinTemplate.java b/data/script/template/script/template/actor/character/AssassinTemplate.java index d9d0e20cb..c06cc5798 100644 --- a/data/script/template/script/template/actor/character/AssassinTemplate.java +++ b/data/script/template/script/template/actor/character/AssassinTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class AssassinTemplate extends DarkFighterTemplate { @Inject public AssassinTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ASSASSIN.id), - CharacterClass.ASSASSIN, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.ASSASSIN.id), CharacterClass.ASSASSIN, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected AssassinTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/BersekerTemplate.java b/data/script/template/script/template/actor/character/BersekerTemplate.java index 0ed1afea1..2cca37730 100644 --- a/data/script/template/script/template/actor/character/BersekerTemplate.java +++ b/data/script/template/script/template/actor/character/BersekerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class BersekerTemplate extends TrooperTemplate { @Inject public BersekerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.BERSEKER.id), - CharacterClass.BERSEKER, - // ATTRIBUTES - 29,// INT - 41,// STR - 31,// CON - 25,// MEN - 33,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.BERSEKER.id), CharacterClass.BERSEKER, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 29; + attributes.strength = 41; + attributes.concentration = 31; + attributes.mentality = 25; + attributes.dexterity = 33; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected BersekerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/BishopTemplate.java b/data/script/template/script/template/actor/character/BishopTemplate.java index d412150e1..a472bb06a 100644 --- a/data/script/template/script/template/actor/character/BishopTemplate.java +++ b/data/script/template/script/template/actor/character/BishopTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class BishopTemplate extends ClericTemplate { @Inject public BishopTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.BISHOP.id), - CharacterClass.BISHOP, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.BISHOP.id), CharacterClass.BISHOP, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected BishopTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/BladedancerTemplate.java b/data/script/template/script/template/actor/character/BladedancerTemplate.java index dc7f9d110..4366b032a 100644 --- a/data/script/template/script/template/actor/character/BladedancerTemplate.java +++ b/data/script/template/script/template/actor/character/BladedancerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class BladedancerTemplate extends PalusKnightTemplate { @Inject public BladedancerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.BLADEDANCER.id), - CharacterClass.BLADEDANCER, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.BLADEDANCER.id), CharacterClass.BLADEDANCER, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected BladedancerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/BountyHunterTemplate.java b/data/script/template/script/template/actor/character/BountyHunterTemplate.java index 10bf2536e..8f3c18f13 100644 --- a/data/script/template/script/template/actor/character/BountyHunterTemplate.java +++ b/data/script/template/script/template/actor/character/BountyHunterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class BountyHunterTemplate extends ScavengerTemplate { @Inject public BountyHunterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.BOUNTY_HUNTER.id), - CharacterClass.BOUNTY_HUNTER, - // ATTRIBUTES - 20,// INT - 39,// STR - 45,// CON - 27,// MEN - 29,// DEX - 10,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 43,// critical - 33,// evasion - 115,// move speed - 83000,// max inventory weight - true,// can craft - Point.fromXYZ(108512, -174026, -400)// spawn location - ); + super(factory.createID(CharacterClass.BOUNTY_HUNTER.id), CharacterClass.BOUNTY_HUNTER, Point.fromXYZ(108512, -174026, -400)); + // ATTRIBUTES + attributes.intelligence = 20; + attributes.strength = 39; + attributes.concentration = 45; + attributes.mentality = 27; + attributes.dexterity = 29; + attributes.witness = 10; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 43; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 83000; + attributes.craft = true; } - + protected BountyHunterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/CardinalTemplate.java b/data/script/template/script/template/actor/character/CardinalTemplate.java index 636a16069..62166ee43 100644 --- a/data/script/template/script/template/actor/character/CardinalTemplate.java +++ b/data/script/template/script/template/actor/character/CardinalTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class CardinalTemplate extends BishopTemplate { @Inject public CardinalTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.CARDINAL.id), - CharacterClass.CARDINAL, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.CARDINAL.id), CharacterClass.CARDINAL, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected CardinalTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ClericTemplate.java b/data/script/template/script/template/actor/character/ClericTemplate.java index 43838b039..0e93158eb 100644 --- a/data/script/template/script/template/actor/character/ClericTemplate.java +++ b/data/script/template/script/template/actor/character/ClericTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ClericTemplate extends HumanMysticTemplate { @Inject public ClericTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.CLERIC.id), - CharacterClass.CLERIC, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.CLERIC.id), CharacterClass.CLERIC, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected ClericTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DarkAvengerTemplate.java b/data/script/template/script/template/actor/character/DarkAvengerTemplate.java index 7cefe7e4b..8e1da9f8d 100644 --- a/data/script/template/script/template/actor/character/DarkAvengerTemplate.java +++ b/data/script/template/script/template/actor/character/DarkAvengerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DarkAvengerTemplate extends KnightTemplate { @Inject public DarkAvengerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DARK_AVENGER.id), - CharacterClass.DARK_AVENGER, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.DARK_AVENGER.id), CharacterClass.DARK_AVENGER, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected DarkAvengerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DarkFighterTemplate.java b/data/script/template/script/template/actor/character/DarkFighterTemplate.java index ae8db51a4..1364c18c2 100644 --- a/data/script/template/script/template/actor/character/DarkFighterTemplate.java +++ b/data/script/template/script/template/actor/character/DarkFighterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DarkFighterTemplate extends AbstractDarkElfCharacterTemplate { @Inject public DarkFighterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DARK_FIGHTER.id), - CharacterClass.DARK_FIGHTER, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.DARK_FIGHTER.id), CharacterClass.DARK_FIGHTER, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected DarkFighterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DarkMysticTemplate.java b/data/script/template/script/template/actor/character/DarkMysticTemplate.java index b388cf8b6..f98740d9d 100644 --- a/data/script/template/script/template/actor/character/DarkMysticTemplate.java +++ b/data/script/template/script/template/actor/character/DarkMysticTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DarkMysticTemplate extends AbstractDarkElfCharacterTemplate { @Inject public DarkMysticTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DARK_MYSTIC.id), - CharacterClass.DARK_MYSTIC, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.DARK_MYSTIC.id), CharacterClass.DARK_MYSTIC, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected DarkMysticTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DarkWizardTemplate.java b/data/script/template/script/template/actor/character/DarkWizardTemplate.java index a160f3786..370c6d5e5 100644 --- a/data/script/template/script/template/actor/character/DarkWizardTemplate.java +++ b/data/script/template/script/template/actor/character/DarkWizardTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DarkWizardTemplate extends DarkMysticTemplate { @Inject public DarkWizardTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DARK_WIZARD.id), - CharacterClass.DARK_WIZARD, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.DARK_WIZARD.id), CharacterClass.DARK_WIZARD, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected DarkWizardTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DestroyerTemplate.java b/data/script/template/script/template/actor/character/DestroyerTemplate.java index e52992fd9..748c670c4 100644 --- a/data/script/template/script/template/actor/character/DestroyerTemplate.java +++ b/data/script/template/script/template/actor/character/DestroyerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DestroyerTemplate extends OrcRaiderTemplate { @Inject public DestroyerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DESTROYER.id), - CharacterClass.DESTROYER, - // ATTRIBUTES - 18,// INT - 40,// STR - 47,// CON - 27,// MEN - 26,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 31,// accuracy - 42,// critical - 31,// evasion - 117,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-56693, -113610, -690)// spawn location - ); + super(factory.createID(CharacterClass.DESTROYER.id), CharacterClass.DESTROYER, Point.fromXYZ(-56693, -113610, -690)); + // ATTRIBUTES + attributes.intelligence = 18; + attributes.strength = 40; + attributes.concentration = 47; + attributes.mentality = 27; + attributes.dexterity = 26; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 31; + attributes.criticalChance = 42; + attributes.evasionChance = 31; + attributes.moveSpeed = 117; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected DestroyerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DominatorTemplate.java b/data/script/template/script/template/actor/character/DominatorTemplate.java index 08624ea16..f4faef44b 100644 --- a/data/script/template/script/template/actor/character/DominatorTemplate.java +++ b/data/script/template/script/template/actor/character/DominatorTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DominatorTemplate extends OverlordTemplate { @Inject public DominatorTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DOMINATOR.id), - CharacterClass.DOMINATOR, - // ATTRIBUTES - 31,// INT - 27,// STR - 31,// CON - 42,// MEN - 24,// DEX - 15,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 121,// move speed - 68000,// max inventory weight - false,// can craft - Point.fromXYZ(-56682, -113730, -690)// spawn location - ); + super(factory.createID(CharacterClass.DOMINATOR.id), CharacterClass.DOMINATOR, Point.fromXYZ(-56682, -113730, -690)); + // ATTRIBUTES + attributes.intelligence = 31; + attributes.strength = 27; + attributes.concentration = 31; + attributes.mentality = 42; + attributes.dexterity = 24; + attributes.witness = 15; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 121; + attributes.maxWeigth = 68000; + attributes.craft = false; } - + protected DominatorTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DoombringerTemplate.java b/data/script/template/script/template/actor/character/DoombringerTemplate.java index dbcab2fd1..3d69ca6fa 100644 --- a/data/script/template/script/template/actor/character/DoombringerTemplate.java +++ b/data/script/template/script/template/actor/character/DoombringerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DoombringerTemplate extends BersekerTemplate { @Inject public DoombringerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DOOMBRINGER.id), - CharacterClass.DOOMBRINGER, - // ATTRIBUTES - 29,// INT - 41,// STR - 31,// CON - 25,// MEN - 33,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.DOOMBRINGER.id), CharacterClass.DOOMBRINGER, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 29; + attributes.strength = 41; + attributes.concentration = 31; + attributes.mentality = 25; + attributes.dexterity = 33; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected DoombringerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DoomcryerTemplate.java b/data/script/template/script/template/actor/character/DoomcryerTemplate.java index e5e02b5a4..83cd5d9e3 100644 --- a/data/script/template/script/template/actor/character/DoomcryerTemplate.java +++ b/data/script/template/script/template/actor/character/DoomcryerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DoomcryerTemplate extends WarcryerTemplate { @Inject public DoomcryerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DOOMCRYER.id), - CharacterClass.DOOMCRYER, - // ATTRIBUTES - 31,// INT - 27,// STR - 31,// CON - 42,// MEN - 24,// DEX - 15,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 121,// move speed - 68000,// max inventory weight - false,// can craft - Point.fromXYZ(-56682, -113730, -690)// spawn location - ); + super(factory.createID(CharacterClass.DOOMCRYER.id), CharacterClass.DOOMCRYER, Point.fromXYZ(-56682, -113730, -690)); + // ATTRIBUTES + attributes.intelligence = 31; + attributes.strength = 27; + attributes.concentration = 31; + attributes.mentality = 42; + attributes.dexterity = 24; + attributes.witness = 15; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 121; + attributes.maxWeigth = 68000; + attributes.craft = false; } - + protected DoomcryerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DreadnoughtTemplate.java b/data/script/template/script/template/actor/character/DreadnoughtTemplate.java index c16bc4ce8..10bae9960 100644 --- a/data/script/template/script/template/actor/character/DreadnoughtTemplate.java +++ b/data/script/template/script/template/actor/character/DreadnoughtTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DreadnoughtTemplate extends WarlordTemplate { @Inject public DreadnoughtTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DREADNOUGHT.id), - CharacterClass.DREADNOUGHT, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.DREADNOUGHT.id), CharacterClass.DREADNOUGHT, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected DreadnoughtTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DuelistTemplate.java b/data/script/template/script/template/actor/character/DuelistTemplate.java index bc814778e..3682e4cc3 100644 --- a/data/script/template/script/template/actor/character/DuelistTemplate.java +++ b/data/script/template/script/template/actor/character/DuelistTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DuelistTemplate extends GladiatorTemplate { @Inject public DuelistTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DUELIST.id), - CharacterClass.DUELIST, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.DUELIST.id), CharacterClass.DUELIST, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected DuelistTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/DwarvenFighterTemplate.java b/data/script/template/script/template/actor/character/DwarvenFighterTemplate.java index c481d2f2d..ac43894d0 100644 --- a/data/script/template/script/template/actor/character/DwarvenFighterTemplate.java +++ b/data/script/template/script/template/actor/character/DwarvenFighterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class DwarvenFighterTemplate extends AbstractDwarfCharacterTemplate { @Inject public DwarvenFighterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.DWARVEN_FIGHTER.id), - CharacterClass.DWARVEN_FIGHTER, - // ATTRIBUTES - 20,// INT - 39,// STR - 45,// CON - 27,// MEN - 29,// DEX - 10,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 43,// critical - 33,// evasion - 115,// move speed - 83000,// max inventory weight - true,// can craft - Point.fromXYZ(108512, -174026, -400)// spawn location - ); + super(factory.createID(CharacterClass.DWARVEN_FIGHTER.id), CharacterClass.DWARVEN_FIGHTER, Point.fromXYZ(108512, -174026, -400)); + // ATTRIBUTES + attributes.intelligence = 20; + attributes.strength = 39; + attributes.concentration = 45; + attributes.mentality = 27; + attributes.dexterity = 29; + attributes.witness = 10; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 43; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 83000; + attributes.craft = true; } - + protected DwarvenFighterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ElderTemplate.java b/data/script/template/script/template/actor/character/ElderTemplate.java index 96a06df6f..b56c852f7 100644 --- a/data/script/template/script/template/actor/character/ElderTemplate.java +++ b/data/script/template/script/template/actor/character/ElderTemplate.java @@ -26,42 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ElderTemplate extends OracleTemplate { @Inject public ElderTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ELDER.id), CharacterClass.ELDER, + super(factory.createID(CharacterClass.ELDER.id), CharacterClass.ELDER, Point.fromXYZ(46182, 41198, -3440)); // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected ElderTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ElementalMasterTemplate.java b/data/script/template/script/template/actor/character/ElementalMasterTemplate.java index 1f4bac0fb..29d87e2be 100644 --- a/data/script/template/script/template/actor/character/ElementalMasterTemplate.java +++ b/data/script/template/script/template/actor/character/ElementalMasterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ElementalMasterTemplate extends ElementalSummonerTemplate { @Inject public ElementalMasterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ELEMENTAL_MASTER.id), - CharacterClass.ELEMENTAL_MASTER, - // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + super(factory.createID(CharacterClass.ELEMENTAL_MASTER.id), CharacterClass.ELEMENTAL_MASTER, Point.fromXYZ(46182, 41198, -3440)); + // ATTRIBUTES + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected ElementalMasterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ElementalSummonerTemplate.java b/data/script/template/script/template/actor/character/ElementalSummonerTemplate.java index 24a159145..a91e7052f 100644 --- a/data/script/template/script/template/actor/character/ElementalSummonerTemplate.java +++ b/data/script/template/script/template/actor/character/ElementalSummonerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ElementalSummonerTemplate extends ElvenWizardTemplate { @Inject public ElementalSummonerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ELEMENTAL_SUMMONER.id), - CharacterClass.ELEMENTAL_SUMMONER, - // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + super(factory.createID(CharacterClass.ELEMENTAL_SUMMONER.id), CharacterClass.ELEMENTAL_SUMMONER, Point.fromXYZ(46182, 41198, -3440)); + // ATTRIBUTES + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected ElementalSummonerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ElvenFighterTemplate.java b/data/script/template/script/template/actor/character/ElvenFighterTemplate.java index 7868338b1..b110b25f4 100644 --- a/data/script/template/script/template/actor/character/ElvenFighterTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenFighterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ElvenFighterTemplate extends AbstractElfCharacterTemplate { @Inject public ElvenFighterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ELVEN_FIGHTER.id), - CharacterClass.ELVEN_FIGHTER, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.ELVEN_FIGHTER.id), CharacterClass.ELVEN_FIGHTER, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected ElvenFighterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ElvenKnightTemplate.java b/data/script/template/script/template/actor/character/ElvenKnightTemplate.java index 2d98c985d..ff8b74b58 100644 --- a/data/script/template/script/template/actor/character/ElvenKnightTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenKnightTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ElvenKnightTemplate extends ElvenFighterTemplate { @Inject public ElvenKnightTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ELVEN_KNIGHT.id), - CharacterClass.ELVEN_KNIGHT, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.ELVEN_KNIGHT.id), CharacterClass.ELVEN_KNIGHT, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected ElvenKnightTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ElvenMysticTemplate.java b/data/script/template/script/template/actor/character/ElvenMysticTemplate.java index 5068f30ad..4e1356342 100644 --- a/data/script/template/script/template/actor/character/ElvenMysticTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenMysticTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ElvenMysticTemplate extends AbstractElfCharacterTemplate { @Inject public ElvenMysticTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ELVEN_MYSTIC.id), - CharacterClass.ELVEN_MYSTIC, - // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + super(factory.createID(CharacterClass.ELVEN_MYSTIC.id), CharacterClass.ELVEN_MYSTIC, Point.fromXYZ(46182, 41198, -3440)); + // ATTRIBUTES + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected ElvenMysticTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ElvenScoutTemplate.java b/data/script/template/script/template/actor/character/ElvenScoutTemplate.java index da2210352..fb34f3144 100644 --- a/data/script/template/script/template/actor/character/ElvenScoutTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenScoutTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ElvenScoutTemplate extends ElvenFighterTemplate { @Inject public ElvenScoutTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ELVEN_SCOUT.id), - CharacterClass.ELVEN_SCOUT, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.ELVEN_SCOUT.id), CharacterClass.ELVEN_SCOUT, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected ElvenScoutTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ElvenWizardTemplate.java b/data/script/template/script/template/actor/character/ElvenWizardTemplate.java index c80dab9f9..3350ea25a 100644 --- a/data/script/template/script/template/actor/character/ElvenWizardTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenWizardTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ElvenWizardTemplate extends ElvenMysticTemplate { @Inject public ElvenWizardTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ELVEN_WIZARD.id), - CharacterClass.ELVEN_WIZARD, - // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + super(factory.createID(CharacterClass.ELVEN_WIZARD.id), CharacterClass.ELVEN_WIZARD, Point.fromXYZ(46182, 41198, -3440)); + // ATTRIBUTES + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected ElvenWizardTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/EvaSaintTemplate.java b/data/script/template/script/template/actor/character/EvaSaintTemplate.java index ef24cee9b..2e924e9b3 100644 --- a/data/script/template/script/template/actor/character/EvaSaintTemplate.java +++ b/data/script/template/script/template/actor/character/EvaSaintTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class EvaSaintTemplate extends ElderTemplate { @Inject public EvaSaintTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.EVA_SAINT.id), - CharacterClass.EVA_SAINT, - // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + super(factory.createID(CharacterClass.EVA_SAINT.id), CharacterClass.EVA_SAINT, Point.fromXYZ(46182, 41198, -3440)); + // ATTRIBUTES + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected EvaSaintTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/EvaTemplarTemplate.java b/data/script/template/script/template/actor/character/EvaTemplarTemplate.java index 5a7e3e2a0..fd242f188 100644 --- a/data/script/template/script/template/actor/character/EvaTemplarTemplate.java +++ b/data/script/template/script/template/actor/character/EvaTemplarTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class EvaTemplarTemplate extends TempleKnightTemplate { @Inject public EvaTemplarTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.EVA_TEMPLAR.id), - CharacterClass.EVA_TEMPLAR, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.EVA_TEMPLAR.id), CharacterClass.EVA_TEMPLAR, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected EvaTemplarTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/FemaleSoldierTemplate.java b/data/script/template/script/template/actor/character/FemaleSoldierTemplate.java index 0e771f9fb..125cc82ed 100644 --- a/data/script/template/script/template/actor/character/FemaleSoldierTemplate.java +++ b/data/script/template/script/template/actor/character/FemaleSoldierTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class FemaleSoldierTemplate extends AbstractKamaelCharacterTemplate { @Inject public FemaleSoldierTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.FEMALE_SOLDIER.id), - CharacterClass.FEMALE_SOLDIER, - // ATTRIBUTES - 28,// INT - 39,// STR - 30,// CON - 27,// MEN - 35,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125517, 38267, 1176)// spawn location - ); + super(factory.createID(CharacterClass.FEMALE_SOLDIER.id), CharacterClass.FEMALE_SOLDIER, Point.fromXYZ(-125517, 38267, 1176)); + // ATTRIBUTES + attributes.intelligence = 28; + attributes.strength = 39; + attributes.concentration = 30; + attributes.mentality = 27; + attributes.dexterity = 35; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected FemaleSoldierTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java b/data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java index b8380ca00..9565ffa21 100644 --- a/data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java +++ b/data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class FemaleSoulbreakerTemplate extends WarderTemplate { @Inject public FemaleSoulbreakerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.FEMALE_SOULBREAKER.id), - CharacterClass.FEMALE_SOULBREAKER, - // ATTRIBUTES - 28,// INT - 39,// STR - 30,// CON - 27,// MEN - 35,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.FEMALE_SOULBREAKER.id), CharacterClass.FEMALE_SOULBREAKER, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 28; + attributes.strength = 39; + attributes.concentration = 30; + attributes.mentality = 27; + attributes.dexterity = 35; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected FemaleSoulbreakerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java b/data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java index 531bcfe0e..3447f8cbe 100644 --- a/data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java +++ b/data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class FemaleSouldhoundTemplate extends FemaleSoulbreakerTemplate { @Inject public FemaleSouldhoundTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.FEMALE_SOULDHOUND.id), - CharacterClass.FEMALE_SOULDHOUND, - // ATTRIBUTES - 28,// INT - 39,// STR - 30,// CON - 27,// MEN - 35,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.FEMALE_SOULDHOUND.id), CharacterClass.FEMALE_SOULDHOUND, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 28; + attributes.strength = 39; + attributes.concentration = 30; + attributes.mentality = 27; + attributes.dexterity = 35; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected FemaleSouldhoundTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/FortuneSeekerTemplate.java b/data/script/template/script/template/actor/character/FortuneSeekerTemplate.java index 30ee37db9..da7756912 100644 --- a/data/script/template/script/template/actor/character/FortuneSeekerTemplate.java +++ b/data/script/template/script/template/actor/character/FortuneSeekerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class FortuneSeekerTemplate extends BountyHunterTemplate { @Inject public FortuneSeekerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.FORTUNE_SEEKER.id), - CharacterClass.FORTUNE_SEEKER, - // ATTRIBUTES - 20,// INT - 39,// STR - 45,// CON - 27,// MEN - 29,// DEX - 10,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 43,// critical - 33,// evasion - 115,// move speed - 83000,// max inventory weight - true,// can craft - Point.fromXYZ(108512, -174026, -400)// spawn location - ); + super(factory.createID(CharacterClass.FORTUNE_SEEKER.id), CharacterClass.FORTUNE_SEEKER, Point.fromXYZ(108512, -174026, -400)); + // ATTRIBUTES + attributes.intelligence = 20; + attributes.strength = 39; + attributes.concentration = 45; + attributes.mentality = 27; + attributes.dexterity = 29; + attributes.witness = 10; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 43; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 83000; + attributes.craft = true; } - + protected FortuneSeekerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/GhostHunterTemplate.java b/data/script/template/script/template/actor/character/GhostHunterTemplate.java index f91111315..f001640b9 100644 --- a/data/script/template/script/template/actor/character/GhostHunterTemplate.java +++ b/data/script/template/script/template/actor/character/GhostHunterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class GhostHunterTemplate extends AbyssWalkerTemplate { @Inject public GhostHunterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.GHOST_HUNTER.id), - CharacterClass.GHOST_HUNTER, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.GHOST_HUNTER.id), CharacterClass.GHOST_HUNTER, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected GhostHunterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/GhostSentinelTemplate.java b/data/script/template/script/template/actor/character/GhostSentinelTemplate.java index 04c3eefa0..41ab94496 100644 --- a/data/script/template/script/template/actor/character/GhostSentinelTemplate.java +++ b/data/script/template/script/template/actor/character/GhostSentinelTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class GhostSentinelTemplate extends PhantomRangerTemplate { @Inject public GhostSentinelTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.GHOST_SENTINEL.id), - CharacterClass.GHOST_SENTINEL, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.GHOST_SENTINEL.id), CharacterClass.GHOST_SENTINEL, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected GhostSentinelTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/GladiatorTemplate.java b/data/script/template/script/template/actor/character/GladiatorTemplate.java index a74114bd9..cc20abd82 100644 --- a/data/script/template/script/template/actor/character/GladiatorTemplate.java +++ b/data/script/template/script/template/actor/character/GladiatorTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class GladiatorTemplate extends WarriorTemplate { @Inject public GladiatorTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.GLADIATOR.id), - CharacterClass.GLADIATOR, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.GLADIATOR.id), CharacterClass.GLADIATOR, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected GladiatorTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/GrandKhauatariTemplate.java b/data/script/template/script/template/actor/character/GrandKhauatariTemplate.java index 970281d23..8a6ec782a 100644 --- a/data/script/template/script/template/actor/character/GrandKhauatariTemplate.java +++ b/data/script/template/script/template/actor/character/GrandKhauatariTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class GrandKhauatariTemplate extends TyrantTemplate { @Inject public GrandKhauatariTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.GRAND_KHAUATARI.id), - CharacterClass.GRAND_KHAUATARI, - // ATTRIBUTES - 18,// INT - 40,// STR - 47,// CON - 27,// MEN - 26,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 31,// accuracy - 42,// critical - 31,// evasion - 117,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-56693, -113610, -690)// spawn location - ); + super(factory.createID(CharacterClass.GRAND_KHAUATARI.id), CharacterClass.GRAND_KHAUATARI, Point.fromXYZ(-56693, -113610, -690)); + // ATTRIBUTES + attributes.intelligence = 18; + attributes.strength = 40; + attributes.concentration = 47; + attributes.mentality = 27; + attributes.dexterity = 26; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 31; + attributes.criticalChance = 42; + attributes.evasionChance = 31; + attributes.moveSpeed = 117; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected GrandKhauatariTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/HawkeyeTemplate.java b/data/script/template/script/template/actor/character/HawkeyeTemplate.java index 284552200..6d60536a2 100644 --- a/data/script/template/script/template/actor/character/HawkeyeTemplate.java +++ b/data/script/template/script/template/actor/character/HawkeyeTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class HawkeyeTemplate extends RogueTemplate { @Inject public HawkeyeTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.HAWKEYE.id), - CharacterClass.HAWKEYE, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.HAWKEYE.id), CharacterClass.HAWKEYE, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected HawkeyeTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/HellKnightTemplate.java b/data/script/template/script/template/actor/character/HellKnightTemplate.java index 925051c30..6b6a2819c 100644 --- a/data/script/template/script/template/actor/character/HellKnightTemplate.java +++ b/data/script/template/script/template/actor/character/HellKnightTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class HellKnightTemplate extends DarkAvengerTemplate { @Inject public HellKnightTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.HELL_KNIGHT.id), - CharacterClass.HELL_KNIGHT, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.HELL_KNIGHT.id), CharacterClass.HELL_KNIGHT, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected HellKnightTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/HierophantTemplate.java b/data/script/template/script/template/actor/character/HierophantTemplate.java index 17460ecc4..60d2ce990 100644 --- a/data/script/template/script/template/actor/character/HierophantTemplate.java +++ b/data/script/template/script/template/actor/character/HierophantTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class HierophantTemplate extends ProphetTemplate { @Inject public HierophantTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.HIEROPHANT.id), - CharacterClass.HIEROPHANT, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.HIEROPHANT.id), CharacterClass.HIEROPHANT, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected HierophantTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/HumanFighterTemplate.java b/data/script/template/script/template/actor/character/HumanFighterTemplate.java index 58f21a6e0..7c270665f 100644 --- a/data/script/template/script/template/actor/character/HumanFighterTemplate.java +++ b/data/script/template/script/template/actor/character/HumanFighterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class HumanFighterTemplate extends AbstractHumanCharacterTemplate { @Inject public HumanFighterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.HUMAN_FIGHTER.id), - CharacterClass.HUMAN_FIGHTER, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.HUMAN_FIGHTER.id), CharacterClass.HUMAN_FIGHTER, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected HumanFighterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/HumanMysticTemplate.java b/data/script/template/script/template/actor/character/HumanMysticTemplate.java index d566bf164..37d6f353f 100644 --- a/data/script/template/script/template/actor/character/HumanMysticTemplate.java +++ b/data/script/template/script/template/actor/character/HumanMysticTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class HumanMysticTemplate extends AbstractHumanCharacterTemplate { @Inject public HumanMysticTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.HUMAN_MYSTIC.id), - CharacterClass.HUMAN_MYSTIC, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.HUMAN_MYSTIC.id), CharacterClass.HUMAN_MYSTIC, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected HumanMysticTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/InspectorTemplate.java b/data/script/template/script/template/actor/character/InspectorTemplate.java index 11c40b7de..884b8f9d5 100644 --- a/data/script/template/script/template/actor/character/InspectorTemplate.java +++ b/data/script/template/script/template/actor/character/InspectorTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class InspectorTemplate extends WarderTemplate { @Inject public InspectorTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.INSPECTOR.id), - CharacterClass.INSPECTOR, - // ATTRIBUTES - 28,// INT - 39,// STR - 30,// CON - 27,// MEN - 35,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.INSPECTOR.id), CharacterClass.INSPECTOR, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 28; + attributes.strength = 39; + attributes.concentration = 30; + attributes.mentality = 27; + attributes.dexterity = 35; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected InspectorTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/JudicatorTemplate.java b/data/script/template/script/template/actor/character/JudicatorTemplate.java index 0c52e920d..f1ab27b46 100644 --- a/data/script/template/script/template/actor/character/JudicatorTemplate.java +++ b/data/script/template/script/template/actor/character/JudicatorTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class JudicatorTemplate extends InspectorTemplate { @Inject public JudicatorTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.JUDICATOR.id), - CharacterClass.JUDICATOR, - // ATTRIBUTES - 28,// INT - 39,// STR - 30,// CON - 27,// MEN - 35,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.JUDICATOR.id), CharacterClass.JUDICATOR, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 28; + attributes.strength = 39; + attributes.concentration = 30; + attributes.mentality = 27; + attributes.dexterity = 35; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected JudicatorTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/KnightTemplate.java b/data/script/template/script/template/actor/character/KnightTemplate.java index 7933d583e..55426ffb5 100644 --- a/data/script/template/script/template/actor/character/KnightTemplate.java +++ b/data/script/template/script/template/actor/character/KnightTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class KnightTemplate extends HumanFighterTemplate { @Inject public KnightTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.KNIGHT.id), - CharacterClass.KNIGHT, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.KNIGHT.id), CharacterClass.KNIGHT, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected KnightTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/MaestroTemplate.java b/data/script/template/script/template/actor/character/MaestroTemplate.java index 2af34b687..306609896 100644 --- a/data/script/template/script/template/actor/character/MaestroTemplate.java +++ b/data/script/template/script/template/actor/character/MaestroTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class MaestroTemplate extends WarsmithTemplate { @Inject public MaestroTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.MAESTRO.id), - CharacterClass.MAESTRO, - // ATTRIBUTES - 20,// INT - 39,// STR - 45,// CON - 27,// MEN - 29,// DEX - 10,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 43,// critical - 33,// evasion - 115,// move speed - 83000,// max inventory weight - true,// can craft - Point.fromXYZ(108512, -174026, -400)// spawn location - ); + super(factory.createID(CharacterClass.MAESTRO.id), CharacterClass.MAESTRO, Point.fromXYZ(108512, -174026, -400)); + // ATTRIBUTES + attributes.intelligence = 20; + attributes.strength = 39; + attributes.concentration = 45; + attributes.mentality = 27; + attributes.dexterity = 29; + attributes.witness = 10; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 43; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 83000; + attributes.craft = true; } - + protected MaestroTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/MaleSoldierTemplate.java b/data/script/template/script/template/actor/character/MaleSoldierTemplate.java index 4b05884fb..cb7b3cba8 100644 --- a/data/script/template/script/template/actor/character/MaleSoldierTemplate.java +++ b/data/script/template/script/template/actor/character/MaleSoldierTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class MaleSoldierTemplate extends AbstractKamaelCharacterTemplate { @Inject public MaleSoldierTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.MALE_SOLDIER.id), - CharacterClass.MALE_SOLDIER, - // ATTRIBUTES - 29,// INT - 41,// STR - 31,// CON - 25,// MEN - 33,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125464, 37776, 1176)// spawn location - ); + super(factory.createID(CharacterClass.MALE_SOLDIER.id), CharacterClass.MALE_SOLDIER, Point.fromXYZ(-125464, 37776, 1176)); + // ATTRIBUTES + attributes.intelligence = 29; + attributes.strength = 41; + attributes.concentration = 31; + attributes.mentality = 25; + attributes.dexterity = 33; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected MaleSoldierTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java b/data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java index e7e561aea..eee750070 100644 --- a/data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java +++ b/data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class MaleSoulbreakerTemplate extends TrooperTemplate { @Inject public MaleSoulbreakerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.MALE_SOULBREAKER.id), - CharacterClass.MALE_SOULBREAKER, - // ATTRIBUTES - 29,// INT - 41,// STR - 31,// CON - 25,// MEN - 33,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.MALE_SOULBREAKER.id), CharacterClass.MALE_SOULBREAKER, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 29; + attributes.strength = 41; + attributes.concentration = 31; + attributes.mentality = 25; + attributes.dexterity = 33; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected MaleSoulbreakerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java b/data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java index 913b0a7bb..1f5219409 100644 --- a/data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java +++ b/data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class MaleSouldhoundTemplate extends MaleSoulbreakerTemplate { @Inject public MaleSouldhoundTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.MALE_SOULDHOUND.id), - CharacterClass.MALE_SOULDHOUND, - // ATTRIBUTES - 29,// INT - 41,// STR - 31,// CON - 25,// MEN - 33,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.MALE_SOULDHOUND.id), CharacterClass.MALE_SOULDHOUND, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 29; + attributes.strength = 41; + attributes.concentration = 31; + attributes.mentality = 25; + attributes.dexterity = 33; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected MaleSouldhoundTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java b/data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java index 7cef9679a..f3dda0241 100644 --- a/data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java +++ b/data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class MoonlightSentinelTemplate extends SilverRangerTemplate { @Inject public MoonlightSentinelTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.MOONLIGHT_SENTINEL.id), - CharacterClass.MOONLIGHT_SENTINEL, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.MOONLIGHT_SENTINEL.id), CharacterClass.MOONLIGHT_SENTINEL, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected MoonlightSentinelTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/MysticMuseTemplate.java b/data/script/template/script/template/actor/character/MysticMuseTemplate.java index efe2b8ce6..a21425c5e 100644 --- a/data/script/template/script/template/actor/character/MysticMuseTemplate.java +++ b/data/script/template/script/template/actor/character/MysticMuseTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class MysticMuseTemplate extends SpellsingerTemplate { @Inject public MysticMuseTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.MYSTIC_MUSE.id), - CharacterClass.MYSTIC_MUSE, - // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + super(factory.createID(CharacterClass.MYSTIC_MUSE.id), CharacterClass.MYSTIC_MUSE, Point.fromXYZ(46182, 41198, -3440)); + // ATTRIBUTES + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected MysticMuseTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/NecromancerTemplate.java b/data/script/template/script/template/actor/character/NecromancerTemplate.java index b88d535da..042e368c0 100644 --- a/data/script/template/script/template/actor/character/NecromancerTemplate.java +++ b/data/script/template/script/template/actor/character/NecromancerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class NecromancerTemplate extends WizardTemplate { @Inject public NecromancerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.NECROMANCER.id), - CharacterClass.NECROMANCER, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.NECROMANCER.id), CharacterClass.NECROMANCER, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected NecromancerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/OracleTemplate.java b/data/script/template/script/template/actor/character/OracleTemplate.java index 6041df647..7ec1f3ff1 100644 --- a/data/script/template/script/template/actor/character/OracleTemplate.java +++ b/data/script/template/script/template/actor/character/OracleTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class OracleTemplate extends ElvenMysticTemplate { @Inject public OracleTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ORACLE.id), - CharacterClass.ORACLE, - // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + super(factory.createID(CharacterClass.ORACLE.id), CharacterClass.ORACLE, Point.fromXYZ(46182, 41198, -3440)); + // ATTRIBUTES + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected OracleTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/OrcFighterTemplate.java b/data/script/template/script/template/actor/character/OrcFighterTemplate.java index 14445e495..3ea40da2d 100644 --- a/data/script/template/script/template/actor/character/OrcFighterTemplate.java +++ b/data/script/template/script/template/actor/character/OrcFighterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class OrcFighterTemplate extends AbstractOrcCharacterTemplate { @Inject public OrcFighterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ORC_FIGHTER.id), - CharacterClass.ORC_FIGHTER, - // ATTRIBUTES - 18,// INT - 40,// STR - 47,// CON - 27,// MEN - 26,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 31,// accuracy - 42,// critical - 31,// evasion - 117,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-56693, -113610, -690)// spawn location - ); + super(factory.createID(CharacterClass.ORC_FIGHTER.id), CharacterClass.ORC_FIGHTER, Point.fromXYZ(-56693, -113610, -690)); + // ATTRIBUTES + attributes.intelligence = 18; + attributes.strength = 40; + attributes.concentration = 47; + attributes.mentality = 27; + attributes.dexterity = 26; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 31; + attributes.criticalChance = 42; + attributes.evasionChance = 31; + attributes.moveSpeed = 117; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected OrcFighterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/OrcMonkTemplate.java b/data/script/template/script/template/actor/character/OrcMonkTemplate.java index ee6add3ca..cbe39d1e6 100644 --- a/data/script/template/script/template/actor/character/OrcMonkTemplate.java +++ b/data/script/template/script/template/actor/character/OrcMonkTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class OrcMonkTemplate extends OrcFighterTemplate { @Inject public OrcMonkTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ORC_MONK.id), - CharacterClass.ORC_MONK, - // ATTRIBUTES - 18,// INT - 40,// STR - 47,// CON - 27,// MEN - 26,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 31,// accuracy - 42,// critical - 31,// evasion - 117,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-56682, -113610, -690)// spawn location - ); + super(factory.createID(CharacterClass.ORC_MONK.id), CharacterClass.ORC_MONK, Point.fromXYZ(-56682, -113610, -690)); + // ATTRIBUTES + attributes.intelligence = 18; + attributes.strength = 40; + attributes.concentration = 47; + attributes.mentality = 27; + attributes.dexterity = 26; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 31; + attributes.criticalChance = 42; + attributes.evasionChance = 31; + attributes.moveSpeed = 117; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected OrcMonkTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/OrcMysticTemplate.java b/data/script/template/script/template/actor/character/OrcMysticTemplate.java index 4bfed5115..6c983fb87 100644 --- a/data/script/template/script/template/actor/character/OrcMysticTemplate.java +++ b/data/script/template/script/template/actor/character/OrcMysticTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class OrcMysticTemplate extends AbstractOrcCharacterTemplate { @Inject public OrcMysticTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ORC_MYSTIC.id), - CharacterClass.ORC_MYSTIC, - // ATTRIBUTES - 31,// INT - 27,// STR - 31,// CON - 42,// MEN - 24,// DEX - 15,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 121,// move speed - 68000,// max inventory weight - false,// can craft - Point.fromXYZ(-56682, -113730, -690)// spawn location - ); + super(factory.createID(CharacterClass.ORC_MYSTIC.id), CharacterClass.ORC_MYSTIC, Point.fromXYZ(-56682, -113730, -690)); + // ATTRIBUTES + attributes.intelligence = 31; + attributes.strength = 27; + attributes.concentration = 31; + attributes.mentality = 42; + attributes.dexterity = 24; + attributes.witness = 15; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 121; + attributes.maxWeigth = 68000; + attributes.craft = false; } - + protected OrcMysticTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/OrcRaiderTemplate.java b/data/script/template/script/template/actor/character/OrcRaiderTemplate.java index f593e9db8..a48a227fa 100644 --- a/data/script/template/script/template/actor/character/OrcRaiderTemplate.java +++ b/data/script/template/script/template/actor/character/OrcRaiderTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class OrcRaiderTemplate extends OrcFighterTemplate { @Inject public OrcRaiderTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ORC_RAIDER.id), - CharacterClass.ORC_RAIDER, - // ATTRIBUTES - 18,// INT - 40,// STR - 47,// CON - 27,// MEN - 26,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 31,// accuracy - 42,// critical - 31,// evasion - 117,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-56693, -113610, -690)// spawn location - ); + super(factory.createID(CharacterClass.ORC_RAIDER.id), CharacterClass.ORC_RAIDER, Point.fromXYZ(-56693, -113610, -690)); + // ATTRIBUTES + attributes.intelligence = 18; + attributes.strength = 40; + attributes.concentration = 47; + attributes.mentality = 27; + attributes.dexterity = 26; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 31; + attributes.criticalChance = 42; + attributes.evasionChance = 31; + attributes.moveSpeed = 117; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected OrcRaiderTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/OrcShamanTemplate.java b/data/script/template/script/template/actor/character/OrcShamanTemplate.java index 232047719..b783b060a 100644 --- a/data/script/template/script/template/actor/character/OrcShamanTemplate.java +++ b/data/script/template/script/template/actor/character/OrcShamanTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class OrcShamanTemplate extends OrcMysticTemplate { @Inject public OrcShamanTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ORC_SHAMAN.id), - CharacterClass.ORC_SHAMAN, - // ATTRIBUTES - 31,// INT - 27,// STR - 31,// CON - 42,// MEN - 24,// DEX - 15,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 121,// move speed - 68000,// max inventory weight - false,// can craft - Point.fromXYZ(-56682, -113730, -690)// spawn location - ); + super(factory.createID(CharacterClass.ORC_SHAMAN.id), CharacterClass.ORC_SHAMAN, Point.fromXYZ(-56682, -113730, -690)); + // ATTRIBUTES + attributes.intelligence = 31; + attributes.strength = 27; + attributes.concentration = 31; + attributes.mentality = 42; + attributes.dexterity = 24; + attributes.witness = 15; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 121; + attributes.maxWeigth = 68000; + attributes.craft = false; } - + protected OrcShamanTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/OverlordTemplate.java b/data/script/template/script/template/actor/character/OverlordTemplate.java index 52f1d20fb..e7586b5be 100644 --- a/data/script/template/script/template/actor/character/OverlordTemplate.java +++ b/data/script/template/script/template/actor/character/OverlordTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class OverlordTemplate extends OrcShamanTemplate { @Inject public OverlordTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.OVERLORD.id), - CharacterClass.OVERLORD, - // ATTRIBUTES - 31,// INT - 27,// STR - 31,// CON - 42,// MEN - 24,// DEX - 15,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 121,// move speed - 68000,// max inventory weight - false,// can craft - Point.fromXYZ(-56682, -113730, -690)// spawn location - ); + super(factory.createID(CharacterClass.OVERLORD.id), CharacterClass.OVERLORD, Point.fromXYZ(-56682, -113730, -690)); + // ATTRIBUTES + attributes.intelligence = 31; + attributes.strength = 27; + attributes.concentration = 31; + attributes.mentality = 42; + attributes.dexterity = 24; + attributes.witness = 15; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 121; + attributes.maxWeigth = 68000; + attributes.craft = false; } - + protected OverlordTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/PaladinTemplate.java b/data/script/template/script/template/actor/character/PaladinTemplate.java index 814f4d905..2fcdc5dc1 100644 --- a/data/script/template/script/template/actor/character/PaladinTemplate.java +++ b/data/script/template/script/template/actor/character/PaladinTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class PaladinTemplate extends KnightTemplate { @Inject public PaladinTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.PALADIN.id), - CharacterClass.PALADIN, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.PALADIN.id), CharacterClass.PALADIN, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected PaladinTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/PalusKnightTemplate.java b/data/script/template/script/template/actor/character/PalusKnightTemplate.java index 27f6d8e96..187ece6ff 100644 --- a/data/script/template/script/template/actor/character/PalusKnightTemplate.java +++ b/data/script/template/script/template/actor/character/PalusKnightTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class PalusKnightTemplate extends DarkFighterTemplate { @Inject public PalusKnightTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.PALUS_KNIGHT.id), - CharacterClass.PALUS_KNIGHT, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.PALUS_KNIGHT.id), CharacterClass.PALUS_KNIGHT, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected PalusKnightTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/PhantomRangerTemplate.java b/data/script/template/script/template/actor/character/PhantomRangerTemplate.java index eea50a858..9626edf35 100644 --- a/data/script/template/script/template/actor/character/PhantomRangerTemplate.java +++ b/data/script/template/script/template/actor/character/PhantomRangerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class PhantomRangerTemplate extends AssassinTemplate { @Inject public PhantomRangerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.PHANTOM_RANGER.id), - CharacterClass.PHANTOM_RANGER, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.PHANTOM_RANGER.id), CharacterClass.PHANTOM_RANGER, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected PhantomRangerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/PhantomSummonerTemplate.java b/data/script/template/script/template/actor/character/PhantomSummonerTemplate.java index d3c7271f8..cf8daf234 100644 --- a/data/script/template/script/template/actor/character/PhantomSummonerTemplate.java +++ b/data/script/template/script/template/actor/character/PhantomSummonerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class PhantomSummonerTemplate extends DarkWizardTemplate { @Inject public PhantomSummonerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.PHANTOM_SUMMONER.id), - CharacterClass.PHANTOM_SUMMONER, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.PHANTOM_SUMMONER.id), CharacterClass.PHANTOM_SUMMONER, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected PhantomSummonerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/PhoenixKnightTemplate.java b/data/script/template/script/template/actor/character/PhoenixKnightTemplate.java index 6ed676012..f7472e4c6 100644 --- a/data/script/template/script/template/actor/character/PhoenixKnightTemplate.java +++ b/data/script/template/script/template/actor/character/PhoenixKnightTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class PhoenixKnightTemplate extends PaladinTemplate { @Inject public PhoenixKnightTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.PHOENIX_KNIGHT.id), - CharacterClass.PHOENIX_KNIGHT, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.PHOENIX_KNIGHT.id), CharacterClass.PHOENIX_KNIGHT, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected PhoenixKnightTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/PlainsWalkerTemplate.java b/data/script/template/script/template/actor/character/PlainsWalkerTemplate.java index 296a5d42c..9ccf8c501 100644 --- a/data/script/template/script/template/actor/character/PlainsWalkerTemplate.java +++ b/data/script/template/script/template/actor/character/PlainsWalkerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class PlainsWalkerTemplate extends ElvenScoutTemplate { @Inject public PlainsWalkerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.PLAINS_WALKER.id), - CharacterClass.PLAINS_WALKER, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.PLAINS_WALKER.id), CharacterClass.PLAINS_WALKER, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected PlainsWalkerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ProphetTemplate.java b/data/script/template/script/template/actor/character/ProphetTemplate.java index 83355326d..2256f05dd 100644 --- a/data/script/template/script/template/actor/character/ProphetTemplate.java +++ b/data/script/template/script/template/actor/character/ProphetTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ProphetTemplate extends ClericTemplate { @Inject public ProphetTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.PROPHET.id), - CharacterClass.PROPHET, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.PROPHET.id), CharacterClass.PROPHET, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected ProphetTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/RogueTemplate.java b/data/script/template/script/template/actor/character/RogueTemplate.java index 8a81ca4d9..1773f3af5 100644 --- a/data/script/template/script/template/actor/character/RogueTemplate.java +++ b/data/script/template/script/template/actor/character/RogueTemplate.java @@ -26,42 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class RogueTemplate extends HumanFighterTemplate { @Inject public RogueTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.ROGUE.id), CharacterClass.ROGUE, + super(factory.createID(CharacterClass.ROGUE.id), CharacterClass.ROGUE, Point.fromXYZ(-71338, 258271, -3104)); // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected RogueTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SagittariusTemplate.java b/data/script/template/script/template/actor/character/SagittariusTemplate.java index 8b46759f3..05fcdb01d 100644 --- a/data/script/template/script/template/actor/character/SagittariusTemplate.java +++ b/data/script/template/script/template/actor/character/SagittariusTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SagittariusTemplate extends HawkeyeTemplate { @Inject public SagittariusTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SAGITTARIUS.id), - CharacterClass.SAGITTARIUS, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.SAGITTARIUS.id), CharacterClass.SAGITTARIUS, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected SagittariusTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ScavengerTemplate.java b/data/script/template/script/template/actor/character/ScavengerTemplate.java index bb4cd5fbe..c2628439e 100644 --- a/data/script/template/script/template/actor/character/ScavengerTemplate.java +++ b/data/script/template/script/template/actor/character/ScavengerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ScavengerTemplate extends DwarvenFighterTemplate { @Inject public ScavengerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SCAVENGER.id), - CharacterClass.SCAVENGER, - // ATTRIBUTES - 20,// INT - 39,// STR - 45,// CON - 27,// MEN - 29,// DEX - 10,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 43,// critical - 33,// evasion - 115,// move speed - 83000,// max inventory weight - true,// can craft - Point.fromXYZ(108512, -174026, -400)// spawn location - ); + super(factory.createID(CharacterClass.SCAVENGER.id), CharacterClass.SCAVENGER, Point.fromXYZ(108512, -174026, -400)); + // ATTRIBUTES + attributes.intelligence = 20; + attributes.strength = 39; + attributes.concentration = 45; + attributes.mentality = 27; + attributes.dexterity = 29; + attributes.witness = 10; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 43; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 83000; + attributes.craft = true; } - + protected ScavengerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ShillieanSaintTemplate.java b/data/script/template/script/template/actor/character/ShillieanSaintTemplate.java index 0b5ee53c0..0f4b894c5 100644 --- a/data/script/template/script/template/actor/character/ShillieanSaintTemplate.java +++ b/data/script/template/script/template/actor/character/ShillieanSaintTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ShillieanSaintTemplate extends ShillienElderTemplate { @Inject public ShillieanSaintTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SHILLIEAN_SAINT.id), - CharacterClass.SHILLIEAN_SAINT, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.SHILLIEAN_SAINT.id), CharacterClass.SHILLIEAN_SAINT, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected ShillieanSaintTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ShillienElderTemplate.java b/data/script/template/script/template/actor/character/ShillienElderTemplate.java index 389f7391e..5db855d25 100644 --- a/data/script/template/script/template/actor/character/ShillienElderTemplate.java +++ b/data/script/template/script/template/actor/character/ShillienElderTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ShillienElderTemplate extends ShillienOracleTemplate { @Inject public ShillienElderTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SHILLIEN_ELDER.id), - CharacterClass.SHILLIEN_ELDER, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.SHILLIEN_ELDER.id), CharacterClass.SHILLIEN_ELDER, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected ShillienElderTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ShillienKnightTemplate.java b/data/script/template/script/template/actor/character/ShillienKnightTemplate.java index a6dd091b9..42af9f396 100644 --- a/data/script/template/script/template/actor/character/ShillienKnightTemplate.java +++ b/data/script/template/script/template/actor/character/ShillienKnightTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ShillienKnightTemplate extends PalusKnightTemplate { @Inject public ShillienKnightTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SHILLIEN_KNIGHT.id), - CharacterClass.SHILLIEN_KNIGHT, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.SHILLIEN_KNIGHT.id), CharacterClass.SHILLIEN_KNIGHT, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected ShillienKnightTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ShillienOracleTemplate.java b/data/script/template/script/template/actor/character/ShillienOracleTemplate.java index 2d1c418ce..f3264ec0d 100644 --- a/data/script/template/script/template/actor/character/ShillienOracleTemplate.java +++ b/data/script/template/script/template/actor/character/ShillienOracleTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ShillienOracleTemplate extends DarkMysticTemplate { @Inject public ShillienOracleTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SHILLIEN_ORACLE.id), - CharacterClass.SHILLIEN_ORACLE, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.SHILLIEN_ORACLE.id), CharacterClass.SHILLIEN_ORACLE, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected ShillienOracleTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/ShillienTemplarTemplate.java b/data/script/template/script/template/actor/character/ShillienTemplarTemplate.java index 4d2ea2867..5efaba2cc 100644 --- a/data/script/template/script/template/actor/character/ShillienTemplarTemplate.java +++ b/data/script/template/script/template/actor/character/ShillienTemplarTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ShillienTemplarTemplate extends ShillienKnightTemplate { @Inject public ShillienTemplarTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SHILLIEN_TEMPLAR.id), - CharacterClass.SHILLIEN_TEMPLAR, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.SHILLIEN_TEMPLAR.id), CharacterClass.SHILLIEN_TEMPLAR, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected ShillienTemplarTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SilverRangerTemplate.java b/data/script/template/script/template/actor/character/SilverRangerTemplate.java index 06056c01c..0af74ab95 100644 --- a/data/script/template/script/template/actor/character/SilverRangerTemplate.java +++ b/data/script/template/script/template/actor/character/SilverRangerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SilverRangerTemplate extends ElvenScoutTemplate { @Inject public SilverRangerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SILVER_RANGER.id), - CharacterClass.SILVER_RANGER, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.SILVER_RANGER.id), CharacterClass.SILVER_RANGER, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected SilverRangerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SorcerorTemplate.java b/data/script/template/script/template/actor/character/SorcerorTemplate.java index 62ed365f4..382d75416 100644 --- a/data/script/template/script/template/actor/character/SorcerorTemplate.java +++ b/data/script/template/script/template/actor/character/SorcerorTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SorcerorTemplate extends WizardTemplate { @Inject public SorcerorTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SORCEROR.id), - CharacterClass.SORCEROR, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.SORCEROR.id), CharacterClass.SORCEROR, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected SorcerorTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SoultakerTemplate.java b/data/script/template/script/template/actor/character/SoultakerTemplate.java index 2c61c3739..21596a85b 100644 --- a/data/script/template/script/template/actor/character/SoultakerTemplate.java +++ b/data/script/template/script/template/actor/character/SoultakerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SoultakerTemplate extends NecromancerTemplate { @Inject public SoultakerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SOULTAKER.id), - CharacterClass.SOULTAKER, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.SOULTAKER.id), CharacterClass.SOULTAKER, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected SoultakerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SpectralMasterTemplate.java b/data/script/template/script/template/actor/character/SpectralMasterTemplate.java index c473282d1..f424503d2 100644 --- a/data/script/template/script/template/actor/character/SpectralMasterTemplate.java +++ b/data/script/template/script/template/actor/character/SpectralMasterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SpectralMasterTemplate extends PhantomSummonerTemplate { @Inject public SpectralMasterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SPECTRAL_MASTER.id), - CharacterClass.SPECTRAL_MASTER, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.SPECTRAL_MASTER.id), CharacterClass.SPECTRAL_MASTER, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected SpectralMasterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SpectraldancerTemplate.java b/data/script/template/script/template/actor/character/SpectraldancerTemplate.java index b8523abc0..f79469505 100644 --- a/data/script/template/script/template/actor/character/SpectraldancerTemplate.java +++ b/data/script/template/script/template/actor/character/SpectraldancerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SpectraldancerTemplate extends BladedancerTemplate { @Inject public SpectraldancerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.spectralDancer.id), - CharacterClass.spectralDancer, - // ATTRIBUTES - 25,// INT - 41,// STR - 32,// CON - 26,// MEN - 34,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 69000,// max inventory weight - false,// can craft - Point.fromXYZ(28377, 10916, -4224)// spawn location - ); + super(factory.createID(CharacterClass.spectralDancer.id), CharacterClass.spectralDancer, Point.fromXYZ(28377, 10916, -4224)); + // ATTRIBUTES + attributes.intelligence = 25; + attributes.strength = 41; + attributes.concentration = 32; + attributes.mentality = 26; + attributes.dexterity = 34; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 69000; + attributes.craft = false; } - + protected SpectraldancerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SpellhowlerTemplate.java b/data/script/template/script/template/actor/character/SpellhowlerTemplate.java index 1f44620e0..76a034ebf 100644 --- a/data/script/template/script/template/actor/character/SpellhowlerTemplate.java +++ b/data/script/template/script/template/actor/character/SpellhowlerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SpellhowlerTemplate extends DarkWizardTemplate { @Inject public SpellhowlerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SPELLHOWLER.id), - CharacterClass.SPELLHOWLER, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.SPELLHOWLER.id), CharacterClass.SPELLHOWLER, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected SpellhowlerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SpellsingerTemplate.java b/data/script/template/script/template/actor/character/SpellsingerTemplate.java index dc89b33c4..c4aba69ea 100644 --- a/data/script/template/script/template/actor/character/SpellsingerTemplate.java +++ b/data/script/template/script/template/actor/character/SpellsingerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SpellsingerTemplate extends ElvenWizardTemplate { @Inject public SpellsingerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SPELLSINGER.id), - CharacterClass.SPELLSINGER, - // ATTRIBUTES - 37,// INT - 21,// STR - 25,// CON - 40,// MEN - 24,// DEX - 23,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 122,// move speed - 62400,// max inventory weight - false,// can craft - Point.fromXYZ(46182, 41198, -3440)// spawn location - ); + super(factory.createID(CharacterClass.SPELLSINGER.id), CharacterClass.SPELLSINGER, Point.fromXYZ(46182, 41198, -3440)); + // ATTRIBUTES + attributes.intelligence = 37; + attributes.strength = 21; + attributes.concentration = 25; + attributes.mentality = 40; + attributes.dexterity = 24; + attributes.witness = 23; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 122; + attributes.maxWeigth = 62400; + attributes.craft = false; } - + protected SpellsingerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/StormScreamerTemplate.java b/data/script/template/script/template/actor/character/StormScreamerTemplate.java index 55627ccb0..ca2fadd54 100644 --- a/data/script/template/script/template/actor/character/StormScreamerTemplate.java +++ b/data/script/template/script/template/actor/character/StormScreamerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class StormScreamerTemplate extends SpellhowlerTemplate { @Inject public StormScreamerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.STORM_SCREAMER.id), - CharacterClass.STORM_SCREAMER, - // ATTRIBUTES - 44,// INT - 23,// STR - 24,// CON - 37,// MEN - 23,// DEX - 19,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 29,// accuracy - 41,// critical - 29,// evasion - 122,// move speed - 61000,// max inventory weight - false,// can craft - Point.fromXYZ(28295, 11063, -4224)// spawn location - ); + super(factory.createID(CharacterClass.STORM_SCREAMER.id), CharacterClass.STORM_SCREAMER, Point.fromXYZ(28295, 11063, -4224)); + // ATTRIBUTES + attributes.intelligence = 44; + attributes.strength = 23; + attributes.concentration = 24; + attributes.mentality = 37; + attributes.dexterity = 23; + attributes.witness = 19; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 29; + attributes.criticalChance = 41; + attributes.evasionChance = 29; + attributes.moveSpeed = 122; + attributes.maxWeigth = 61000; + attributes.craft = false; } - + protected StormScreamerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SwordMuseTemplate.java b/data/script/template/script/template/actor/character/SwordMuseTemplate.java index d78dfbc99..a56a57045 100644 --- a/data/script/template/script/template/actor/character/SwordMuseTemplate.java +++ b/data/script/template/script/template/actor/character/SwordMuseTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SwordMuseTemplate extends SwordSingerTemplate { @Inject public SwordMuseTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SWORD_MUSE.id), - CharacterClass.SWORD_MUSE, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.SWORD_MUSE.id), CharacterClass.SWORD_MUSE, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected SwordMuseTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/SwordSingerTemplate.java b/data/script/template/script/template/actor/character/SwordSingerTemplate.java index b43b04d9b..fb49c55ed 100644 --- a/data/script/template/script/template/actor/character/SwordSingerTemplate.java +++ b/data/script/template/script/template/actor/character/SwordSingerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class SwordSingerTemplate extends ElvenKnightTemplate { @Inject public SwordSingerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.SWORD_SINGER.id), - CharacterClass.SWORD_SINGER, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.SWORD_SINGER.id), CharacterClass.SWORD_SINGER, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected SwordSingerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/TempleKnightTemplate.java b/data/script/template/script/template/actor/character/TempleKnightTemplate.java index 42f1c4966..d6a0c8acd 100644 --- a/data/script/template/script/template/actor/character/TempleKnightTemplate.java +++ b/data/script/template/script/template/actor/character/TempleKnightTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class TempleKnightTemplate extends ElvenKnightTemplate { @Inject public TempleKnightTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.TEMPLE_KNIGHT.id), - CharacterClass.TEMPLE_KNIGHT, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.TEMPLE_KNIGHT.id), CharacterClass.TEMPLE_KNIGHT, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected TempleKnightTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/TitanTemplate.java b/data/script/template/script/template/actor/character/TitanTemplate.java index 619485557..ee450a261 100644 --- a/data/script/template/script/template/actor/character/TitanTemplate.java +++ b/data/script/template/script/template/actor/character/TitanTemplate.java @@ -26,42 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class TitanTemplate extends DestroyerTemplate { @Inject public TitanTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.TITAN.id), CharacterClass.TITAN, + super(factory.createID(CharacterClass.TITAN.id), CharacterClass.TITAN, Point.fromXYZ(-56693, -113610, -690)); // ATTRIBUTES - 18,// INT - 40,// STR - 47,// CON - 27,// MEN - 26,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 31,// accuracy - 42,// critical - 31,// evasion - 117,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-56693, -113610, -690)// spawn location - ); + attributes.intelligence = 18; + attributes.strength = 40; + attributes.concentration = 47; + attributes.mentality = 27; + attributes.dexterity = 26; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 31; + attributes.criticalChance = 42; + attributes.evasionChance = 31; + attributes.moveSpeed = 117; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected TitanTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/TreasureHunterTemplate.java b/data/script/template/script/template/actor/character/TreasureHunterTemplate.java index 7dff4109a..08e97f697 100644 --- a/data/script/template/script/template/actor/character/TreasureHunterTemplate.java +++ b/data/script/template/script/template/actor/character/TreasureHunterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class TreasureHunterTemplate extends RogueTemplate { @Inject public TreasureHunterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.TREASURE_HUNTER.id), - CharacterClass.TREASURE_HUNTER, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.TREASURE_HUNTER.id), CharacterClass.TREASURE_HUNTER, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected TreasureHunterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/TricksterTemplate.java b/data/script/template/script/template/actor/character/TricksterTemplate.java index 2088f081c..7ed064ce9 100644 --- a/data/script/template/script/template/actor/character/TricksterTemplate.java +++ b/data/script/template/script/template/actor/character/TricksterTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class TricksterTemplate extends ArbalesterTemplate { @Inject public TricksterTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.TRICKSTER.id), - CharacterClass.TRICKSTER, - // ATTRIBUTES - 28,// INT - 39,// STR - 30,// CON - 27,// MEN - 35,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.TRICKSTER.id), CharacterClass.TRICKSTER, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 28; + attributes.strength = 39; + attributes.concentration = 30; + attributes.mentality = 27; + attributes.dexterity = 35; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected TricksterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/TrooperTemplate.java b/data/script/template/script/template/actor/character/TrooperTemplate.java index f7cf53e81..dded8fe66 100644 --- a/data/script/template/script/template/actor/character/TrooperTemplate.java +++ b/data/script/template/script/template/actor/character/TrooperTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class TrooperTemplate extends MaleSoldierTemplate { @Inject public TrooperTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.TROOPER.id), - CharacterClass.TROOPER, - // ATTRIBUTES - 29,// INT - 41,// STR - 31,// CON - 25,// MEN - 33,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.TROOPER.id), CharacterClass.TROOPER, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 29; + attributes.strength = 41; + attributes.concentration = 31; + attributes.mentality = 25; + attributes.dexterity = 33; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected TrooperTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/TyrantTemplate.java b/data/script/template/script/template/actor/character/TyrantTemplate.java index a9deb9945..e19ce5133 100644 --- a/data/script/template/script/template/actor/character/TyrantTemplate.java +++ b/data/script/template/script/template/actor/character/TyrantTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class TyrantTemplate extends OrcRaiderTemplate { @Inject public TyrantTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.TYRANT.id), - CharacterClass.TYRANT, - // ATTRIBUTES - 18,// INT - 40,// STR - 47,// CON - 27,// MEN - 26,// DEX - 12,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 31,// accuracy - 42,// critical - 31,// evasion - 117,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-56693, -113610, -690)// spawn location - ); + super(factory.createID(CharacterClass.TYRANT.id), CharacterClass.TYRANT, Point.fromXYZ(-56693, -113610, -690)); + // ATTRIBUTES + attributes.intelligence = 18; + attributes.strength = 40; + attributes.concentration = 47; + attributes.mentality = 27; + attributes.dexterity = 26; + attributes.witness = 12; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 31; + attributes.criticalChance = 42; + attributes.evasionChance = 31; + attributes.moveSpeed = 117; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected TyrantTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/WarcryerTemplate.java b/data/script/template/script/template/actor/character/WarcryerTemplate.java index 3a6447a61..ce61f3e20 100644 --- a/data/script/template/script/template/actor/character/WarcryerTemplate.java +++ b/data/script/template/script/template/actor/character/WarcryerTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class WarcryerTemplate extends OrcShamanTemplate { @Inject public WarcryerTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.WARCRYER.id), - CharacterClass.WARCRYER, - // ATTRIBUTES - 31,// INT - 27,// STR - 31,// CON - 42,// MEN - 24,// DEX - 15,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 30,// accuracy - 41,// critical - 30,// evasion - 121,// move speed - 68000,// max inventory weight - false,// can craft - Point.fromXYZ(-56682, -113730, -690)// spawn location - ); + super(factory.createID(CharacterClass.WARCRYER.id), CharacterClass.WARCRYER, Point.fromXYZ(-56682, -113730, -690)); + // ATTRIBUTES + attributes.intelligence = 31; + attributes.strength = 27; + attributes.concentration = 31; + attributes.mentality = 42; + attributes.dexterity = 24; + attributes.witness = 15; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 30; + attributes.criticalChance = 41; + attributes.evasionChance = 30; + attributes.moveSpeed = 121; + attributes.maxWeigth = 68000; + attributes.craft = false; } - + protected WarcryerTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/WarderTemplate.java b/data/script/template/script/template/actor/character/WarderTemplate.java index 574095462..d3bfc1c5c 100644 --- a/data/script/template/script/template/actor/character/WarderTemplate.java +++ b/data/script/template/script/template/actor/character/WarderTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class WarderTemplate extends FemaleSoldierTemplate { @Inject public WarderTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.WARDER.id), - CharacterClass.WARDER, - // ATTRIBUTES - 28,// INT - 39,// STR - 30,// CON - 27,// MEN - 35,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 35,// accuracy - 45,// critical - 35,// evasion - 122,// move speed - 87000,// max inventory weight - false,// can craft - Point.fromXYZ(-125533, 38114, 1142)// spawn location - ); + super(factory.createID(CharacterClass.WARDER.id), CharacterClass.WARDER, Point.fromXYZ(-125533, 38114, 1142)); + // ATTRIBUTES + attributes.intelligence = 28; + attributes.strength = 39; + attributes.concentration = 30; + attributes.mentality = 27; + attributes.dexterity = 35; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 35; + attributes.criticalChance = 45; + attributes.evasionChance = 35; + attributes.moveSpeed = 122; + attributes.maxWeigth = 87000; + attributes.craft = false; } - + protected WarderTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/WarlockTemplate.java b/data/script/template/script/template/actor/character/WarlockTemplate.java index fb5f32314..bb2bc57a4 100644 --- a/data/script/template/script/template/actor/character/WarlockTemplate.java +++ b/data/script/template/script/template/actor/character/WarlockTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class WarlockTemplate extends WizardTemplate { @Inject public WarlockTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.WARLOCK.id), - CharacterClass.WARLOCK, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.WARLOCK.id), CharacterClass.WARLOCK, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected WarlockTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/WarlordTemplate.java b/data/script/template/script/template/actor/character/WarlordTemplate.java index d4898a9e7..22902b57a 100644 --- a/data/script/template/script/template/actor/character/WarlordTemplate.java +++ b/data/script/template/script/template/actor/character/WarlordTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class WarlordTemplate extends WarriorTemplate { @Inject public WarlordTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.WARLORD.id), - CharacterClass.WARLORD, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.WARLORD.id), CharacterClass.WARLORD, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected WarlordTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/WarriorTemplate.java b/data/script/template/script/template/actor/character/WarriorTemplate.java index 6d43da595..0a24424ad 100644 --- a/data/script/template/script/template/actor/character/WarriorTemplate.java +++ b/data/script/template/script/template/actor/character/WarriorTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class WarriorTemplate extends HumanFighterTemplate { @Inject public WarriorTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.WARRIOR.id), - CharacterClass.WARRIOR, - // ATTRIBUTES - 21,// INT - 40,// STR - 43,// CON - 25,// MEN - 30,// DEX - 11,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 44,// critical - 33,// evasion - 115,// move speed - 81900,// max inventory weight - false,// can craft - Point.fromXYZ(-71338, 258271, -3104)// spawn location - ); + super(factory.createID(CharacterClass.WARRIOR.id), CharacterClass.WARRIOR, Point.fromXYZ(-71338, 258271, -3104)); + // ATTRIBUTES + attributes.intelligence = 21; + attributes.strength = 40; + attributes.concentration = 43; + attributes.mentality = 25; + attributes.dexterity = 30; + attributes.witness = 11; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 44; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 81900; + attributes.craft = false; } - + protected WarriorTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/WarsmithTemplate.java b/data/script/template/script/template/actor/character/WarsmithTemplate.java index cddf217c4..78e69d451 100644 --- a/data/script/template/script/template/actor/character/WarsmithTemplate.java +++ b/data/script/template/script/template/actor/character/WarsmithTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class WarsmithTemplate extends ArtisanTemplate { @Inject public WarsmithTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.WARSMITH.id), - CharacterClass.WARSMITH, - // ATTRIBUTES - 20,// INT - 39,// STR - 45,// CON - 27,// MEN - 29,// DEX - 10,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 33,// accuracy - 43,// critical - 33,// evasion - 115,// move speed - 83000,// max inventory weight - true,// can craft - Point.fromXYZ(108512, -174026, -400)// spawn location - ); + super(factory.createID(CharacterClass.WARSMITH.id), CharacterClass.WARSMITH, Point.fromXYZ(108512, -174026, -400)); + // ATTRIBUTES + attributes.intelligence = 20; + attributes.strength = 39; + attributes.concentration = 45; + attributes.mentality = 27; + attributes.dexterity = 29; + attributes.witness = 10; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 33; + attributes.criticalChance = 43; + attributes.evasionChance = 33; + attributes.moveSpeed = 115; + attributes.maxWeigth = 83000; + attributes.craft = true; } - + protected WarsmithTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/WindRiderTemplate.java b/data/script/template/script/template/actor/character/WindRiderTemplate.java index 7bf54fbc6..d1bccd95e 100644 --- a/data/script/template/script/template/actor/character/WindRiderTemplate.java +++ b/data/script/template/script/template/actor/character/WindRiderTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class WindRiderTemplate extends PlainsWalkerTemplate { @Inject public WindRiderTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.WIND_RIDER.id), - CharacterClass.WIND_RIDER, - // ATTRIBUTES - 23,// INT - 36,// STR - 36,// CON - 26,// MEN - 35,// DEX - 14,// WIT - 4,// physical attack - 6,// magical attack - 80,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 36,// accuracy - 46,// critical - 36,// evasion - 125,// move speed - 73000,// max inventory weight - false,// can craft - Point.fromXYZ(45978, 41196, -3440)// spawn location - ); + super(factory.createID(CharacterClass.WIND_RIDER.id), CharacterClass.WIND_RIDER, Point.fromXYZ(45978, 41196, -3440)); + // ATTRIBUTES + attributes.intelligence = 23; + attributes.strength = 36; + attributes.concentration = 36; + attributes.mentality = 26; + attributes.dexterity = 35; + attributes.witness = 14; + attributes.physicalAttack = 4; + attributes.magicalAttack = 6; + attributes.physicalDefense = 80; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 36; + attributes.criticalChance = 46; + attributes.evasionChance = 36; + attributes.moveSpeed = 125; + attributes.maxWeigth = 73000; + attributes.craft = false; } - + protected WindRiderTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/data/script/template/script/template/actor/character/WizardTemplate.java b/data/script/template/script/template/actor/character/WizardTemplate.java index d64fc4dc6..ba2b6bb50 100644 --- a/data/script/template/script/template/actor/character/WizardTemplate.java +++ b/data/script/template/script/template/actor/character/WizardTemplate.java @@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class WizardTemplate extends HumanMysticTemplate { @Inject public WizardTemplate(CharacterTemplateIDFactory factory) { - super(factory.createID(CharacterClass.WIZARD.id), - CharacterClass.WIZARD, - // ATTRIBUTES - 41,// INT - 22,// STR - 27,// CON - 39,// MEN - 21,// DEX - 20,// WIT - 3,// physical attack - 6,// magical attack - 54,// physical def - 41,// magical def - 300,// attack speed - 333,// cast speed - 28,// accuracy - 40,// critical - 28,// evasion - 120,// move speed - 62500,// max inventory weight - false,// can craft - Point.fromXYZ(-90890, 248027, -3570)// spawn location - ); + super(factory.createID(CharacterClass.WIZARD.id), CharacterClass.WIZARD, Point.fromXYZ(-90890, 248027, -3570)); + // ATTRIBUTES + attributes.intelligence = 41; + attributes.strength = 22; + attributes.concentration = 27; + attributes.mentality = 39; + attributes.dexterity = 21; + attributes.witness = 20; + attributes.physicalAttack = 3; + attributes.magicalAttack = 6; + attributes.physicalDefense = 54; + attributes.magicalDefense = 41; + attributes.attackSpeed = 300; + attributes.castSpeed = 333; + attributes.accuracy = 28; + attributes.criticalChance = 40; + attributes.evasionChance = 28; + attributes.moveSpeed = 120; + attributes.maxWeigth = 62500; + attributes.craft = false; } - + protected WizardTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override diff --git a/src/main/java/com/l2jserver/L2JGameServerMain.java b/src/main/java/com/l2jserver/L2JGameServerMain.java index b05bced18..d63f0812b 100644 --- a/src/main/java/com/l2jserver/L2JGameServerMain.java +++ b/src/main/java/com/l2jserver/L2JGameServerMain.java @@ -17,7 +17,6 @@ package com.l2jserver; import com.l2jserver.service.ServiceManager; -import com.l2jserver.service.blowfish.BlowfishKeygenService; import com.l2jserver.service.cache.CacheService; import com.l2jserver.service.configuration.ConfigurationService; import com.l2jserver.service.database.DatabaseService; @@ -25,6 +24,7 @@ import com.l2jserver.service.game.chat.ChatService; import com.l2jserver.service.game.scripting.ScriptingService; import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.service.network.NetworkService; +import com.l2jserver.service.network.keygen.BlowfishKeygenService; public class L2JGameServerMain { /** diff --git a/src/main/java/com/l2jserver/game/ProtocolVersion.java b/src/main/java/com/l2jserver/game/ProtocolVersion.java index 34ffb245b..1f4141522 100644 --- a/src/main/java/com/l2jserver/game/ProtocolVersion.java +++ b/src/main/java/com/l2jserver/game/ProtocolVersion.java @@ -26,6 +26,7 @@ public enum ProtocolVersion { * Release version */ RELEASE(0), + /** * Freya(216) */ diff --git a/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java b/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java index 8ba3d9c28..0ca6a5e9b 100644 --- a/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java +++ b/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java @@ -40,7 +40,7 @@ import com.l2jserver.game.net.packet.client.RequestCharacterTemplatesPacket; import com.l2jserver.game.net.packet.client.RequestGotoLobbyPacket; import com.l2jserver.game.net.packet.client.RequestKeyMappingPacket; import com.l2jserver.game.net.packet.client.RequestManorListPacket; -import com.l2jserver.game.net.packet.client.RequestMoveBackwardToLocationPacket; +import com.l2jserver.game.net.packet.client.CharacterRequestMovePacket; import com.l2jserver.game.net.packet.client.RequestRestartPacket; /** @@ -150,8 +150,8 @@ public class Lineage2PacketReader extends OneToOneDecoder { break; case CharacterSelectPacket.OPCODE: return CharacterSelectPacket.class; - case RequestMoveBackwardToLocationPacket.OPCODE: - return RequestMoveBackwardToLocationPacket.class; + case CharacterRequestMovePacket.OPCODE: + return CharacterRequestMovePacket.class; case RequestRestartPacket.OPCODE: return RequestRestartPacket.class; case CharacterChatMessagePacket.OPCODE: diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java b/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java new file mode 100644 index 000000000..4009686e4 --- /dev/null +++ b/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java @@ -0,0 +1,112 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.game.net.packet.client; + +import org.jboss.netty.buffer.ChannelBuffer; + +import com.google.inject.Inject; +import com.l2jserver.game.net.Lineage2Connection; +import com.l2jserver.game.net.packet.AbstractClientPacket; +import com.l2jserver.model.world.L2Character; +import com.l2jserver.model.world.L2Character.CharacterMoveType; +import com.l2jserver.service.game.CharacterService; + +/** + * This packet notifies the server which character the player has chosen to use. + * + * @author Rogiel + */ +public class CharacterRequestActionUse extends AbstractClientPacket { + /** + * The packet OPCODE + */ + public static final int OPCODE = 0x56; + + /** + * The {@link CharacterService} + */ + private final CharacterService charService; + + private Action action; + + public enum Action { + SIT_STAND(0), WALK_RUN(1), + + PRIVATE_STORE_SELL(10), PRIVATE_STORE_BUY(11), + + PET_FOLLOW_MOVE(15), PET_FOLLOW_MOVE2(21), + + PET_ATTACK(16), PET_ATTACK2(22), + + PET_STOP(17), PET_STOP2(23), + + PET_UNSUMMON(19), + + MOUNT_DISMOUNT(38), + + WILD_HOG_CANNON_SWITCH_MODE(32), WILD_HOG_CANNON_STOP(41), + + SOULESS_TOXIC_SMOKE(36), SOULESS_PARASITE_BURST(39), + + DWARVEN_MANUFACTURE(37); + + public final int id; + + Action(int id) { + this.id = id; + } + + public static Action fromID(int id) { + for (final Action action : values()) + if (action.id == id) + return action; + return null; + } + } + + private boolean ctrlPressed; + private boolean shiftPressed; + + @Inject + public CharacterRequestActionUse(CharacterService charService) { + this.charService = charService; + } + + @Override + public void read(Lineage2Connection conn, ChannelBuffer buffer) { + action = Action.fromID(buffer.readInt()); + ctrlPressed = (buffer.readByte() == 1 ? true : false); + shiftPressed = (buffer.readByte() == 1 ? true : false); + } + + @Override + public void process(final Lineage2Connection conn) { + final L2Character character = conn.getCharacter(); + switch (action) { + case SIT_STAND: + // TODO + break; + case WALK_RUN: + if (character.getMoveType() == CharacterMoveType.WALK) { + charService.run(character); + } else { + charService.walk(character); + } + break; + } + } +} diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestMoveBackwardToLocationPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestMovePacket.java similarity index 88% rename from src/main/java/com/l2jserver/game/net/packet/client/RequestMoveBackwardToLocationPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestMovePacket.java index 113694377..c7dbf41e2 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestMoveBackwardToLocationPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestMovePacket.java @@ -25,7 +25,7 @@ import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.CharacterStopMovePacket; import com.l2jserver.model.world.L2Character; -import com.l2jserver.service.game.SpawnService; +import com.l2jserver.service.game.CharacterService; import com.l2jserver.util.dimensional.Coordinate; /** @@ -33,7 +33,7 @@ import com.l2jserver.util.dimensional.Coordinate; * * @author Rogiel */ -public class RequestMoveBackwardToLocationPacket extends AbstractClientPacket { +public class CharacterRequestMovePacket extends AbstractClientPacket { /** * The packet OPCODE */ @@ -42,9 +42,9 @@ public class RequestMoveBackwardToLocationPacket extends AbstractClientPacket { private final Logger log = LoggerFactory.getLogger(this.getClass()); /** - * The {@link SpawnService} + * The {@link CharacterService} */ - private final SpawnService spawnService; + private final CharacterService charService; // packet private Coordinate target; @@ -52,8 +52,8 @@ public class RequestMoveBackwardToLocationPacket extends AbstractClientPacket { private int moveMovement; @Inject - public RequestMoveBackwardToLocationPacket(SpawnService spawnService) { - this.spawnService = spawnService; + public CharacterRequestMovePacket(CharacterService charService) { + this.charService = charService; } @Override @@ -86,6 +86,6 @@ public class RequestMoveBackwardToLocationPacket extends AbstractClientPacket { final L2Character character = conn.getCharacter(); log.debug("Character {} is moving from {} to {}", new Object[] { character, origin, target }); - spawnService.teleport(character, target); + charService.move(character, target); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java index 26eedfa49..ad41d1af5 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java @@ -29,7 +29,7 @@ import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.Lineage2CryptographyKey; import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.KeyPacket; -import com.l2jserver.service.blowfish.BlowfishKeygenService; +import com.l2jserver.service.network.keygen.BlowfishKeygenService; /** * In this packet the client is informing its protocol version. It is possible diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ActorMovementPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/ActorMovementPacket.java new file mode 100644 index 000000000..3fd09136c --- /dev/null +++ b/src/main/java/com/l2jserver/game/net/packet/server/ActorMovementPacket.java @@ -0,0 +1,64 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.game.net.packet.server; + +import org.jboss.netty.buffer.ChannelBuffer; + +import com.l2jserver.game.net.Lineage2Connection; +import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.model.world.L2Character; +import com.l2jserver.util.dimensional.Coordinate; + +/** + * This packet notifies the client that the chosen character has been + * successfully selected. + * + * @author Rogiel + * @see Reason + */ +public class ActorMovementPacket extends AbstractServerPacket { + /** + * The packet OPCODE + */ + public static final int OPCODE = 0x2f; + + /** + * The selected character + */ + private final L2Character character; + private Coordinate source; + + public ActorMovementPacket(L2Character character, Coordinate source) { + super(OPCODE); + this.character = character; + this.source = source; + } + + @Override + public void write(Lineage2Connection conn, ChannelBuffer buffer) { + buffer.writeInt(character.getID().getID()); + + buffer.writeInt(character.getPoint().getX()); + buffer.writeInt(character.getPoint().getY()); + buffer.writeInt(character.getPoint().getZ()); + + buffer.writeInt(source.getX()); + buffer.writeInt(source.getY()); + buffer.writeInt(source.getZ()); + } +} diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterMovementTypePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/CharacterMovementTypePacket.java new file mode 100644 index 000000000..cc59f6505 --- /dev/null +++ b/src/main/java/com/l2jserver/game/net/packet/server/CharacterMovementTypePacket.java @@ -0,0 +1,54 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.game.net.packet.server; + +import org.jboss.netty.buffer.ChannelBuffer; + +import com.l2jserver.game.net.Lineage2Connection; +import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.model.world.L2Character; + +/** + * This packet updates the movement type + * + * @author Rogiel + * @see Reason + */ +public class CharacterMovementTypePacket extends AbstractServerPacket { + /** + * The packet OPCODE + */ + public static final int OPCODE = 0x28; + + /** + * The character + */ + private final L2Character character; + + public CharacterMovementTypePacket(L2Character character) { + super(OPCODE); + this.character = character; + } + + @Override + public void write(Lineage2Connection conn, ChannelBuffer buffer) { + buffer.writeInt(character.getID().getID()); + buffer.writeInt(character.getMoveType().id); + buffer.writeInt(0x00); // unk + } +} diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java index 054d05fc8..59267ed08 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java @@ -25,6 +25,7 @@ import static com.l2jserver.model.world.character.CharacterInventory.InventoryPa import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_3; import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_4; import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_5; +import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.DECORATION_6; import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.FEET; import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.GLOVES; import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.HAIR1; @@ -108,11 +109,8 @@ public class CharacterSelectionListPacket extends AbstractServerPacket { buffer.writeInt(character.getID().getID()); BufferUtils.writeString(buffer, loginName); buffer.writeInt(sessionId); - // if (character.getClanID() == null) { - buffer.writeInt(0x00); // clan id - // } else { - // buffer.writeInt(character.getClanID().getID()); // clan id - // } + buffer.writeInt((character.getClanID() != null ? character + .getClanID().getID() : 0x00)); // clan id buffer.writeInt(0x00); // ?? buffer.writeInt(character.getSex().option); // sex @@ -176,17 +174,15 @@ public class CharacterSelectionListPacket extends AbstractServerPacket { writePaperdollItemID(buffer, character, DECORATION_3); writePaperdollItemID(buffer, character, DECORATION_4); writePaperdollItemID(buffer, character, DECORATION_5); + writePaperdollItemID(buffer, character, DECORATION_6); writePaperdollItemID(buffer, character, BELT); // hair style - // buffer.writeInt(character.getAppearance().getHairStyle().option); - buffer.writeInt(0x00); + buffer.writeInt(character.getAppearance().getHairStyle().option); // hair color - // buffer.writeInt(character.getAppearance().getHairColor().option); - buffer.writeInt(0x00); + buffer.writeInt(character.getAppearance().getHairColor().option); // face - // buffer.writeInt(character.getAppearance().getFace().option); - buffer.writeInt(0x00); + buffer.writeInt(character.getAppearance().getFace().option); buffer.writeDouble(30); // hp max buffer.writeDouble(30); // mp max diff --git a/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java index 30bb02990..87ad80a98 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java @@ -94,13 +94,13 @@ public class UserInformationPacket extends AbstractServerPacket { buffer.writeInt(character.getAttributes().getIntelligence()); buffer.writeInt(character.getAttributes().getWitness()); buffer.writeInt(character.getAttributes().getMentality()); - buffer.writeInt(200); // hp + buffer.writeInt(200); // max hp buffer.writeInt((int) 200); // cur hp - buffer.writeInt(200); // mp + buffer.writeInt(200); // max mp buffer.writeInt((int) 200); // cur mp buffer.writeInt(0); // sp buffer.writeInt(0); // load - buffer.writeInt(200); // max load + buffer.writeInt(character.getAttributes().getMaxWeigth()); // max load // 20 no weapon, 40 weapon equippe buffer.writeInt(20); @@ -139,16 +139,14 @@ public class UserInformationPacket extends AbstractServerPacket { writePaperdollItemID(buffer, character, RIGHT_FINGER); writePaperdollItemID(buffer, character, LEFT_FINGER); writePaperdollItemID(buffer, character, HEAD); - buffer.writeInt(246); - // writePaperdollItemID(buffer, character, RIGHT_HAND); + writePaperdollItemID(buffer, character, RIGHT_HAND); writePaperdollItemID(buffer, character, LEFT_HAND); writePaperdollItemID(buffer, character, GLOVES); writePaperdollItemID(buffer, character, CHEST); writePaperdollItemID(buffer, character, LEGS); writePaperdollItemID(buffer, character, FEET); writePaperdollItemID(buffer, character, CLOAK); - // /writePaperdollItemID(buffer, character, RIGHT_HAND); - buffer.writeInt(246); + writePaperdollItemID(buffer, character, RIGHT_HAND); writePaperdollItemID(buffer, character, HAIR1); writePaperdollItemID(buffer, character, HAIR2); writePaperdollItemID(buffer, character, RIGHT_BRACELET); @@ -201,16 +199,21 @@ public class UserInformationPacket extends AbstractServerPacket { buffer.writeInt(character.getAttributes().getMagicalAttack()); buffer.writeInt(character.getAttributes().getCastSpeed()); buffer.writeInt(character.getAttributes().getAttackSpeed()); - buffer.writeInt(character.getAttributes().getMagicalDefense()); buffer.writeInt(0x00); // 0-non-pvp 1-pvp = violett name buffer.writeInt(0x00); // karma - buffer.writeInt(0x10); // run speed - buffer.writeInt(0x20); // walk speed - buffer.writeInt(0x10); // swim run speed - buffer.writeInt(0x20); // swim walk speed + buffer.writeInt((int) character.getAttributes().getMoveSpeed()); // run + // speed + buffer.writeInt((int) character.getAttributes().getMoveSpeed()); // walk + // speed + buffer.writeInt((int) character.getAttributes().getMoveSpeed()); // swim + // run + // speed + buffer.writeInt((int) character.getAttributes().getMoveSpeed()); // swim + // walk + // speed buffer.writeInt(0); // unk buffer.writeInt(0); // unk buffer.writeInt(0); // fly speed -only if flying @@ -275,13 +278,13 @@ public class UserInformationPacket extends AbstractServerPacket { buffer.writeShort(500); // inventory limit buffer.writeInt(character.getCharacterClass().id); - buffer.writeInt(0x00); // special effects? circles around player... + buffer.writeInt(0x01); // special effects? circles around player... buffer.writeInt(200); // max cp buffer.writeInt(200); // cur cp buffer.writeByte(127); // is mount or is airshilhelp = 0; otherwise // enchant effect (minimum 127) - buffer.writeByte(0x01);// team, 1=blue,2 red,0 is unknown + buffer.writeByte(0x00);// team, 1=blue,2 red,0 is unknown buffer.writeInt(0x00); // clan crest large id // 0x01: symbol on char menu ctrl+I @@ -328,7 +331,7 @@ public class UserInformationPacket extends AbstractServerPacket { buffer.writeInt(0x00); // Fame buffer.writeInt(0x01); // Minimap on Hellbound buffer.writeInt(1); // Vitality Points - buffer.writeInt(0x000001); // special effects + buffer.writeInt(0x00); // special effects } private void writePaperdollObjectID(ChannelBuffer buffer, diff --git a/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java b/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java index 7b541201b..f2402914b 100644 --- a/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java @@ -27,7 +27,7 @@ import com.l2jserver.service.game.template.TemplateService; * * @author Rogiel */ -public class NPCTemplateID extends ActorTemplateID { +public class NPCTemplateID extends ActorTemplateID> { @Inject protected NPCTemplateID(@Assisted int id, TemplateService templateService) { super(id, templateService); diff --git a/src/main/java/com/l2jserver/model/template/ActorTemplate.java b/src/main/java/com/l2jserver/model/template/ActorTemplate.java index 6c5804a2f..8f4734f74 100644 --- a/src/main/java/com/l2jserver/model/template/ActorTemplate.java +++ b/src/main/java/com/l2jserver/model/template/ActorTemplate.java @@ -19,10 +19,10 @@ package com.l2jserver.model.template; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.l2jserver.model.id.template.CharacterTemplateID; +import com.l2jserver.model.id.template.ActorTemplateID; import com.l2jserver.model.world.AbstractActor.Race; +import com.l2jserver.model.world.actor.ActorAttributes; import com.l2jserver.model.world.capability.Actor; -import com.l2jserver.model.world.character.CharacterBaseAttributes; /** * Template for {@link Actor} @@ -44,21 +44,11 @@ public abstract class ActorTemplate extends /** * The base attributes instance */ - protected final CharacterBaseAttributes baseAttributes; + protected ActorBaseAttributes attributes = new ActorBaseAttributes(); - public ActorTemplate(CharacterTemplateID id, Race race, int intelligence, - int strength, int concentration, int mentality, int dexterity, - int witness, int physicalAttack, int magicalAttack, - int physicalDefense, int magicalDefense, int attackSpeed, - int castSpeed, int accuracy, int criticalChance, int evasionChance, - int moveSpeed, int maxWeigth, boolean craft) { + public ActorTemplate(ActorTemplateID id, Race race) { super(id); this.race = race; - baseAttributes = new CharacterBaseAttributes(intelligence, strength, - concentration, mentality, dexterity, witness, physicalAttack, - magicalAttack, physicalDefense, magicalDefense, attackSpeed, - castSpeed, accuracy, criticalChance, evasionChance, moveSpeed, - maxWeigth, craft); } @Override @@ -81,151 +71,379 @@ public abstract class ActorTemplate extends /** * @return the baseAttributes */ - public CharacterBaseAttributes getBaseAttributes() { - return baseAttributes; + public ActorBaseAttributes getBaseAttributes() { + return attributes; } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getIntelligence() + * @see com.l2jserver.model.template.ActorBaseAttributes#getIntelligence() */ public int getIntelligence() { - return baseAttributes.getIntelligence(); + return attributes.getIntelligence(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getStrength() + * @see com.l2jserver.model.template.ActorBaseAttributes#getStrength() */ public int getStrength() { - return baseAttributes.getStrength(); + return attributes.getStrength(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getConcentration() + * @see com.l2jserver.model.template.ActorBaseAttributes#getConcentration() */ public int getConcentration() { - return baseAttributes.getConcentration(); + return attributes.getConcentration(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getMentality() + * @see com.l2jserver.model.template.ActorBaseAttributes#getMentality() */ public int getMentality() { - return baseAttributes.getMentality(); + return attributes.getMentality(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getDexterity() + * @see com.l2jserver.model.template.ActorBaseAttributes#getDexterity() */ public int getDextry() { - return baseAttributes.getDexterity(); + return attributes.getDexterity(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getWitness() + * @see com.l2jserver.model.template.ActorBaseAttributes#getWitness() */ public int getWitness() { - return baseAttributes.getWitness(); + return attributes.getWitness(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getPhysicalAttack() + * @see com.l2jserver.model.template.ActorBaseAttributes#getPhysicalAttack() */ public int getPhysicalAttack() { - return baseAttributes.getPhysicalAttack(); + return attributes.getPhysicalAttack(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getMagicalAttack() + * @see com.l2jserver.model.template.ActorBaseAttributes#getMagicalAttack() */ public int getMagicalAttack() { - return baseAttributes.getMagicalAttack(); + return attributes.getMagicalAttack(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getPhysicalDefense() + * @see com.l2jserver.model.template.ActorBaseAttributes#getPhysicalDefense() */ public int getPhysicalDefense() { - return baseAttributes.getPhysicalDefense(); + return attributes.getPhysicalDefense(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getMagicalDefense() + * @see com.l2jserver.model.template.ActorBaseAttributes#getMagicalDefense() */ public int getMagicalDefense() { - return baseAttributes.getMagicalDefense(); + return attributes.getMagicalDefense(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getAttackSpeed() + * @see com.l2jserver.model.template.ActorBaseAttributes#getAttackSpeed() */ public int getAttackSpeed() { - return baseAttributes.getAttackSpeed(); + return attributes.getAttackSpeed(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getCastSpeed() + * @see com.l2jserver.model.template.ActorBaseAttributes#getCastSpeed() */ public int getCastSpeed() { - return baseAttributes.getCastSpeed(); + return attributes.getCastSpeed(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getAccuracy() + * @see com.l2jserver.model.template.ActorBaseAttributes#getAccuracy() */ public int getAccuracy() { - return baseAttributes.getAccuracy(); + return attributes.getAccuracy(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getCriticalChance() + * @see com.l2jserver.model.template.ActorBaseAttributes#getCriticalChance() */ public int getCriticalChance() { - return baseAttributes.getCriticalChance(); + return attributes.getCriticalChance(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getEvasionChance() + * @see com.l2jserver.model.template.ActorBaseAttributes#getEvasionChance() */ public int getEvasionChance() { - return baseAttributes.getEvasionChance(); + return attributes.getEvasionChance(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getMoveSpeed() + * @see com.l2jserver.model.template.ActorBaseAttributes#getMoveSpeed() */ - public int getMoveSpeed() { - return baseAttributes.getMoveSpeed(); + public double getMoveSpeed() { + return attributes.getMoveSpeed(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getMaxWeigth() + * @see com.l2jserver.model.template.ActorBaseAttributes#getMaxWeigth() */ public int getMaxWeigth() { - return baseAttributes.getMaxWeigth(); + return attributes.getMaxWeigth(); } /** * @return - * @see com.l2jserver.model.world.character.CharacterBaseAttributes#canCraft() + * @see com.l2jserver.model.template.ActorBaseAttributes#canCraft() */ public boolean canCraft() { - return baseAttributes.canCraft(); + return attributes.canCraft(); } -} + + /** + * Defines the attributes of an character + * + * @author Rogiel + */ + public class ActorBaseAttributes implements ActorAttributes { + /** + * The character intelligence + */ + public int intelligence; + /** + * The character strength + */ + public int strength; + /** + * The character concentration + */ + public int concentration; + /** + * The character mentality power + */ + public int mentality; + /** + * The character dexterity + */ + public int dexterity; + /** + * The character witness + */ + public int witness; + + /** + * The default physical attack + */ + public int physicalAttack; + /** + * The default magical attack + */ + public int magicalAttack; + /** + * The physical defense + */ + public int physicalDefense; + /** + * The magical defense + */ + public int magicalDefense; + + /** + * The physical attack speed + */ + public int attackSpeed; + /** + * The "magical attack speed" (aka cast speed) + */ + public int castSpeed; + + /** + * The character accuracy + */ + public int accuracy; + /** + * Chance of issuing an critical attack + */ + public int criticalChance; + /** + * Chance of avoiding an attack + */ + public int evasionChance; + /** + * The character's movement speed + */ + public float moveSpeed; + /** + * The maximum weigth in items to be carried in the inventory + */ + public int maxWeigth; + /** + * If this character can craft + */ + public boolean craft; + + /** + * @return the intelligence + */ + @Override + public int getIntelligence() { + return intelligence; + } + + /** + * @return the strength + */ + @Override + public int getStrength() { + return strength; + } + + /** + * @return the concentration + */ + @Override + public int getConcentration() { + return concentration; + } + + /** + * @return the mentality + */ + @Override + public int getMentality() { + return mentality; + } + + /** + * @return the dexterity + */ + @Override + public int getDexterity() { + return dexterity; + } + + /** + * @return the witness + */ + @Override + public int getWitness() { + return witness; + } + + /** + * @return the physicalAttack + */ + @Override + public int getPhysicalAttack() { + return physicalAttack; + } + + /** + * @return the magicalAttack + */ + @Override + public int getMagicalAttack() { + return magicalAttack; + } + + /** + * @return the physicalDefense + */ + @Override + public int getPhysicalDefense() { + return physicalDefense; + } + + /** + * @return the magicalDefense + */ + @Override + public int getMagicalDefense() { + return magicalDefense; + } + + /** + * @return the attackSpeed + */ + @Override + public int getAttackSpeed() { + return attackSpeed; + } + + /** + * @return the castSpeed + */ + @Override + public int getCastSpeed() { + return castSpeed; + } + + /** + * @return the accuracy + */ + @Override + public int getAccuracy() { + return accuracy; + } + + /** + * @return the criticalChance + */ + @Override + public int getCriticalChance() { + return criticalChance; + } + + /** + * @return the evasionChance + */ + @Override + public int getEvasionChance() { + return evasionChance; + } + + /** + * @return the moveSpeed + */ + @Override + public double getMoveSpeed() { + return moveSpeed; + } + + /** + * @return the maxWeigth + */ + @Override + public int getMaxWeigth() { + return maxWeigth; + } + + /** + * @return the craft + */ + @Override + public boolean canCraft() { + return craft; + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/model/template/AugmentTemplate.java b/src/main/java/com/l2jserver/model/template/AugmentTemplate.java new file mode 100644 index 000000000..69b9e3e5c --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/AugmentTemplate.java @@ -0,0 +1,40 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template; + +import com.l2jserver.model.id.template.ItemTemplateID; + +/** + * Template for an Aumentation + * + * @author Rogiel + */ +public abstract class AugmentTemplate extends AbstractTemplate { + public AugmentTemplate(ItemTemplateID id) { + super(id); + } + + @Override + public Object create() { + return null; + } + + @Override + public ItemTemplateID getID() { + return (ItemTemplateID) super.getID(); + } +} diff --git a/src/main/java/com/l2jserver/model/template/CharacterTemplate.java b/src/main/java/com/l2jserver/model/template/CharacterTemplate.java index aa28473d7..7964defe5 100644 --- a/src/main/java/com/l2jserver/model/template/CharacterTemplate.java +++ b/src/main/java/com/l2jserver/model/template/CharacterTemplate.java @@ -36,25 +36,23 @@ public abstract class CharacterTemplate extends ActorTemplate { */ protected final Point spawnLocation; + protected Integer attackDamage = null; + protected AttackType attackType; + + public enum AttackType { + FIST; + } + protected CharacterTemplate(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass.race, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass.race); this.characterClass = characterClass; this.spawnLocation = spawnLocation; } @Override public L2Character createInstance() { - final L2Character character = new L2Character(baseAttributes); + final L2Character character = new L2Character(attributes); character.setRace(race); character.setCharacterClass(characterClass); diff --git a/src/main/java/com/l2jserver/model/template/EffectTemplate.java b/src/main/java/com/l2jserver/model/template/EffectTemplate.java new file mode 100644 index 000000000..021072a7d --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/EffectTemplate.java @@ -0,0 +1,40 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template; + +import com.l2jserver.model.id.template.ItemTemplateID; + +/** + * Template for effects + * + * @author Rogiel + */ +public abstract class EffectTemplate extends AbstractTemplate { + public EffectTemplate(ItemTemplateID id) { + super(id); + } + + @Override + public Object create() { + return null; + } + + @Override + public ItemTemplateID getID() { + return (ItemTemplateID) super.getID(); + } +} diff --git a/src/main/java/com/l2jserver/model/template/NPCTemplate.java b/src/main/java/com/l2jserver/model/template/NPCTemplate.java index 15fd12b3b..82944f4b8 100644 --- a/src/main/java/com/l2jserver/model/template/NPCTemplate.java +++ b/src/main/java/com/l2jserver/model/template/NPCTemplate.java @@ -16,32 +16,22 @@ */ package com.l2jserver.model.template; -import com.l2jserver.model.id.template.CharacterTemplateID; import com.l2jserver.model.id.template.NPCTemplateID; import com.l2jserver.model.world.AbstractActor.Race; -import com.l2jserver.model.world.L2Character; +import com.l2jserver.model.world.NPC; /** * Template for {@link NPC} * * @author Rogiel */ -public abstract class NPCTemplate extends ActorTemplate { - protected NPCTemplate(CharacterTemplateID id, Race race, int intelligence, - int strength, int concentration, int mentality, int dexterity, - int witness, int physicalAttack, int magicalAttack, - int physicalDefense, int magicalDefense, int attackSpeed, - int castSpeed, int accuracy, int criticalChance, int evasionChance, - int moveSpeed, int maxWeigth, boolean craft) { - super(id, race, intelligence, strength, concentration, mentality, - dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft); +public abstract class NPCTemplate extends ActorTemplate { + protected NPCTemplate(NPCTemplateID id) { + super(id, null); } @Override - public L2Character createInstance() { + public T createInstance() { return null; } diff --git a/src/main/java/com/l2jserver/model/template/npc/AdventurerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/AdventurerNPCTemplate.java new file mode 100644 index 000000000..14bb40b65 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/AdventurerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class AdventurerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected AdventurerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ArtefactNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ArtefactNPCTemplate.java new file mode 100644 index 000000000..97556440f --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ArtefactNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ArtefactNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ArtefactNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/AuctioneerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/AuctioneerNPCTemplate.java new file mode 100644 index 000000000..7d22e3423 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/AuctioneerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class AuctioneerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected AuctioneerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/BabyPetNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/BabyPetNPCTemplate.java new file mode 100644 index 000000000..a91ae83f9 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/BabyPetNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class BabyPetNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected BabyPetNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/BlockNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/BlockNPCTemplate.java new file mode 100644 index 000000000..5d5b3677b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/BlockNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class BlockNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected BlockNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/CabaleBufferNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/CabaleBufferNPCTemplate.java new file mode 100644 index 000000000..7c858c41b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/CabaleBufferNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class CabaleBufferNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected CabaleBufferNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/CastleBlacksmithNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/CastleBlacksmithNPCTemplate.java new file mode 100644 index 000000000..d2db01c81 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/CastleBlacksmithNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class CastleBlacksmithNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected CastleBlacksmithNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/CastleChamberlainNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/CastleChamberlainNPCTemplate.java new file mode 100644 index 000000000..5f6d5c9f9 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/CastleChamberlainNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class CastleChamberlainNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected CastleChamberlainNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/CastleDoormenNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/CastleDoormenNPCTemplate.java new file mode 100644 index 000000000..acb52c098 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/CastleDoormenNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class CastleDoormenNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected CastleDoormenNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/CastleMagicianNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/CastleMagicianNPCTemplate.java new file mode 100644 index 000000000..240a50609 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/CastleMagicianNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class CastleMagicianNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected CastleMagicianNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/CastleTeleporterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/CastleTeleporterNPCTemplate.java new file mode 100644 index 000000000..fdd7f47fe --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/CastleTeleporterNPCTemplate.java @@ -0,0 +1,37 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; + +/** + * @author Rogiel + * + */ +public class CastleTeleporterNPCTemplate extends TeleporterNPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected CastleTeleporterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/CastleWarehouseNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/CastleWarehouseNPCTemplate.java new file mode 100644 index 000000000..acb70ccab --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/CastleWarehouseNPCTemplate.java @@ -0,0 +1,37 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; + +/** + * @author Rogiel + * + */ +public class CastleWarehouseNPCTemplate extends WarehouseNPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected CastleWarehouseNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/CastleWyvernManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/CastleWyvernManagerNPCTemplate.java new file mode 100644 index 000000000..e38e49962 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/CastleWyvernManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class CastleWyvernManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected CastleWyvernManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ChestNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ChestNPCTemplate.java new file mode 100644 index 000000000..aefcc7dac --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ChestNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ChestNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ChestNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ChristmasTreeNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ChristmasTreeNPCTemplate.java new file mode 100644 index 000000000..ba63165b2 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ChristmasTreeNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ChristmasTreeNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ChristmasTreeNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ClanTraderNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ClanTraderNPCTemplate.java new file mode 100644 index 000000000..baf409f93 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ClanTraderNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ClanTraderNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ClanTraderNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ClanhallDoormenNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ClanhallDoormenNPCTemplate.java new file mode 100644 index 000000000..d77cb493c --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ClanhallDoormenNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ClanhallDoormenNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ClanhallDoormenNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ClanhallManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ClanhallManagerNPCTemplate.java new file mode 100644 index 000000000..2821e7d48 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ClanhallManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ClanhallManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ClanhallManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ClassMasterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ClassMasterNPCTemplate.java new file mode 100644 index 000000000..5d8bd89f8 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ClassMasterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ClassMasterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ClassMasterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ControlTowerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ControlTowerNPCTemplate.java new file mode 100644 index 000000000..c2cc4557b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ControlTowerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ControlTowerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ControlTowerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/DarkElfVillageMasterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/DarkElfVillageMasterNPCTemplate.java new file mode 100644 index 000000000..4ef834931 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/DarkElfVillageMasterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class DarkElfVillageMasterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected DarkElfVillageMasterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/DawnPriestNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/DawnPriestNPCTemplate.java new file mode 100644 index 000000000..f8e4cd690 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/DawnPriestNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class DawnPriestNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected DawnPriestNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/DecoyNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/DecoyNPCTemplate.java new file mode 100644 index 000000000..fb19c229b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/DecoyNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class DecoyNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected DecoyNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/DefenderNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/DefenderNPCTemplate.java new file mode 100644 index 000000000..1679094bb --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/DefenderNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class DefenderNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected DefenderNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/DoormenNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/DoormenNPCTemplate.java new file mode 100644 index 000000000..183fde994 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/DoormenNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class DoormenNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected DoormenNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/DungeonGatekeeperNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/DungeonGatekeeperNPCTemplate.java new file mode 100644 index 000000000..b6575bc41 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/DungeonGatekeeperNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class DungeonGatekeeperNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected DungeonGatekeeperNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/DuskPriestNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/DuskPriestNPCTemplate.java new file mode 100644 index 000000000..f1a361682 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/DuskPriestNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class DuskPriestNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected DuskPriestNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/DwarfVillageMasterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/DwarfVillageMasterNPCTemplate.java new file mode 100644 index 000000000..8188e9842 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/DwarfVillageMasterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class DwarfVillageMasterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected DwarfVillageMasterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/EffectPointNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/EffectPointNPCTemplate.java new file mode 100644 index 000000000..cb9e1bc50 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/EffectPointNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class EffectPointNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected EffectPointNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/EventChestNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/EventChestNPCTemplate.java new file mode 100644 index 000000000..4384bec97 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/EventChestNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class EventChestNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected EventChestNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FameManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FameManagerNPCTemplate.java new file mode 100644 index 000000000..7849488d0 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FameManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FameManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FameManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FeedableBeastNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FeedableBeastNPCTemplate.java new file mode 100644 index 000000000..c409117f9 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FeedableBeastNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FeedableBeastNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FeedableBeastNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FestivalGuideNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FestivalGuideNPCTemplate.java new file mode 100644 index 000000000..5971cc890 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FestivalGuideNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FestivalGuideNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FestivalGuideNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FestivalMonsterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FestivalMonsterNPCTemplate.java new file mode 100644 index 000000000..ed7b329c8 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FestivalMonsterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FestivalMonsterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FestivalMonsterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FightherVillageMasterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FightherVillageMasterNPCTemplate.java new file mode 100644 index 000000000..753363727 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FightherVillageMasterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FightherVillageMasterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FightherVillageMasterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FishermanNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FishermanNPCTemplate.java new file mode 100644 index 000000000..b1dee033e --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FishermanNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FishermanNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FishermanNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FlameTowerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FlameTowerNPCTemplate.java new file mode 100644 index 000000000..5461abe03 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FlameTowerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FlameTowerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FlameTowerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FlyMonsterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FlyMonsterNPCTemplate.java new file mode 100644 index 000000000..916c425e1 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FlyMonsterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FlyMonsterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FlyMonsterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FlyNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FlyNPCTemplate.java new file mode 100644 index 000000000..ec2f43b93 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FlyNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FlyNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FlyNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FlyRaidBossNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FlyRaidBossNPCTemplate.java new file mode 100644 index 000000000..3b5849d3a --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FlyRaidBossNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FlyRaidBossNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FlyRaidBossNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FlyTerrainObjectNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FlyTerrainObjectNPCTemplate.java new file mode 100644 index 000000000..7635db4f4 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FlyTerrainObjectNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FlyTerrainObjectNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FlyTerrainObjectNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortBallistaNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortBallistaNPCTemplate.java new file mode 100644 index 000000000..78c3557ee --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortBallistaNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortBallistaNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortBallistaNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortCommanderNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortCommanderNPCTemplate.java new file mode 100644 index 000000000..d8fd2f55b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortCommanderNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortCommanderNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortCommanderNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortDoormenNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortDoormenNPCTemplate.java new file mode 100644 index 000000000..836038116 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortDoormenNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortDoormenNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortDoormenNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortEnvoyNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortEnvoyNPCTemplate.java new file mode 100644 index 000000000..3a18117c0 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortEnvoyNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortEnvoyNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortEnvoyNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortLogisticsNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortLogisticsNPCTemplate.java new file mode 100644 index 000000000..e31013187 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortLogisticsNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortLogisticsNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortLogisticsNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortManagerNPCTemplate.java new file mode 100644 index 000000000..4738cdecb --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortSiegeNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortSiegeNPCTemplate.java new file mode 100644 index 000000000..dd1ec0a2d --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortSiegeNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortSiegeNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortSiegeNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortSupportCaptainNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortSupportCaptainNPCTemplate.java new file mode 100644 index 000000000..11379ebd6 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortSupportCaptainNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortSupportCaptainNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortSupportCaptainNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FortWyvernManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FortWyvernManagerNPCTemplate.java new file mode 100644 index 000000000..4d629470b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FortWyvernManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FortWyvernManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FortWyvernManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/FriendlyMonsterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/FriendlyMonsterNPCTemplate.java new file mode 100644 index 000000000..6fdf4572b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/FriendlyMonsterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class FriendlyMonsterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected FriendlyMonsterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/GrandeBossNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/GrandeBossNPCTemplate.java new file mode 100644 index 000000000..fc96241b0 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/GrandeBossNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class GrandeBossNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected GrandeBossNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/GuardNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/GuardNPCTemplate.java new file mode 100644 index 000000000..676e57546 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/GuardNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class GuardNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected GuardNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/KamaelVillageMasterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/KamaelVillageMasterNPCTemplate.java new file mode 100644 index 000000000..c3356e7aa --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/KamaelVillageMasterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class KamaelVillageMasterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected KamaelVillageMasterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ManorManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ManorManagerNPCTemplate.java new file mode 100644 index 000000000..b78221210 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ManorManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ManorManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ManorManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/MercManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/MercManagerNPCTemplate.java new file mode 100644 index 000000000..d3b14a7a7 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/MercManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class MercManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected MercManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/MercenaryManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/MercenaryManagerNPCTemplate.java new file mode 100644 index 000000000..75e2b111a --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/MercenaryManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class MercenaryManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected MercenaryManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/MerchantNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/MerchantNPCTemplate.java new file mode 100644 index 000000000..b1e27e1ca --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/MerchantNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class MerchantNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected MerchantNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/MerchantSummonNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/MerchantSummonNPCTemplate.java new file mode 100644 index 000000000..877c69429 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/MerchantSummonNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class MerchantSummonNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected MerchantSummonNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/MonsterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/MonsterNPCTemplate.java new file mode 100644 index 000000000..bb7a7f6d9 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/MonsterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class MonsterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected MonsterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/ObservationNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/ObservationNPCTemplate.java new file mode 100644 index 000000000..a4fe7685f --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/ObservationNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class ObservationNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected ObservationNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/OlympiadManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/OlympiadManagerNPCTemplate.java new file mode 100644 index 000000000..a1b0de9c1 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/OlympiadManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class OlympiadManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected OlympiadManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/OrcVillageMasterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/OrcVillageMasterNPCTemplate.java new file mode 100644 index 000000000..9ed615010 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/OrcVillageMasterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class OrcVillageMasterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected OrcVillageMasterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/PenaltyNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/PenaltyNPCTemplate.java new file mode 100644 index 000000000..43e9e62a0 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/PenaltyNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class PenaltyNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected PenaltyNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/PetManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/PetManagerNPCTemplate.java new file mode 100644 index 000000000..fdd34291b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/PetManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class PetManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected PetManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/PriestVillageMasterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/PriestVillageMasterNPCTemplate.java new file mode 100644 index 000000000..ceadf4d1d --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/PriestVillageMasterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class PriestVillageMasterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected PriestVillageMasterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/RaidBossNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/RaidBossNPCTemplate.java new file mode 100644 index 000000000..eb881ea07 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/RaidBossNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class RaidBossNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected RaidBossNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/RiftInvaderNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/RiftInvaderNPCTemplate.java new file mode 100644 index 000000000..e3a44dfe9 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/RiftInvaderNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class RiftInvaderNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected RiftInvaderNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/SepulcherMonsterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/SepulcherMonsterNPCTemplate.java new file mode 100644 index 000000000..4f773cab9 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/SepulcherMonsterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class SepulcherMonsterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected SepulcherMonsterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/SiegeNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/SiegeNPCTemplate.java new file mode 100644 index 000000000..86ade8841 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/SiegeNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class SiegeNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected SiegeNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/SiegeSummonNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/SiegeSummonNPCTemplate.java new file mode 100644 index 000000000..0c44ca630 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/SiegeSummonNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class SiegeSummonNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected SiegeSummonNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/SignsPriestsNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/SignsPriestsNPCTemplate.java new file mode 100644 index 000000000..53d75f8fd --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/SignsPriestsNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class SignsPriestsNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected SignsPriestsNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/SymbolMakerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/SymbolMakerNPCTemplate.java new file mode 100644 index 000000000..b32b035ed --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/SymbolMakerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class SymbolMakerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected SymbolMakerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/TamedBeastNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/TamedBeastNPCTemplate.java new file mode 100644 index 000000000..0d722594a --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/TamedBeastNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class TamedBeastNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected TamedBeastNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/TeleporterNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/TeleporterNPCTemplate.java new file mode 100644 index 000000000..583522f96 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/TeleporterNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class TeleporterNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected TeleporterNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/TerrainObjectNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/TerrainObjectNPCTemplate.java new file mode 100644 index 000000000..6b413d78d --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/TerrainObjectNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class TerrainObjectNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected TerrainObjectNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/TerritoryWardNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/TerritoryWardNPCTemplate.java new file mode 100644 index 000000000..f73c7c652 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/TerritoryWardNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class TerritoryWardNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected TerritoryWardNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/TownPetNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/TownPetNPCTemplate.java new file mode 100644 index 000000000..49ace570b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/TownPetNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class TownPetNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected TownPetNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/TrainerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/TrainerNPCTemplate.java new file mode 100644 index 000000000..b8edcc84b --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/TrainerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class TrainerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected TrainerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/TransformManagerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/TransformManagerNPCTemplate.java new file mode 100644 index 000000000..0a622e8c4 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/TransformManagerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class TransformManagerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected TransformManagerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/WalkerNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/WalkerNPCTemplate.java new file mode 100644 index 000000000..51c446c34 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/WalkerNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class WalkerNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected WalkerNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/template/npc/WarehouseNPCTemplate.java b/src/main/java/com/l2jserver/model/template/npc/WarehouseNPCTemplate.java new file mode 100644 index 000000000..b7c0611e6 --- /dev/null +++ b/src/main/java/com/l2jserver/model/template/npc/WarehouseNPCTemplate.java @@ -0,0 +1,39 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.template.npc; + +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.world.NPC; + +/** + * @author Rogiel + * + */ +public class WarehouseNPCTemplate extends NPCTemplate { + /** + * Creates a new instance of this template + * + * @param id + * the template id + * @param race + * the npc race + */ + protected WarehouseNPCTemplate(NPCTemplateID id) { + super(id); + } +} diff --git a/src/main/java/com/l2jserver/model/world/L2Character.java b/src/main/java/com/l2jserver/model/world/L2Character.java index 825b011f7..1922717b0 100644 --- a/src/main/java/com/l2jserver/model/world/L2Character.java +++ b/src/main/java/com/l2jserver/model/world/L2Character.java @@ -22,9 +22,9 @@ import com.l2jserver.model.id.AccountID; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.ClanID; import com.l2jserver.model.id.object.PetID; +import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.world.actor.ActorAttributes; import com.l2jserver.model.world.character.CharacterAppearance; -import com.l2jserver.model.world.character.CharacterAttributes; -import com.l2jserver.model.world.character.CharacterBaseAttributes; import com.l2jserver.model.world.character.CharacterCalculatedAttributes; import com.l2jserver.model.world.character.CharacterClass; import com.l2jserver.model.world.character.CharacterFriendList; @@ -49,6 +49,33 @@ public class L2Character extends Player { * The pet id */ private PetID petID; + + /** + * This character's inventory + */ + private final CharacterInventory inventory = new CharacterInventory(this); + /** + * The appearance of this character + */ + private final CharacterAppearance appearance = new CharacterAppearance(this); + /** + * The base attributes of this character + */ + private final CharacterTemplate.ActorBaseAttributes baseAttributes; + /** + * The attributes of this character + */ + private final ActorAttributes attributes; + /** + * The list of friend of this character + */ + private final CharacterFriendList friendList = new CharacterFriendList(this); + /** + * The shortcut container of this character + */ + private final CharacterShortcutContainer shortcuts = new CharacterShortcutContainer( + this); + /** * The character name */ @@ -65,32 +92,27 @@ public class L2Character extends Player { * Date of character's last access */ private Date lastAccess; + /** + * The character walk mode. + *

+ * This field is not persisted. + */ + private CharacterMoveType moveType = CharacterMoveType.WALK; /** - * This character's inventory + * The character walking mode + * + * @author Rogiel */ - private final CharacterInventory inventory = new CharacterInventory(this); - /** - * The appearance of this character - */ - private final CharacterAppearance appearance = new CharacterAppearance(this); - /** - * The base attributes of this character - */ - private final CharacterBaseAttributes baseAttributes; - /** - * The attributes of this character - */ - private final CharacterAttributes attributes; - /** - * The list of friend of this character - */ - private final CharacterFriendList friendList = new CharacterFriendList(this); - /** - * The shortcut container of this character - */ - private final CharacterShortcutContainer shortcuts = new CharacterShortcutContainer( - this); + public enum CharacterMoveType { + RUN(0x01), WALK(0x00); + + public final int id; + + CharacterMoveType(int id) { + this.id = id; + } + } /** * Creates a new instance @@ -98,7 +120,7 @@ public class L2Character extends Player { * @param baseAttributes * the base attribute for this character */ - public L2Character(CharacterBaseAttributes baseAttributes) { + public L2Character(CharacterTemplate.ActorBaseAttributes baseAttributes) { this.baseAttributes = baseAttributes; this.attributes = new CharacterCalculatedAttributes(this); } @@ -226,6 +248,21 @@ public class L2Character extends Player { this.lastAccess = lastAccess; } + /** + * @return the moveType + */ + public CharacterMoveType getMoveType() { + return moveType; + } + + /** + * @param moveType + * the moveType to set + */ + public void setMoveType(CharacterMoveType moveType) { + this.moveType = moveType; + } + /** * @return the inventory */ @@ -243,14 +280,14 @@ public class L2Character extends Player { /** * @return the base attributes */ - public CharacterBaseAttributes getBaseAttributes() { + public CharacterTemplate.ActorBaseAttributes getBaseAttributes() { return baseAttributes; } /** * @return the attributes */ - public CharacterAttributes getAttributes() { + public ActorAttributes getAttributes() { return attributes; } diff --git a/src/main/java/com/l2jserver/model/world/NPC.java b/src/main/java/com/l2jserver/model/world/NPC.java new file mode 100644 index 000000000..e78a12dec --- /dev/null +++ b/src/main/java/com/l2jserver/model/world/NPC.java @@ -0,0 +1,25 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.world; + +/** + * @author Rogiel + * + */ +public class NPC extends AbstractActor { + +} diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterAttributes.java b/src/main/java/com/l2jserver/model/world/actor/ActorAttributes.java similarity index 87% rename from src/main/java/com/l2jserver/model/world/character/CharacterAttributes.java rename to src/main/java/com/l2jserver/model/world/actor/ActorAttributes.java index 2e6341402..9827158f2 100644 --- a/src/main/java/com/l2jserver/model/world/character/CharacterAttributes.java +++ b/src/main/java/com/l2jserver/model/world/actor/ActorAttributes.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.model.world.character; +package com.l2jserver.model.world.actor; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.ActorTemplate; /** * Defines attributes of the character. Implementations can use an static value - * (i.e. from {@link CharacterTemplate}) or can use an calculator to define - * values, composed from many attributes objects. + * (i.e. from {@link ActorTemplate}) or can use an calculator to define values, + * composed from many attributes objects. * * @author Rogiel * */ -public interface CharacterAttributes { +public interface ActorAttributes { /** * @return the intelligence */ @@ -105,7 +105,7 @@ public interface CharacterAttributes { /** * @return the movement speed */ - public int getMoveSpeed(); + public double getMoveSpeed(); /** * @return the maxWeigth diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterBaseAttributes.java b/src/main/java/com/l2jserver/model/world/character/CharacterBaseAttributes.java deleted file mode 100644 index 50eb22857..000000000 --- a/src/main/java/com/l2jserver/model/world/character/CharacterBaseAttributes.java +++ /dev/null @@ -1,310 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.world.character; - -/** - * Defines the attributes of an character - * - * @author Rogiel - */ -public class CharacterBaseAttributes implements CharacterAttributes { - /** - * The character intelligence - */ - private final int intelligence; - /** - * The character strength - */ - private final int strength; - /** - * The character concentration - */ - private final int concentration; - /** - * The character mentality power - */ - private final int mentality; - /** - * The character dexterity - */ - private final int dexterity; - /** - * The character witness - */ - private final int witness; - - /** - * The default physical attack - */ - private final int physicalAttack; - /** - * The default magical attack - */ - private final int magicalAttack; - /** - * The physical defense - */ - private final int physicalDefense; - /** - * The magical defense - */ - private final int magicalDefense; - - /** - * The physical attack speed - */ - private final int attackSpeed; - /** - * The "magical attack speed" (aka cast speed) - */ - private final int castSpeed; - - /** - * The character accuracy - */ - private final int accuracy; - /** - * Chance of issuing an critical attack - */ - private final int criticalChance; - /** - * Chance of avoiding an attack - */ - private final int evasionChance; - /** - * The character's movement speed - */ - private final int moveSpeed; - /** - * The maximum weigth in items to be carried in the inventory - */ - private final int maxWeigth; - /** - * If this character can craft - */ - private final boolean craft; - - /** - * Creates a new instance - * - * @param intelligence - * the intelligence - * @param strength - * the strength - * @param concentration - * the concentration - * @param mentality - * the mentality - * @param dexterity - * the dexterity - * @param witness - * the witness - * @param physicalAttack - * the physical attack - * @param magicalAttack - * the magical attack - * @param physicalDefense - * the physical defense - * @param magicalDefense - * the magical defense - * @param attackSpeed - * the attack speed - * @param castSpeed - * the cast speed - * @param accuracy - * the accuracy - * @param criticalChance - * the critical chance - * @param evasionChance - * the evasion chance - * @param maxWeigth - * the maximum weight in inventory - * @param moveSpeed - * the character movement speed - * @param craft - * if the character can craft items - */ - public CharacterBaseAttributes(int intelligence, int strength, - int concentration, int mentality, int dextry, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft) { - this.intelligence = intelligence; - this.strength = strength; - this.concentration = concentration; - this.mentality = mentality; - this.dexterity = dextry; - this.witness = witness; - this.physicalAttack = physicalAttack; - this.magicalAttack = magicalAttack; - this.physicalDefense = physicalDefense; - this.magicalDefense = magicalDefense; - this.attackSpeed = attackSpeed; - this.castSpeed = castSpeed; - this.accuracy = accuracy; - this.criticalChance = criticalChance; - this.evasionChance = evasionChance; - this.moveSpeed = moveSpeed; - this.maxWeigth = maxWeigth; - this.craft = craft; - } - - /** - * @return the intelligence - */ - @Override - public int getIntelligence() { - return intelligence; - } - - /** - * @return the strength - */ - @Override - public int getStrength() { - return strength; - } - - /** - * @return the concentration - */ - @Override - public int getConcentration() { - return concentration; - } - - /** - * @return the mentality - */ - @Override - public int getMentality() { - return mentality; - } - - /** - * @return the dexterity - */ - @Override - public int getDexterity() { - return dexterity; - } - - /** - * @return the witness - */ - @Override - public int getWitness() { - return witness; - } - - /** - * @return the physicalAttack - */ - @Override - public int getPhysicalAttack() { - return physicalAttack; - } - - /** - * @return the magicalAttack - */ - @Override - public int getMagicalAttack() { - return magicalAttack; - } - - /** - * @return the physicalDefense - */ - @Override - public int getPhysicalDefense() { - return physicalDefense; - } - - /** - * @return the magicalDefense - */ - @Override - public int getMagicalDefense() { - return magicalDefense; - } - - /** - * @return the attackSpeed - */ - @Override - public int getAttackSpeed() { - return attackSpeed; - } - - /** - * @return the castSpeed - */ - @Override - public int getCastSpeed() { - return castSpeed; - } - - /** - * @return the accuracy - */ - @Override - public int getAccuracy() { - return accuracy; - } - - /** - * @return the criticalChance - */ - @Override - public int getCriticalChance() { - return criticalChance; - } - - /** - * @return the evasionChance - */ - @Override - public int getEvasionChance() { - return evasionChance; - } - - /** - * @return the moveSpeed - */ - @Override - public int getMoveSpeed() { - return moveSpeed; - } - - /** - * @return the maxWeigth - */ - @Override - public int getMaxWeigth() { - return maxWeigth; - } - - /** - * @return the craft - */ - @Override - public boolean canCraft() { - return craft; - } -} diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java b/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java index 3114f929c..d405f4255 100644 --- a/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java +++ b/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java @@ -18,15 +18,16 @@ package com.l2jserver.model.world.character; import com.l2jserver.model.template.CharacterTemplate; import com.l2jserver.model.world.L2Character; +import com.l2jserver.model.world.actor.ActorAttributes; /** - * This {@link CharacterAttributes} implementation calculates the real + * This {@link ActorAttributes} implementation calculates the real * character attributes based on it's {@link CharacterTemplate} and active * buffs. * * @author Rogiel */ -public class CharacterCalculatedAttributes implements CharacterAttributes { +public class CharacterCalculatedAttributes implements ActorAttributes { /** * The character */ @@ -34,7 +35,7 @@ public class CharacterCalculatedAttributes implements CharacterAttributes { /** * The base attributes (from {@link CharacterTemplate}) */ - private final CharacterAttributes baseAttributes; + private final ActorAttributes baseAttributes; public CharacterCalculatedAttributes(L2Character character) { this.character = character; @@ -117,7 +118,7 @@ public class CharacterCalculatedAttributes implements CharacterAttributes { } @Override - public int getMoveSpeed() { + public double getMoveSpeed() { return baseAttributes.getMoveSpeed(); } diff --git a/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java b/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java new file mode 100644 index 000000000..350bb84d7 --- /dev/null +++ b/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java @@ -0,0 +1,85 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.world.character.event; + +import com.l2jserver.model.world.L2Character; +import com.l2jserver.model.world.Player; +import com.l2jserver.model.world.WorldObject; +import com.l2jserver.model.world.capability.Actor; +import com.l2jserver.model.world.capability.Listenable; +import com.l2jserver.util.dimensional.Point; + +/** + * Event triggered once a character moves + * + * @author Rogiel + */ +public class CharacterStopMoveEvent implements CharacterEvent { + /** + * The character that is logging in + */ + private final L2Character character; + /** + * The new point of the character + */ + private final Point point; + + /** + * Creates a new instance + * + * @param character + * the character + * @param point + * the character point + */ + public CharacterStopMoveEvent(L2Character character, Point point) { + this.character = character; + this.point = point; + } + + /** + * @return the point + */ + public Point getPoint() { + return point; + } + + @Override + public Player getPlayer() { + return character; + } + + @Override + public Actor getActor() { + return character; + } + + @Override + public WorldObject getObject() { + return character; + } + + @Override + public L2Character getCharacter() { + return character; + } + + @Override + public Listenable[] getDispatchableObjects() { + return new Listenable[] { character }; + } +} diff --git a/src/main/java/com/l2jserver/service/ServiceModule.java b/src/main/java/com/l2jserver/service/ServiceModule.java index 8c361c512..aba759b20 100644 --- a/src/main/java/com/l2jserver/service/ServiceModule.java +++ b/src/main/java/com/l2jserver/service/ServiceModule.java @@ -19,8 +19,6 @@ package com.l2jserver.service; import com.google.inject.AbstractModule; import com.google.inject.Module; import com.google.inject.Scopes; -import com.l2jserver.service.blowfish.BlowfishKeygenService; -import com.l2jserver.service.blowfish.SecureBlowfishKeygenService; import com.l2jserver.service.cache.CacheService; import com.l2jserver.service.cache.EhCacheService; import com.l2jserver.service.configuration.ConfigurationService; @@ -45,6 +43,8 @@ import com.l2jserver.service.logging.Log4JLoggingService; import com.l2jserver.service.logging.LoggingService; import com.l2jserver.service.network.NettyNetworkService; import com.l2jserver.service.network.NetworkService; +import com.l2jserver.service.network.keygen.BlowfishKeygenService; +import com.l2jserver.service.network.keygen.SecureBlowfishKeygenService; /** * Google Guice {@link Module} for services diff --git a/src/main/java/com/l2jserver/service/game/CharacterService.java b/src/main/java/com/l2jserver/service/game/CharacterService.java index 4aec23bac..15c150dbd 100644 --- a/src/main/java/com/l2jserver/service/game/CharacterService.java +++ b/src/main/java/com/l2jserver/service/game/CharacterService.java @@ -18,6 +18,7 @@ package com.l2jserver.service.game; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.Service; +import com.l2jserver.util.dimensional.Coordinate; /** * This service manages {@link L2Character} instances @@ -40,4 +41,30 @@ public interface CharacterService extends Service { * the character */ void leaveWorld(L2Character character); + + /** + * Moves the given character to coordinate + * + * @param character + * the character + * @param coordinate + * the coordinate + */ + void move(L2Character character, Coordinate coordinate); + + /** + * Set the character to walking mode + * + * @param character + * the character + */ + void walk(L2Character character); + + /** + * Set the character to run mode + * + * @param character + * the character + */ + void run(L2Character character); } diff --git a/src/main/java/com/l2jserver/service/game/CharacterServiceImpl.java b/src/main/java/com/l2jserver/service/game/CharacterServiceImpl.java index 930bbd42d..f9922531f 100644 --- a/src/main/java/com/l2jserver/service/game/CharacterServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/CharacterServiceImpl.java @@ -20,30 +20,36 @@ import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.client.CharacterChatMessagePacket.MessageDestination; import com.l2jserver.game.net.packet.server.ActorChatMessagePacket; +import com.l2jserver.game.net.packet.server.ActorMovementPacket; +import com.l2jserver.game.net.packet.server.CharacterMovementTypePacket; import com.l2jserver.game.net.packet.server.GameGuardQueryPacket; import com.l2jserver.game.net.packet.server.InventoryPacket; import com.l2jserver.game.net.packet.server.UserInformationPacket; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.world.L2Character; +import com.l2jserver.model.world.L2Character.CharacterMoveType; import com.l2jserver.model.world.character.event.CharacterEnterWorldEvent; import com.l2jserver.model.world.character.event.CharacterEvent; import com.l2jserver.model.world.character.event.CharacterLeaveWorldEvent; import com.l2jserver.model.world.character.event.CharacterListener; import com.l2jserver.service.AbstractService; import com.l2jserver.service.AbstractService.Depends; +import com.l2jserver.service.game.ai.AIService; import com.l2jserver.service.game.chat.ChatService; import com.l2jserver.service.game.chat.channel.ChatChannel; import com.l2jserver.service.game.chat.channel.ChatChannelListener; import com.l2jserver.service.game.world.WorldService; import com.l2jserver.service.game.world.event.WorldEventDispatcher; import com.l2jserver.service.network.NetworkService; +import com.l2jserver.util.dimensional.Coordinate; /** * Default implementation for {@link CharacterService}. * * @author Rogiel */ -@Depends({ WorldService.class, ChatService.class, NetworkService.class }) +@Depends({ WorldService.class, ChatService.class, NetworkService.class, + SpawnService.class, AIService.class }) public class CharacterServiceImpl extends AbstractService implements CharacterService { /** @@ -67,15 +73,25 @@ public class CharacterServiceImpl extends AbstractService implements */ private final SpawnService spawnService; + // /** + // * The {@link AIService} + // */ + // private final AIService aiService; + @Inject public CharacterServiceImpl(WorldService worldService, WorldEventDispatcher eventDispatcher, ChatService chatService, - NetworkService networkService, SpawnService spawnService) { + NetworkService networkService, SpawnService spawnService/* + * , + * AIService + * aiService + */) { this.worldService = worldService; this.eventDispatcher = eventDispatcher; this.chatService = chatService; this.networkService = networkService; this.spawnService = spawnService; + // this.aiService = aiService; } @Override @@ -123,6 +139,8 @@ public class CharacterServiceImpl extends AbstractService implements conn.write(new GameGuardQueryPacket()); conn.write(new InventoryPacket(character.getInventory())); + run(character); + // dispatch enter world event eventDispatcher.dispatch(new CharacterEnterWorldEvent(character)); @@ -130,10 +148,44 @@ public class CharacterServiceImpl extends AbstractService implements spawnService.spawn(character); } + @Override + public void move(L2Character character, Coordinate coordinate) { + final CharacterID id = character.getID(); + final Lineage2Connection conn = networkService.discover(id); + // for now, let's just write the packet + // aiService.walk(character, coordinate); + + final Coordinate source = character.getPosition(); + character.setPosition(coordinate); + conn.write(new ActorMovementPacket(character, source)); + // we don't dispatch events here, they will be dispatched by + // CharacterValidatePositionPacket packets at fixed time intervals. + } + @Override public void leaveWorld(L2Character character) { if (!worldService.remove(character)) return; eventDispatcher.dispatch(new CharacterLeaveWorldEvent(character)); } + + @Override + public void walk(L2Character character) { + final CharacterID id = character.getID(); + final Lineage2Connection conn = networkService.discover(id); + if (character.getMoveType() == CharacterMoveType.RUN) { + character.setMoveType(CharacterMoveType.WALK); + conn.broadcast(new CharacterMovementTypePacket(character)); + } + } + + @Override + public void run(L2Character character) { + final CharacterID id = character.getID(); + final Lineage2Connection conn = networkService.discover(id); + if (character.getMoveType() == CharacterMoveType.WALK) { + character.setMoveType(CharacterMoveType.RUN); + conn.broadcast(new CharacterMovementTypePacket(character)); + } + } } diff --git a/src/main/java/com/l2jserver/service/game/ai/AIScript.java b/src/main/java/com/l2jserver/service/game/ai/AIScript.java new file mode 100644 index 000000000..ff7bca58a --- /dev/null +++ b/src/main/java/com/l2jserver/service/game/ai/AIScript.java @@ -0,0 +1,54 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.game.ai; + +/** + * The AI Script interface. Scripts are not continuous executed. The service + * will call multiple times {@link #run(double)}. Each time will represent a + * tick and a bit of the job should be done in there. + * + * @author Rogiel + */ +public interface AIScript { + /** + * Start the AIScript. Will register required listeners and start tasks. + */ + void start(); + + /** + * Executes an AI operation. + *

+ * Please note that time will almost never reach 1 second + * its usage is to determine how much time has been spent idle and to deal + * with it. + *

+ * Instead of having a fixed "tick" time this method will be called at a + * random interval. This will make possible to use load balancers that can + * slow the "tick" once the server is in high load and reduce when the load + * is low. + * + * @param time + * the time elapsed since last call. In seconds + */ + void run(double time); + + /** + * Stop the AIScript. Will unregister the listeners that were registered in + * {@link #start()} and during life time. + */ + void stop(); +} diff --git a/src/main/java/com/l2jserver/service/game/ai/AIService.java b/src/main/java/com/l2jserver/service/game/ai/AIService.java new file mode 100644 index 000000000..c10902153 --- /dev/null +++ b/src/main/java/com/l2jserver/service/game/ai/AIService.java @@ -0,0 +1,38 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.game.ai; + +import com.l2jserver.model.world.capability.Actor; +import com.l2jserver.service.Service; +import com.l2jserver.util.dimensional.Coordinate; + +/** + * This service executes AI operations + * + * @author Rogiel + */ +public interface AIService extends Service { + /** + * Walks the given actor to coordinate + * + * @param actor + * the actor + * @param coordinate + * the coordinate + */ + void walk(Actor actor, Coordinate coordinate); +} diff --git a/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java b/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java new file mode 100644 index 000000000..bde96de27 --- /dev/null +++ b/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java @@ -0,0 +1,82 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.game.ai; + +import com.google.inject.Inject; +import com.l2jserver.model.world.capability.Actor; +import com.l2jserver.service.AbstractService; +import com.l2jserver.service.AbstractService.Depends; +import com.l2jserver.service.ServiceStartException; +import com.l2jserver.service.ServiceStopException; +import com.l2jserver.service.game.CharacterService; +import com.l2jserver.service.game.template.TemplateService; +import com.l2jserver.service.game.world.WorldService; +import com.l2jserver.service.game.world.event.WorldEventDispatcher; +import com.l2jserver.service.network.NetworkService; +import com.l2jserver.service.threading.ThreadService; +import com.l2jserver.util.dimensional.Coordinate; + +/** + * Default implementation for {@link CharacterService}. + * + * @author Rogiel + */ +@Depends({ WorldService.class, TemplateService.class, ThreadService.class, + NetworkService.class }) +public class AIServiceImpl extends AbstractService implements AIService { + /** + * The {@link WorldService} + */ + private final WorldService worldService; + /** + * The {@link WorldService} event dispatcher + */ + private final WorldEventDispatcher eventDispatcher; + /** + * The {@link ThreadService} + */ + private final ThreadService threadService; + /** + * The {@link NetworkService} + */ + private final NetworkService networkService; + + @Inject + public AIServiceImpl(WorldService worldService, + WorldEventDispatcher eventDispatcher, ThreadService threadService, + NetworkService networkService) { + this.worldService = worldService; + this.eventDispatcher = eventDispatcher; + this.threadService = threadService; + this.networkService = networkService; + } + + @Override + protected void doStart() throws ServiceStartException { + + } + + @Override + public void walk(Actor actor, Coordinate coordinate) { + + } + + @Override + protected void doStop() throws ServiceStopException { + + } +} diff --git a/src/main/java/com/l2jserver/service/game/ai/script/AttackAIScript.java b/src/main/java/com/l2jserver/service/game/ai/script/AttackAIScript.java new file mode 100644 index 000000000..9527572a0 --- /dev/null +++ b/src/main/java/com/l2jserver/service/game/ai/script/AttackAIScript.java @@ -0,0 +1,27 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.game.ai.script; + +import com.l2jserver.model.world.capability.Attackable; +import com.l2jserver.service.game.ai.AIScript; + +/** + * @author Rogiel. + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.game.ai.script; + +import com.l2jserver.model.world.capability.Positionable; + +/** + * This AI is used to receive notifications once another object aproaches. + * + * @author Rogiel + */ +public interface ProximityAIScript { + /** + * Invoked once another object moves in proximity or the object suddenly + * appears. + * + * @param object + * the object + */ + void approach(Positionable object); +} diff --git a/src/main/java/com/l2jserver/service/game/ai/script/WalkingAIScript.java b/src/main/java/com/l2jserver/service/game/ai/script/WalkingAIScript.java new file mode 100644 index 000000000..a4bb57f6e --- /dev/null +++ b/src/main/java/com/l2jserver/service/game/ai/script/WalkingAIScript.java @@ -0,0 +1,30 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.game.ai.script; + +import com.l2jserver.model.world.capability.Positionable; +import com.l2jserver.service.game.ai.AIScript; +import com.l2jserver.util.dimensional.Coordinate; + +/** + * @author Rogiel. + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.game.effect; + +import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.Service; + +/** + * The effect service will handle + * + * @author Rogiel + */ +public interface EffectService extends Service { + /** + * Adds a new effect to an given character. The effect will last + * duration milliseconds. + * + * @param character + * the character + * @param duration + * the effect duration in milliseconds + */ + void addEffect(L2Character character, long duration); +} diff --git a/src/main/java/com/l2jserver/service/game/world/WorldService.java b/src/main/java/com/l2jserver/service/game/world/WorldService.java index c5b2506df..94f6a7458 100644 --- a/src/main/java/com/l2jserver/service/game/world/WorldService.java +++ b/src/main/java/com/l2jserver/service/game/world/WorldService.java @@ -19,6 +19,7 @@ package com.l2jserver.service.game.world; import java.util.Iterator; import java.util.List; +import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.world.WorldObject; import com.l2jserver.service.Service; import com.l2jserver.service.game.world.event.WorldEventDispatcher; @@ -55,6 +56,19 @@ public interface WorldService extends Service, Iterable { */ boolean contains(WorldObject object); + /** + * Locates the object with the given id + * + * @param + * the object type + * @param id + * the object id + * @return the found object + * @throws ClassCastException + * if object found is not an instance of T + */ + T find(ObjectID id) throws ClassCastException; + /** * Get the event dispatcher * diff --git a/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java b/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java index 197520d34..e4208ae47 100644 --- a/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java @@ -24,6 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; +import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.world.WorldObject; import com.l2jserver.service.AbstractService; import com.l2jserver.service.AbstractService.Depends; @@ -35,6 +36,7 @@ import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.service.game.world.event.WorldEventDispatcher; import com.l2jserver.service.game.world.filter.FilterIterator; import com.l2jserver.service.game.world.filter.WorldObjectFilter; +import com.l2jserver.service.game.world.filter.impl.IDFilter; import com.l2jserver.service.game.world.filter.impl.InstanceFilter; import com.l2jserver.service.logging.LoggingService; import com.l2jserver.util.factory.CollectionFactory; @@ -90,6 +92,17 @@ public class WorldServiceImpl extends AbstractService implements WorldService { return objects.contains(object); } + @Override + @SuppressWarnings("unchecked") + public T find(ObjectID id) { + final IDFilter filter = new IDFilter(id); + for (final WorldObject object : objects) { + if (filter.accept(object)) + return (T) object; + } + return null; + } + @Override public WorldEventDispatcher getEventDispatcher() { return dispatcher; diff --git a/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java b/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java index 4811fb4e6..aa45ec07c 100644 --- a/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java +++ b/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java @@ -36,6 +36,19 @@ public interface WorldEventDispatcher { */ void dispatch(WorldEvent event); + /** + * Adds a new global listener + * + * @param + * the event type + * @param + * the listener type + * @param listener + * the listener + */ + void addListener( + WorldListener listener); + /** * Adds a new listener to object * diff --git a/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java b/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java index 938f1f699..161984e5b 100644 --- a/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java +++ b/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java @@ -86,11 +86,19 @@ public class WorldEventDispatcherImpl implements WorldEventDispatcher { } } + @Override + public void addListener(WorldListener listener) { + log.debug("Adding new listener global {}", listener); + listeners.add(new ListenerIDPair(null, listener)); + } + @Override public void addListener( Listenable object, WorldListener listener) { - log.debug("Adding new listener {} to {}", listener, object.getID()); - listeners.add(new ListenerIDPair(object.getID(), listener)); + log.debug("Adding new listener {} to {}", listener, + (object != null ? object.getID() : null)); + listeners.add(new ListenerIDPair((object != null ? object.getID() + : null), listener)); } @Override @@ -125,6 +133,8 @@ public class WorldEventDispatcherImpl implements WorldEventDispatcher { } public boolean testDispatch(ObjectID id) { + if (this.ID == null) // global listeners + return true; return id.equals(this.ID); } diff --git a/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java b/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java index c5a805ff5..375c82f1d 100644 --- a/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java +++ b/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java @@ -17,7 +17,7 @@ package com.l2jserver.service.game.world.filter.impl; import com.l2jserver.model.id.ObjectID; -import com.l2jserver.model.world.capability.Positionable; +import com.l2jserver.model.world.WorldObject; import com.l2jserver.service.game.world.filter.WorldObjectFilter; /** @@ -25,7 +25,7 @@ import com.l2jserver.service.game.world.filter.WorldObjectFilter; * * @author Rogiel */ -public class IDFilter implements WorldObjectFilter { +public class IDFilter implements WorldObjectFilter { /** * The object id */ @@ -42,7 +42,7 @@ public class IDFilter implements WorldObjectFilter { } @Override - public boolean accept(Positionable other) { + public boolean accept(WorldObject other) { if (other == null) return false; return other.getID().equals(id); diff --git a/src/main/java/com/l2jserver/service/network/NettyNetworkService.java b/src/main/java/com/l2jserver/service/network/NettyNetworkService.java index 75d8383ac..ffbfc4e1e 100644 --- a/src/main/java/com/l2jserver/service/network/NettyNetworkService.java +++ b/src/main/java/com/l2jserver/service/network/NettyNetworkService.java @@ -34,10 +34,10 @@ import com.l2jserver.game.net.Lineage2PipelineFactory; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.service.AbstractService; import com.l2jserver.service.AbstractService.Depends; -import com.l2jserver.service.blowfish.BlowfishKeygenService; import com.l2jserver.service.configuration.ConfigurationService; import com.l2jserver.service.game.world.WorldService; import com.l2jserver.service.logging.LoggingService; +import com.l2jserver.service.network.keygen.BlowfishKeygenService; import com.l2jserver.util.factory.CollectionFactory; /** diff --git a/src/main/java/com/l2jserver/service/blowfish/BlowfishKeygenService.java b/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java similarity index 94% rename from src/main/java/com/l2jserver/service/blowfish/BlowfishKeygenService.java rename to src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java index 9d7e2927a..6eb3ec9e5 100644 --- a/src/main/java/com/l2jserver/service/blowfish/BlowfishKeygenService.java +++ b/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.service.blowfish; +package com.l2jserver.service.network.keygen; import com.l2jserver.service.Service; diff --git a/src/main/java/com/l2jserver/service/blowfish/PseudoRandomBlowfishKeygenService.java b/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java similarity index 97% rename from src/main/java/com/l2jserver/service/blowfish/PseudoRandomBlowfishKeygenService.java rename to src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java index e8d239dc6..0463c8919 100644 --- a/src/main/java/com/l2jserver/service/blowfish/PseudoRandomBlowfishKeygenService.java +++ b/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.service.blowfish; +package com.l2jserver.service.network.keygen; import java.util.Random; diff --git a/src/main/java/com/l2jserver/service/blowfish/SecureBlowfishKeygenService.java b/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java similarity index 97% rename from src/main/java/com/l2jserver/service/blowfish/SecureBlowfishKeygenService.java rename to src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java index 4d039830f..4256592cf 100644 --- a/src/main/java/com/l2jserver/service/blowfish/SecureBlowfishKeygenService.java +++ b/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.service.blowfish; +package com.l2jserver.service.network.keygen; import org.apache.commons.math.random.RandomData; import org.apache.commons.math.random.RandomDataImpl; diff --git a/src/main/java/com/l2jserver/service/threading/ThreadService.java b/src/main/java/com/l2jserver/service/threading/ThreadService.java index f7ad07250..e01013c41 100644 --- a/src/main/java/com/l2jserver/service/threading/ThreadService.java +++ b/src/main/java/com/l2jserver/service/threading/ThreadService.java @@ -16,12 +16,14 @@ */ package com.l2jserver.service.threading; +import com.l2jserver.service.Service; + /** * This service is responsible for scheduling tasks and executing them in * parallel. * * @author Rogiel */ -public interface ThreadService { +public interface ThreadService extends Service { } diff --git a/src/main/java/com/l2jserver/util/RGBColor.java b/src/main/java/com/l2jserver/util/RGBColor.java index ae2e154ec..969ef255e 100644 --- a/src/main/java/com/l2jserver/util/RGBColor.java +++ b/src/main/java/com/l2jserver/util/RGBColor.java @@ -77,7 +77,7 @@ public class RGBColor { * @return the color integer */ public int toInteger() { - return red + green >> 8 + blue >> 16; + return red >> 24 + green >> 16 + blue >> 8; } public static RGBColor fromByteArray(byte[] rgb) { diff --git a/src/main/java/com/l2jserver/util/dimensional/Coordinate.java b/src/main/java/com/l2jserver/util/dimensional/Coordinate.java index 8230dd163..d2e957bc1 100644 --- a/src/main/java/com/l2jserver/util/dimensional/Coordinate.java +++ b/src/main/java/com/l2jserver/util/dimensional/Coordinate.java @@ -86,13 +86,12 @@ public class Coordinate { return new Coordinate(x, y, z); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { return "Coordinate [" + vector + "]"; } + + public Point toPoint() { + return new Point(this, 0); + } } diff --git a/src/tool/java/com/l2jserver/tool/conversor/chartemplate/CharacterTemplateBase.txt b/src/tool/java/com/l2jserver/tool/conversor/chartemplate/CharacterTemplateBase.txt index 46aef4915..b28412a03 100644 --- a/src/tool/java/com/l2jserver/tool/conversor/chartemplate/CharacterTemplateBase.txt +++ b/src/tool/java/com/l2jserver/tool/conversor/chartemplate/CharacterTemplateBase.txt @@ -1,4 +1,20 @@ -package script.template.character; +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package script.template.actor.character; import com.google.inject.Inject; import com.l2jserver.model.id.template.CharacterTemplateID; @@ -10,43 +26,31 @@ import com.l2jserver.util.dimensional.Point; public class ${javaClassName}Template extends ${parent}Template { @Inject public ${javaClassName}Template(CharacterTemplateIDFactory factory) { - super(factory.createID(${ClassId}.id), - ${ClassId}, - // ATTRIBUTES - ${_INT},// INT - ${STR},// STR - ${CON},// CON - ${MEN},// MEN - ${DEX},// DEX - ${WIT},// WIT - ${P_ATK},// physical attack - ${M_ATK},// magical attack - ${P_DEF},// physical def - ${M_DEF},// magical def - ${P_SPD},// attack speed - ${M_SPD},// cast speed - ${ACC},// accuracy - ${CRITICAL},// critical - ${EVASION},// evasion - ${MOVE_SPD},// move speed - ${_LOAD},// max inventory weight - ${canCraft},// can craft - Point.fromXYZ(${x}, ${y}, ${z})// spawn location - ); + super(factory.createID(${ClassId}.id), ${ClassId}, Point.fromXYZ(${x}, ${y}, ${z})); + // ATTRIBUTES + attributes.intelligence = ${_INT}; + attributes.strength = ${STR}; + attributes.concentration = ${CON}; + attributes.mentality = ${MEN}; + attributes.dexterity = ${DEX}; + attributes.witness = ${WIT}; + attributes.physicalAttack = ${P_ATK}; + attributes.magicalAttack = ${M_ATK}; + attributes.physicalDefense = ${P_DEF}; + attributes.magicalDefense = ${M_DEF}; + attributes.attackSpeed = ${P_SPD}; + attributes.castSpeed = ${M_SPD}; + attributes.accuracy = ${ACC}; + attributes.criticalChance = ${CRITICAL}; + attributes.evasionChance = ${EVASION}; + attributes.moveSpeed = ${MOVE_SPD}; + attributes.maxWeigth = ${_LOAD}; + attributes.craft = ${canCraft}; } protected ${javaClassName}Template(CharacterTemplateID id, - CharacterClass characterClass, int intelligence, int strength, - int concentration, int mentality, int dexterity, int witness, - int physicalAttack, int magicalAttack, int physicalDefense, - int magicalDefense, int attackSpeed, int castSpeed, int accuracy, - int criticalChance, int evasionChance, int moveSpeed, - int maxWeigth, boolean craft, Point spawnLocation) { - super(id, characterClass, intelligence, strength, concentration, - mentality, dexterity, witness, physicalAttack, magicalAttack, - physicalDefense, magicalDefense, attackSpeed, castSpeed, - accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth, - craft, spawnLocation); + CharacterClass characterClass, Point spawnLocation) { + super(id, characterClass, spawnLocation); } @Override