Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ### Eclipse Workspace Patch 1.0
- #P aCis_gameserver
- diff --git config/aCis/Personagem.properties
- index 7ac3169..3932b7b 100644
- --- config/aCis/Personagem.properties
- +++ config/aCis/Personagem.properties
- @@ -2,40 +2,49 @@
- # Spawn New Character
- #===============================================================
- # Custom starting spawn location.
- # Giran = 83400,148104,-3400
- AllowCustomSpawnLocation = False
- CustomSpawnLocation = 83400,148104,-3400
- # Custom title on new chars.
- AllowNewCharTitle = False
- NewCharTitle = New Char
- # Custom Level New Character.
- StartingLevelCharacter = 1
- #===============================================================
- # Comprar Varias Armas hero no Monumento Hero?
- #===============================================================
- # Retail = False
- BuyHeroWeaponsAll = True
- +#==========================================================
- +# Size Weapon Dwarf
- +#==========================================================
- +# Ligar mod de alterar tamanho da weapons por dwarf?
- +EnableDwarfWeaponSize = True
- +
- +# Tamanho da arma no dwarf, Boa tamanho 6
- +SizeWeaponDwarf = 6
- #===============================================================
- # Elf Village To Village for PvP Zone
- #===============================================================
- # Quando esta ativado, as class Elf e dark Elf, elas irao para Elf Village, se tiverem numa zona PvP Na Region Elf Village.
- # Retail = False
- EnableAllClassElfToVillage = False
- #===============================================================
- # Enable Cancel Attack for Bow
- #===============================================================
- # Quando essa opsao esta ativa, o personagem pode se interrompido seu atk usando bow
- # Server PvP Deixe sempre False, principalmente para uso perfeito do Auto Farm.
- # Chance Retail quando ta ativo e 15%
- AltGameCancelByBow = False
- #===============================================================
- # Enable Cancel Attack for CastSpeed
- #===============================================================
- # Quando essa opsao esta ativa, o personagem pode se interrompido seu CastSpeed quando leva dano.
- # Server PvP Deixe sempre False, principalmente para uso perfeito do Auto Farm.
- diff --git java/net/sf/l2j/Config.java
- index db55846..833ee22 100644
- --- java/net/sf/l2j/Config.java
- +++ java/net/sf/l2j/Config.java
- @@ -76,40 +76,42 @@
- public static final String PVP_EVENT_FILE = "./config/aCis/Eventos/PvPEvent.properties";
- public static final String MISSION_FILE = "./config/aCis/Eventos/Mission.properties";
- public static final String BOSS_SOLO_FILE = "./config/aCis/Eventos/SoloBoss.properties";
- // --------------------------------------------------
- // Clans settings
- // --------------------------------------------------
- /** Clans */
- public static int ALT_CLAN_JOIN_DAYS;
- public static int ALT_CLAN_CREATE_DAYS;
- public static int ALT_CLAN_DISSOLVE_DAYS;
- public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED;
- public static int ALT_ALLY_JOIN_DAYS_WHEN_DISMISSED;
- public static int ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED;
- public static int ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED;
- public static int ALT_MAX_NUM_OF_CLANS_IN_ALLY;
- public static int ALT_CLAN_MEMBERS_FOR_WAR;
- public static int ALT_CLAN_WAR_PENALTY_WHEN_ENDED;
- public static boolean ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH;
- public static boolean REMOVE_CASTLE_CIRCLETS;
- + public static boolean ENABLE_DWARF_WEAPON_SIZE;
- + public static int SIZE_WEAPON_DWARF;
- public static boolean USE_SAY_FILTER;
- public static String CHAT_FILTER_CHARS;
- public static ArrayList<String> FILTER_LIST = new ArrayList<>();
- public static int CHAT_FILTER_PUNISHMENT_PARAM1;
- public static int CHAT_FILTER_PUNISHMENT_PARAM2;
- public static int CHAT_FILTER_PUNISHMENT_PARAM3;
- public static String CHAT_FILTER_PUNISHMENT;
- public static String INTERFACE_KEY;
- public static int VERIFICATION_TIME;
- /** Variaveis Boss Solo */
- public static int NPC_GK_SOLOBOSS;
- public static int[] NPC_GK_BOSS_SOLO_X = new int[3];
- public static boolean SOLO_BOSS_EVENT;
- public static String[] SOLO_BOSS_EVENT_INTERVAL_BY_TIME_OF_DAY;
- public static int SOLO_RAID_REWARDS_RANGE;
- public static int SOLO_BOSS_ID_ONE;
- public static boolean SCREN_MSG_BOSS_SOLO;
- public static int BOSS_ID_ONE_X;
- @@ -3602,40 +3604,42 @@
- CRYSTAL_ENCHANT_MIN = Integer.parseInt(enchant.getProperty("CrystalEnchantMin", "20"));
- CRYSTAL_ENCHANT_WEAPON_MAX = Integer.parseInt(enchant.getProperty("CrystalEnchantWeaponMax", "25"));
- CRYSTAL_ENCHANT_ARMOR_MAX = Integer.parseInt(enchant.getProperty("CrystalEnchantArmorMax", "25"));
- CRYSTAL_ENCHANT_JEWELRY_MAX = Integer.parseInt(enchant.getProperty("CrystalEnchantJewelryMax", "25"));
- DONATOR_ENCHANT_MIN = Integer.parseInt(enchant.getProperty("DonatorEnchantMin", "20"));
- DONATOR_ENCHANT_WEAPON_MAX = Integer.parseInt(enchant.getProperty("DonatorEnchantWeaponMax", "25"));
- DONATOR_ENCHANT_ARMOR_MAX = Integer.parseInt(enchant.getProperty("DonatorEnchantArmorMax", "25"));
- DONATOR_ENCHANT_JEWELRY_MAX = Integer.parseInt(enchant.getProperty("DonatorEnchantJewelryMax", "25"));
- DONATOR_DECREASE_ENCHANT = Boolean.valueOf(enchant.getProperty("DonatorDecreaseEnchant", "false")).booleanValue();
- BLESSED_DECREASE_ENCHANT = Boolean.valueOf(enchant.getProperty("BlessedDecreaseEnchant", "false")).booleanValue();
- SYSTEM_ENCHANT_BLESS_REDUCED = Boolean.parseBoolean(enchant.getProperty("EnableSystemBlessDecrease", "False"));
- }
- /**
- * Loads New Char Classic settings.<br>
- */
- private static final void loadPlayerConfig()
- {
- final ExProperties newbiechar = initProperties(NEWCHARACTER);
- + ENABLE_DWARF_WEAPON_SIZE = Boolean.parseBoolean(newbiechar.getProperty("EnableDwarfWeaponSize", "False"));
- + SIZE_WEAPON_DWARF = newbiechar.getProperty("SizeWeaponDwarf", 0);
- ENABLE_WEAPONS_HERO_ALL = Boolean.parseBoolean(newbiechar.getProperty("BuyHeroWeaponsAll", "False"));
- ENABLE_ALL_CLASS_TL_ELFVILLAGE = Boolean.parseBoolean(newbiechar.getProperty("EnableAllClassElfToVillage", "False"));
- ALT_GAME_CANCEL_BOW = Boolean.parseBoolean(newbiechar.getProperty("AltGameCancelByBow", "False"));
- ALT_GAME_CANCEL_CAST = Boolean.parseBoolean(newbiechar.getProperty("AltGameCancelByCast", "False"));
- OPEN_EFFECT_CLASSIC_TELEPORTER = Boolean.parseBoolean(newbiechar.getProperty("EnableEffectTeleporter", "False"));
- AUTO_MACRO_AUTOFARM = Boolean.parseBoolean(newbiechar.getProperty("AutoMacroAutoFarmNewbie", "False"));
- AUTO_MACRO_MENU = Boolean.parseBoolean(newbiechar.getProperty("AutoMacroMenuNewbie", "False"));
- ENABLE_USE_SKILLS_BS = Boolean.parseBoolean(newbiechar.getProperty("DeadSkillsUsedAll", "False"));
- TELEPORTER_SKILLS_ACTIVED = Boolean.parseBoolean(newbiechar.getProperty("SkillsContinue", "False"));
- ENABLE_USE_SKILLS_PETS = Boolean.parseBoolean(newbiechar.getProperty("SkillsContinuePets", "False"));
- USE_SKILLS_FORMALWEAR = Boolean.parseBoolean(newbiechar.getProperty("UseSkillsEquipedWear", "False"));
- USE_ITEMS_FORMALWEAR = Boolean.parseBoolean(newbiechar.getProperty("EquipedItemsForWear", "False"));
- CUSTOM_TELEGIRAN_ON_DIE = Boolean.parseBoolean(newbiechar.getProperty("CustomTeleportOnDie", "false"));
- BOOK_ITEM_CUSTOM = Integer.parseInt(newbiechar.getProperty("BookCustomItemID", "0"));
- DISABLE_GRADE_PENALTY = Boolean.parseBoolean(newbiechar.getProperty("DisableGradePenalty", "False"));
- DISABLE_WEIGHT_PENALTY = Boolean.parseBoolean(newbiechar.getProperty("DisableWeightPenalty", "False"));
- UNSTUCK_TIME = Integer.parseInt(newbiechar.getProperty("UnstuckTime", "0"));
- NEW_PLAYER_EFFECT = Boolean.parseBoolean(newbiechar.getProperty("NewPlayerEffect", "false"));
- ESPECIAL_VIP_LOGIN = Boolean.parseBoolean(newbiechar.getProperty("CharVipEffectLogin", "false"));
- diff --git java/net/sf/l2j/gameserver/model/actor/template/CharTemplate.java
- index 37be180..d946d59 100644
- --- java/net/sf/l2j/gameserver/model/actor/template/CharTemplate.java
- +++ java/net/sf/l2j/gameserver/model/actor/template/CharTemplate.java
- @@ -1,36 +1,39 @@
- /*
- * This program 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.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
- package net.sf.l2j.gameserver.model.actor.template;
- +import net.sf.l2j.Config;
- +import net.sf.l2j.gameserver.model.actor.template.NpcTemplate.Race;
- +import net.sf.l2j.gameserver.model.base.ClassRace;
- import net.sf.l2j.gameserver.templates.StatsSet;
- public class CharTemplate
- {
- private final int _baseSTR;
- private final int _baseCON;
- private final int _baseDEX;
- private final int _baseINT;
- private final int _baseWIT;
- private final int _baseMEN;
- private final double _baseHpMax;
- private final double _baseMpMax;
- private final double _baseHpReg;
- private final double _baseMpReg;
- private final double _basePAtk;
- private final double _baseMAtk;
- private final double _basePDef;
- @@ -154,26 +157,35 @@
- public final int getBaseCritRate()
- {
- return _baseCritRate;
- }
- public final int getBaseWalkSpeed()
- {
- return _baseWalkSpd;
- }
- public final int getBaseRunSpeed()
- {
- return _baseRunSpd;
- }
- public final double getCollisionRadius()
- {
- return _collisionRadius;
- }
- + public int getCollisionRadius(ClassRace raceid)
- + {
- + if(Config.ENABLE_DWARF_WEAPON_SIZE)
- + {
- + if(raceid == ClassRace.DWARF)
- + return Config.SIZE_WEAPON_DWARF;
- + return (int) getCollisionRadius();
- + }
- + return (int) getCollisionRadius();
- + }
- public final double getCollisionHeight()
- {
- return _collisionHeight;
- }
- }
- \ No newline at end of file
- diff --git java/net/sf/l2j/gameserver/network/serverpackets/CharInfo.java
- index abf60a1..1bf77c3 100644
- --- java/net/sf/l2j/gameserver/network/serverpackets/CharInfo.java
- +++ java/net/sf/l2j/gameserver/network/serverpackets/CharInfo.java
- @@ -3,40 +3,41 @@
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
- package net.sf.l2j.gameserver.network.serverpackets;
- import net.sf.l2j.Config;
- import net.sf.l2j.gameserver.datatables.NpcTable;
- import net.sf.l2j.gameserver.instancemanager.CursedWeaponsManager;
- import net.sf.l2j.gameserver.model.L2Party;
- import net.sf.l2j.gameserver.model.Location;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- +import net.sf.l2j.gameserver.model.actor.template.NpcTemplate.Race;
- import net.sf.l2j.gameserver.model.itemcontainer.Inventory;
- import net.sf.l2j.gameserver.model.zone.ZoneId;
- import net.sf.l2j.gameserver.skills.AbnormalEffect;
- import Dev.Event.CTF.CTF;
- import Dev.Event.TvT.TvT;
- import Dev.Event.TvTFortress.FOSConfig;
- import Dev.Event.TvTFortress.FOSEvent;
- public class CharInfo extends L2GameServerPacket
- {
- private final L2PcInstance _activeChar;
- private final Inventory _inv;
- public CharInfo(L2PcInstance cha)
- {
- _activeChar = cha;
- _inv = _activeChar.getInventory();
- }
- @@ -238,42 +239,50 @@
- int _walkSpd = _activeChar.getStat().getBaseWalkSpeed();
- int _swimSpd = _activeChar.getStat().getBaseSwimSpeed();
- writeD(_runSpd); // base run speed
- writeD(_walkSpd); // base walk speed
- writeD(_swimSpd); // swim run speed
- writeD(_swimSpd); // swim walk speed
- writeD(_runSpd);
- writeD(_walkSpd);
- writeD(_activeChar.isFlying() ? _runSpd : 0); // fly run speed
- writeD(_activeChar.isFlying() ? _walkSpd : 0); // fly walk speed
- writeF(_activeChar.getStat().getMovementSpeedMultiplier()); // run speed multiplier
- writeF(_activeChar.getStat().getAttackSpeedMultiplier()); // attack speed multiplier
- if (_activeChar.getMountType() != 0)
- {
- writeF(NpcTable.getInstance().getTemplate(_activeChar.getMountNpcId()).getCollisionRadius());
- writeF(NpcTable.getInstance().getTemplate(_activeChar.getMountNpcId()).getCollisionHeight());
- }
- else
- {
- - writeF(_activeChar.getCollisionRadius());
- - writeF(_activeChar.getCollisionHeight());
- + if(Config.ENABLE_DWARF_WEAPON_SIZE)
- + {
- + writeF(_activeChar.getBaseTemplate().getCollisionRadius(_activeChar.getBaseTemplate().getRace()));
- + writeF(_activeChar.getBaseTemplate().getCollisionHeight());
- + }
- + else
- + {
- + writeF(_activeChar.getCollisionRadius());
- + writeF(_activeChar.getCollisionHeight());
- + }
- }
- writeD(_activeChar.getAppearance().getHairStyle());
- writeD(_activeChar.getAppearance().getHairColor());
- writeD(_activeChar.getAppearance().getFace());
- if (gmSeeInvis)
- {
- writeS("Invisible");
- }
- else if(_activeChar.isInsideZone(ZoneId.PVP_CUSTOM) && Config.ENABLE_NAME_TITLE_PVPEVENT)
- {
- writeS(Config.NEW_TITLE_PVPEVENT);
- }
- else if(Config.ENABLE_NEW_TITLE_AUTOFARM && _activeChar.isAutoFarm())
- {
- writeS(Config.NEW_TITLE_AUTOFARM);
- }
- else if (_activeChar.isInDMEvent())
- {
- diff --git java/net/sf/l2j/gameserver/network/serverpackets/UserInfo.java
- index 8c4559f..18eb7d4 100644
- --- java/net/sf/l2j/gameserver/network/serverpackets/UserInfo.java
- +++ java/net/sf/l2j/gameserver/network/serverpackets/UserInfo.java
- @@ -253,42 +253,50 @@
- int _swimSpd = _activeChar.getStat().getBaseSwimSpeed();
- writeD(_runSpd); // base run speed
- writeD(_walkSpd); // base walk speed
- writeD(_swimSpd); // swim run speed
- writeD(_swimSpd); // swim walk speed
- writeD(0);
- writeD(0);
- writeD(_activeChar.isFlying() ? _runSpd : 0); // fly run speed
- writeD(_activeChar.isFlying() ? _walkSpd : 0); // fly walk speed
- writeF(_activeChar.getStat().getMovementSpeedMultiplier()); // run speed multiplier
- writeF(_activeChar.getStat().getAttackSpeedMultiplier()); // attack speed multiplier
- L2Summon pet = _activeChar.getPet();
- if (_activeChar.getMountType() != 0 && pet != null)
- {
- writeF(pet.getCollisionRadius());
- writeF(pet.getCollisionHeight());
- }
- else
- {
- - writeF(_activeChar.getCollisionRadius());
- - writeF(_activeChar.getCollisionHeight());
- + if(Config.ENABLE_DWARF_WEAPON_SIZE)
- + {
- + writeF(_activeChar.getBaseTemplate().getCollisionRadius(_activeChar.getBaseTemplate().getRace()));
- + writeF(_activeChar.getBaseTemplate().getCollisionHeight());
- + }
- + else
- + {
- + writeF(_activeChar.getCollisionRadius());
- + writeF(_activeChar.getCollisionHeight());
- + }
- }
- writeD(_activeChar.getAppearance().getHairStyle());
- writeD(_activeChar.getAppearance().getHairColor());
- writeD(_activeChar.getAppearance().getFace());
- writeD(_activeChar.isGM() ? 1 : 0); // builder level
- //writeS((_activeChar.getPolyType() != PolyType.DEFAULT) ? "Morphed" : _activeChar.getTitle());
- if (_activeChar.isInDMEvent())
- {
- writeS("Kills: " + _activeChar.getDMPointScore());
- }
- else if (_activeChar.isInFOSEvent())
- {
- byte playerTeamId = FOSEvent.getParticipantTeamId(_activeChar.getObjectId());
- if (playerTeamId == 0)
- writeS("Score: " + _activeChar.getFOSPointScore());
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement