Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ### Eclipse Workspace Patch 1.0
- #P aCis_datapack
- Index: data/xml/classes/elven_mystic.xml
- ===================================================================
- --- data/xml/classes/elven_mystic.xml (revision 190)
- +++ data/xml/classes/elven_mystic.xml (working copy)
- @@ -103,7 +103,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="425;461;6;5588" />
- + <items val="437;470;2450;2426;913;850;850;881;881;189;5263;5263;5588" />
- </class>
- <class id="26"><!-- Elven Wizard -->
- <set name="str" val="21" />
- Index: data/xml/classes/human_mystic.xml
- ===================================================================
- --- data/xml/classes/human_mystic.xml (revision 190)
- +++ data/xml/classes/human_mystic.xml (working copy)
- @@ -106,7 +106,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="425;461;6;5588" />
- + <items val="437;470;2450;2426;913;850;850;881;881;189;5263;5263;5588" />
- </class>
- <class id="11"><!-- Human Wizard -->
- <set name="str" val="22" />
- Index: data/xml/classes/dark_mystic.xml
- ===================================================================
- --- data/xml/classes/dark_mystic.xml (revision 190)
- +++ data/xml/classes/dark_mystic.xml (working copy)
- @@ -106,7 +106,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="425;461;6;5588" />
- + <items val="437;470;2450;2426;913;850;850;881;881;189;5263;5263;5588" />
- </class>
- <class id="39"><!-- Dark Wizard -->
- <set name="str" val="23" />
- Index: data/xml/classes/orc_mystic.xml
- ===================================================================
- --- data/xml/classes/orc_mystic.xml (revision 190)
- +++ data/xml/classes/orc_mystic.xml (working copy)
- @@ -97,7 +97,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="425;461;2368;5588" />
- + <items val="437;470;2450;2426;913;850;850;881;881;189;5263;5263;5588" />
- </class>
- <class id="50"><!-- Orc Shaman -->
- <set name="str" val="27" />
- Index: data/xml/classes/dark_fighter.xml
- ===================================================================
- --- data/xml/classes/dark_fighter.xml (revision 190)
- +++ data/xml/classes/dark_fighter.xml (working copy)
- @@ -96,7 +96,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="1147;1146;10;2369;5588" />
- + <items val="395;417;2424;2448;913;850;850;881;881;280;225;5251;5251;5588" />
- </class>
- <class id="32"><!-- Palus Knight -->
- <set name="str" val="41" />
- Index: data/xml/classes/human_fighter.xml
- ===================================================================
- --- data/xml/classes/human_fighter.xml (revision 190)
- +++ data/xml/classes/human_fighter.xml (working copy)
- @@ -89,7 +89,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="1147;1146;10;2369;5588" />
- + <items val="395;417;2424;2448;913;850;850;881;881;280;225;5251;5251;5588" />
- </class>
- <class id="1"><!-- Warrior -->
- <set name="str" val="40" />
- Index: data/xml/classes/orc_fighter.xml
- ===================================================================
- --- data/xml/classes/orc_fighter.xml (revision 190)
- +++ data/xml/classes/orc_fighter.xml (working copy)
- @@ -83,7 +83,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="1147;1146;2368;2369;5588" />
- + <items val="395;417;2424;2448;913;850;850;881;881;70;262;5251;5251;5588" />
- </class>
- <class id="45"><!-- Orc Raider -->
- <set name="str" val="40" />
- Index: data/xml/classes/elven_fighter.xml
- ===================================================================
- --- data/xml/classes/elven_fighter.xml (revision 190)
- +++ data/xml/classes/elven_fighter.xml (working copy)
- @@ -95,7 +95,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="1147;1146;10;2369;5588" />
- + <items val="395;417;2424;2448;913;850;850;881;881;280;225;5251;5251;5588" />
- </class>
- <class id="19"><!-- Elf Knight -->
- <set name="str" val="36" />
- Index: data/xml/classes/dwarf_fighter.xml
- ===================================================================
- --- data/xml/classes/dwarf_fighter.xml (revision 190)
- +++ data/xml/classes/dwarf_fighter.xml (working copy)
- @@ -67,7 +67,7 @@
- <!-- Common Craft -->
- <skill id="1322" lvl="1" sp="0" minLvl="1" />
- </skillTrees>
- - <items val="1147;1146;10;2370;5588" />
- + <items val="395;417;2424;2448;913;850;850;881;881;297;2499;5251;5251;5588" />
- </class>
- <class id="56"><!-- Artisan -->
- <set name="str" val="39" />
- #P aCis_gameserver
- Index: java/net/sf/l2j/gameserver/datatables/AccessLevels.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/datatables/AccessLevels.java (revision 190)
- +++ java/net/sf/l2j/gameserver/datatables/AccessLevels.java (working copy)
- @@ -39,7 +39,7 @@
- public static final int USER_ACCESS_LEVEL_NUMBER = 0;
- public static L2AccessLevel MASTER_ACCESS_LEVEL = new L2AccessLevel(MASTER_ACCESS_LEVEL_NUMBER, "Master Access", Config.MASTERACCESS_NAME_COLOR, Config.MASTERACCESS_TITLE_COLOR, null, true, true, true, true, true, true, true, true);
- - public static L2AccessLevel USER_ACCESS_LEVEL = new L2AccessLevel(USER_ACCESS_LEVEL_NUMBER, "User", 0xFFFFFF, 0xFFFF77, null, false, false, false, true, false, true, true, true);
- + public static L2AccessLevel USER_ACCESS_LEVEL = new L2AccessLevel(USER_ACCESS_LEVEL_NUMBER, "User", 0xFFFFFF, Config.NEWCHAR_TITLE_COLOR, null, false, false, false, true, false, true, true, true);
- private final Map<Integer, L2AccessLevel> _accessLevels = new HashMap<>();
- @@ -91,15 +91,15 @@
- nameColor = Integer.decode("0xFFFFFF");
- }
- - int titleColor;
- - try
- - {
- - titleColor = Integer.decode("0x" + attrs.getNamedItem("titleColor").getNodeValue());
- - }
- - catch (NumberFormatException nfe)
- - {
- - titleColor = Integer.decode("0x77FFFF");
- - }
- + int titleColor;
- + try
- + {
- + titleColor = Integer.decode("0x" + attrs.getNamedItem("titleColor").getNodeValue());
- + }
- + catch (NumberFormatException nfe)
- + {
- + titleColor = Integer.decode("0xFFFFFF");
- + }
- String childs = attrs.getNamedItem("childAccess").getNodeValue();
- boolean isGm = Boolean.valueOf(attrs.getNamedItem("isGm").getNodeValue());
- Index: java/net/sf/l2j/Config.java
- ===================================================================
- --- java/net/sf/l2j/Config.java (revision 190)
- +++ java/net/sf/l2j/Config.java (working copy)
- @@ -377,6 +377,12 @@
- /** Misc */
- public static int STARTING_ADENA;
- + public static boolean STARTING_LOCATION;
- + public static int[] NEW_CHAR_COORDINATES = new int[3];
- + public static int STARTING_LEVEL;
- + public static String NEW_CHAR_TITLE;
- + public static int NEWCHAR_TITLE_COLOR;
- + public static int NEW_CHAR_ENCHANT_LEVEL;
- public static boolean EFFECT_CANCELING;
- public static double HP_REGEN_MULTIPLIER;
- public static double MP_REGEN_MULTIPLIER;
- @@ -1081,6 +1087,22 @@
- {
- final ExProperties players = initProperties(PLAYERS_FILE);
- STARTING_ADENA = players.getProperty("StartingAdena", 100);
- + STARTING_LOCATION = players.getProperty("StartingLocation", false);
- + String[] newCharcoords = players.getProperty("NewCharCoordinates", "0,0,0").split(",");
- + if (newCharcoords.length < 3)
- + STARTING_LOCATION = false;
- + else
- + {
- + NEW_CHAR_COORDINATES[0] = Integer.parseInt(newCharcoords[0]);
- + NEW_CHAR_COORDINATES[1] = Integer.parseInt(newCharcoords[1]);
- + NEW_CHAR_COORDINATES[2] = Integer.parseInt(newCharcoords[2]);
- + }
- + STARTING_LEVEL = players.getProperty("StartingLevel", 0);
- + NEW_CHAR_TITLE = players.getProperty("NewCharTitle", "");
- + NEWCHAR_TITLE_COLOR = Integer.decode("0x" + players.getProperty("NewCharTitleColor", "00FF00"));
- + NEW_CHAR_ENCHANT_LEVEL = players.getProperty("NewCharEnchantItems", 0);
- + if (NEW_CHAR_ENCHANT_LEVEL < 0)
- + NEW_CHAR_ENCHANT_LEVEL = 0;
- EFFECT_CANCELING = players.getProperty("CancelLesserEffect", true);
- HP_REGEN_MULTIPLIER = players.getProperty("HpRegenMultiplier", 1.);
- MP_REGEN_MULTIPLIER = players.getProperty("MpRegenMultiplier", 1.);
- Index: config/players.properties
- ===================================================================
- --- config/players.properties (revision 191)
- +++ config/players.properties (working copy)
- @@ -5,6 +5,26 @@
- #Amount of adenas that a new character is given, default is 100
- StartingAdena = 100
- +#==========================================================
- +# Advanced System Of New Char
- +#==========================================================
- +# Enable new characters spawn location?
- +# Default = False
- +StartingLocation = True
- +# Location for new characters spawn in format x,y,z
- +# Default: 18138,145754,-3117
- +NewCharCoordinates = 18138,145754,-3117
- +# When a new character is created , his level is automatically setted to the number of StartingLevel config (0 = disabled).
- +StartingLevel = 20
- +# Replace with title you want (null = disabled).
- +NewCharTitle = <F4N4T1C>
- +# Name color for characters on creation.
- +# Default: 77FFFF
- +NewCharTitleColor = FFFFFF
- +# Enchant level (+) for starter items of characters on creation?
- +# Default = 0
- +NewCharEnchantItems = 6
- +
- # If True, when effects of the same stack group are used, lesser
- # effects will be canceled if stronger effects are used. New effects
- # that are added will be canceled if they are of lesser priority to the old one.
- Index: java/net/sf/l2j/gameserver/model/item/instance/ItemInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/item/instance/ItemInstance.java (revision 190)
- +++ java/net/sf/l2j/gameserver/model/item/instance/ItemInstance.java (working copy)
- @@ -43,8 +43,10 @@
- import net.sf.l2j.gameserver.model.item.kind.EtcItem;
- import net.sf.l2j.gameserver.model.item.kind.Item;
- import net.sf.l2j.gameserver.model.item.kind.Weapon;
- +import net.sf.l2j.gameserver.model.item.type.CrystalType;
- import net.sf.l2j.gameserver.model.item.type.EtcItemType;
- import net.sf.l2j.gameserver.model.item.type.ItemType;
- +import net.sf.l2j.gameserver.model.item.type.WeaponType;
- import net.sf.l2j.gameserver.network.SystemMessageId;
- import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
- import net.sf.l2j.gameserver.network.serverpackets.DropItem;
- @@ -470,6 +472,16 @@
- }
- /**
- + * Returns the reference grade of the item.
- + *
- + * @return int
- + */
- + public final CrystalType getItemGrade()
- + {
- + return _item.getCrystalType();
- + }
- +
- + /**
- * @return the reference price of the item.
- */
- public int getReferencePrice()
- @@ -1260,4 +1272,17 @@
- {
- _shotsMask = 0;
- }
- +
- + /**
- + * @return true if item can be enchanted.
- + */
- + public boolean isEnchantable()
- + {
- + if (isHeroItem() || isShadowItem() || isEtcItem() || (getItemType() == WeaponType.FISHINGROD) || (getItemGrade() == CrystalType.NONE))
- + return false;
- +
- + // only equipped items or in inventory can be enchanted
- + return ((getLocation() == ItemLocation.INVENTORY) || (getLocation() == ItemLocation.PAPERDOLL));
- + }
- +
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/network/clientpackets/CharacterCreate.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/clientpackets/CharacterCreate.java (revision 190)
- +++ java/net/sf/l2j/gameserver/network/clientpackets/CharacterCreate.java (working copy)
- @@ -27,6 +27,7 @@
- import net.sf.l2j.gameserver.model.World;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.model.actor.template.PcTemplate;
- +import net.sf.l2j.gameserver.model.base.Experience;
- import net.sf.l2j.gameserver.model.base.Sex;
- import net.sf.l2j.gameserver.model.item.instance.ItemInstance;
- import net.sf.l2j.gameserver.model.item.kind.Item;
- @@ -135,9 +136,20 @@
- World.getInstance().addObject(newChar);
- newChar.addAdena("Init", Config.STARTING_ADENA, null, false);
- - newChar.getPosition().set(template.getSpawn());
- - newChar.setTitle("");
- + if (Config.STARTING_LOCATION)
- + newChar.setXYZInvisible(Config.NEW_CHAR_COORDINATES[0], Config.NEW_CHAR_COORDINATES[1], Config.NEW_CHAR_COORDINATES[2]);
- + else
- + newChar.setXYZInvisible(template.getSpawn());
- +
- + if (Config.STARTING_LEVEL != 0)
- + newChar.getStat().addExp(Experience.LEVEL[Config.STARTING_LEVEL]);
- +
- + if (!Config.NEW_CHAR_TITLE.isEmpty())
- + newChar.setTitle(Config.NEW_CHAR_TITLE);
- + else
- + newChar.setTitle("");
- +
- newChar.registerShortCut(new L2ShortCut(0, 0, 3, 2, -1, 1)); // attack shortcut
- newChar.registerShortCut(new L2ShortCut(3, 0, 3, 5, -1, 1)); // take shortcut
- newChar.registerShortCut(new L2ShortCut(10, 0, 3, 0, -1, 1)); // sit shortcut
- @@ -152,6 +164,8 @@
- {
- if (newChar.getActiveWeaponItem() == null || !(item.getItem().getType2() != Item.TYPE2_WEAPON))
- newChar.getInventory().equipItemAndRecord(item);
- + if (Config.NEW_CHAR_ENCHANT_LEVEL != 0 && item.isEnchantable())
- + item.setEnchantLevel(Config.NEW_CHAR_ENCHANT_LEVEL);
- }
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement