Jump to content

Recommended Posts

Posted

Since i started to practice with XML parsing heres my 1st try its tested and working fine on Gracia CT2.4.

 

### Eclipse Workspace Patch 1.0
#P L2J-DataPack
Index: data/CustomColor.xml
===================================================================
--- data/CustomColor.xml	(revision 0)
+++ data/CustomColor.xml	(revision 0)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list>
+	<PvPColorList pvpCount = "1" pvpColorId = "FFFFFF" />
+	<PvPColorList pvpCount = "1000" pvpColorId = "FF9933" />
+	<PkColorList pkCount = "1" pkColorId = "FFFF77" />
+	<PkColorList pkCount = "1000" pkColorId = "FF9933" />
+</list>
\ No newline at end of file
#P L2J-GameServer
Index: java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java	(revision 228)
+++ java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java	(working copy)
@@ -26,6 +26,7 @@
import com.l2jserver.gameserver.communitybbs.Manager.RegionBBSManager;
import com.l2jserver.gameserver.datatables.AdminCommandAccessRights;
import com.l2jserver.gameserver.datatables.CharSchemesTable;
+import com.l2jserver.gameserver.datatables.CustomColorTable;
import com.l2jserver.gameserver.datatables.CustomSkillTable;
import com.l2jserver.gameserver.datatables.GMSkillTable;
import com.l2jserver.gameserver.datatables.GmListTable;
@@ -190,16 +191,17 @@
				GMSkillTable.getInstance().addSkills(activeChar);
		}

-		/*if(activeChar.getPvpKills() > 0) 
+		if (activeChar.getPvpKills() > 0)
		{
-			int nameColor = Integer.decode("0x" + ColorNameManager.getInstance().getColor(activeChar.getPvpKills(), true));
-			activeChar.getAppearance().setNameColor(nameColor);
+			int pvpColor = Integer.decode("0x" + CustomColorTable.getCustomPvpColor(activeChar.getPvpKills()));
+			activeChar.getAppearance().setNameColor(pvpColor);
		}
-		if(activeChar.getPkKills() > 0) 
+		
+		if (activeChar.getPkKills() > 0)
		{
-			int nameColor = Integer.decode("0x" + ColorNameManager.getInstance().getColor(activeChar.getPkKills(), false));
-			activeChar.getAppearance().setTitleColor(nameColor);
-		}*/
+			int pkColor = Integer.decode("0x" + CustomColorTable.getCustomPvpColor(activeChar.getPkKills()));
+			activeChar.getAppearance().setTitleColor(pkColor);
+		}

		if (Config.CUSTOM_SKILL_TABLE_ENABLED)
			if (activeChar.getPvpKills() >= Config.PVP_SKILL_REWARD)
Index: java/com/l2jserver/gameserver/datatables/CustomColorTable.java
===================================================================
--- java/com/l2jserver/gameserver/datatables/CustomColorTable.java	(revision 0)
+++ java/com/l2jserver/gameserver/datatables/CustomColorTable.java	(revision 0)
@@ -0,0 +1,172 @@
+/*
+ * 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 com.l2jserver.gameserver.datatables;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import javolution.util.FastMap;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.Config;
+
+/**
+ * @author Intrepid
+ *
+ */
+public class CustomColorTable
+{
+	private static final Logger _log = Logger.getLogger(CustomColorTable.class.getName());
+	private static FastMap<Integer, String> _pvpcolors;
+	private static FastMap<Integer, String> _pkcolors;
+	
+	/**
+	 * 
+	 * @return or initialize new instance
+	 */
+	public static CustomColorTable getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
+	/**
+	 * Read XML data from CustomColor.xml
+	 */
+	private CustomColorTable()
+	{
+		_pvpcolors = new FastMap<Integer, String>();
+		_pkcolors = new FastMap<Integer, String>();
+		
+		File colorFile = new File(Config.DATAPACK_ROOT, "data/CustomColor.xml");
+		Document doc = null;
+		try
+		{
+			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+			dbf.setIgnoringComments(true);
+			dbf.setValidating(false);
+			DocumentBuilder db = dbf.newDocumentBuilder();
+			doc = db.parse(colorFile);
+			
+			for (Node root = doc.getFirstChild(); root != null; root = root.getNextSibling())
+			{
+				if ("list".equalsIgnoreCase(root.getNodeName()))
+				{
+					for (Node child = root.getFirstChild(); child != null; child = child.getNextSibling())
+					{
+						if ("PvPColorList".equalsIgnoreCase(child.getNodeName()))
+						{
+							int pvpCount;
+							String pvpcolorId;
+							Node attr;
+							NamedNodeMap attrs = child.getAttributes();
+							
+							attr = attrs.getNamedItem("pvpCount");
+							if (attr == null)
+							{
+								_log.warning("CustomColorTable: missing pvpCount!");
+								continue;
+							}
+							pvpCount = Integer.parseInt(attr.getNodeValue());
+							
+							pvpcolorId = attrs.getNamedItem("pvpColorId").getNodeValue();
+							
+							_pvpcolors.put(pvpCount, pvpcolorId);
+							_log.info("Loaded: " + _pvpcolors.size() + " pvp color ");
+						}
+						if ("PkColorList".equalsIgnoreCase(child.getNodeName()))
+						{
+							int pkCount;
+							String pkcolorId;
+							Node attr;
+							NamedNodeMap attrs = child.getAttributes();
+							
+							attr = attrs.getNamedItem("pkCount");
+							if (attr == null)
+							{
+								_log.warning("CustomColorTable: missing pkCount!");
+								continue;
+							}
+							pkCount = Integer.parseInt(attr.getNodeValue());
+							
+							pkcolorId = attrs.getNamedItem("pkColorId").getNodeValue();
+							
+							_pkcolors.put(pkCount, pkcolorId);
+							_log.info("Loaded: " + _pkcolors.size() + " pk color ");
+						}
+					}
+				}
+			}
+		}
+		catch(IOException ioe)
+		{
+			_log.log(Level.WARNING,"Cannot find the file: " + colorFile + "on place:" + colorFile.getAbsolutePath(), ioe);
+		}
+		catch (Exception e)
+		{
+			_log.log(Level.WARNING,"Error occured while parsing: " + colorFile, e);
+		}
+	}
+	
+	/**
+	 * 
+	 * @param pvpColor
+	 * @return
+	 */
+	public static String getCustomPvpColor(int pvpkill)
+	{
+		return _pvpcolors.get(getValueBefore(pvpkill, _pvpcolors.keySet()));
+	}
+	
+	/**
+	 * 
+	 * @param pkColor
+	 * @return
+	 */
+	public static String getCustomPkColor(int pkkill)
+	{
+		return _pkcolors.get(getValueBefore(pkkill, _pkcolors.keySet()));
+	}
+	
+	/**
+	 * Will return the value just before the given value contained
+	 * in the provided Set of integers
+	 * @param value
+	 * @param set
+	 * @return the value just before the provided one
+	 */
+	private static int getValueBefore(int value, Set<Integer> set)
+	{
+		int counter = 0;
+		for(int i : set)
+			if(i > counter && value > i)
+				counter = i;
+		return counter;
+	}
+	
+	@SuppressWarnings("synthetic-access")
+	private static class SingletonHolder
+	{
+		protected static final CustomColorTable _instance = new CustomColorTable();
+	}
+}
Index: java/com/l2jserver/gameserver/GameServer.java
===================================================================
--- java/com/l2jserver/gameserver/GameServer.java	(revision 228)
+++ java/com/l2jserver/gameserver/GameServer.java	(working copy)
@@ -45,6 +45,7 @@
import com.l2jserver.gameserver.datatables.CharSchemesTable;
import com.l2jserver.gameserver.datatables.CharTemplateTable;
import com.l2jserver.gameserver.datatables.ClanTable;
+import com.l2jserver.gameserver.datatables.CustomColorTable;
import com.l2jserver.gameserver.datatables.CustomSkillTable;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.datatables.EnchantGroupsTable;
@@ -430,6 +431,7 @@
		}
		if (Config.CUSTOM_SKILL_TABLE_ENABLED)
			CustomSkillTable.getInstance();
+		CustomColorTable.getInstance();
		HideAndSeekDataParser.getData();
		if ((Config.OFFLINE_TRADE_ENABLE || Config.OFFLINE_CRAFT_ENABLE) && Config.RESTORE_OFFLINERS)
			OfflineTradersTable.restoreOfflineTraders();

 

In the XML file 1 is necessary to use! Color updated on enterworld.

 

Credits to me(and B1ggBoss's share for the getValueBefore method)

  • 4 months later...

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.



  • Posts

    • Where I can buy a cheap domain .com? cheapest I found was on Godaddy for 12 euro and Hostinger for 10 euro.
    • Hello everyone, here's a simple and useful idea for any type of server.   This code applies a discount when a player makes a purchase inside a clan’s castle or clan hall, offering a benefit to clan members who own a castle or clan hall. Important: Merchant transactions must be handled through multisell, not buylist. The discount is directly applied within the multisell, so the price shown is already reduced.   "For example, if a scroll costs 1000 Adena and you set a 20% discount in the config, the final price when purchasing inside a castle or clan hall will be 800 Adena."   This code is developed on the public aCis 401 revision.   public static int CLAN_BASE_OWNERSHIP_MERCHANT_DISCOUNT; CLAN_BASE_OWNERSHIP_MERCHANT_DISCOUNT = clans.getProperty("ClanBaseOwnershipMechantDiscount", 20); # If clan owns a clan hall or castle, all members have a discount of X% at merchant transactions (multisell). # Discount applies only inside the base (castle or clan hall). ClanBaseOwnershipMechantDiscount = 20   /** diff --git a/aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/MultisellData.java b/aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/MultisellData.java index 556e111..bbf8e69 100644 --- a/aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/MultisellData.java +++ b/aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/MultisellData.java @@ -101,7 +101,7 @@ do { // send list at least once even if size = 0 - player.sendPacket(new MultiSellList(list, index)); + player.sendPacket(new MultiSellList(list, index, player)); index += PAGE_SIZE; } while (index < list.getEntries().size()); diff --git a/aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/MultiSellChoose.java b/aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/MultiSellChoose.java index 7c82c5b..1654abc 100644 --- a/aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/MultiSellChoose.java +++ b/aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/MultiSellChoose.java @@ -6,6 +6,7 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.enums.FloodProtector; import net.sf.l2j.gameserver.enums.StatusType; +import net.sf.l2j.gameserver.enums.ZoneId; import net.sf.l2j.gameserver.enums.items.CrystalType; import net.sf.l2j.gameserver.model.Augmentation; import net.sf.l2j.gameserver.model.actor.Player; @@ -225,6 +226,20 @@ return; } + if (player.isInsideZone(ZoneId.CLAN_HALL) && player.getClan() != null && player.getClan().hasClanHall()) + { + e.setItemCount(e.getItemCount() * (100 - Config.CLAN_BASE_OWNERSHIP_MERCHANT_DISCOUNT) / 100); + if (e.getItemCount() == 0) + e.setItemCount(1); + } + + if (player.isInsideZone(ZoneId.CASTLE) && player.getClan() != null && player.getClan().hasCastle()) + { + e.setItemCount(e.getItemCount() * (100 - Config.CLAN_BASE_OWNERSHIP_MERCHANT_DISCOUNT) / 100); + if (e.getItemCount() == 0) + e.setItemCount(1); + } + if (Config.BLACKSMITH_USE_RECIPES || !e.getMaintainIngredient()) { // if it's a stackable item, just reduce the amount from the first (only) instance that is found in the inventory diff --git a/aCis_gameserver/java/net/sf/l2j/gameserver/network/serverpackets/MultiSellList.java b/aCis_gameserver/java/net/sf/l2j/gameserver/network/serverpackets/MultiSellList.java index 9269b06..c6102a0 100644 --- a/aCis_gameserver/java/net/sf/l2j/gameserver/network/serverpackets/MultiSellList.java +++ b/aCis_gameserver/java/net/sf/l2j/gameserver/network/serverpackets/MultiSellList.java @@ -2,6 +2,9 @@ import static net.sf.l2j.gameserver.data.xml.MultisellData.PAGE_SIZE; +import net.sf.l2j.Config; +import net.sf.l2j.gameserver.enums.ZoneId; +import net.sf.l2j.gameserver.model.actor.Player; import net.sf.l2j.gameserver.model.multisell.Entry; import net.sf.l2j.gameserver.model.multisell.Ingredient; import net.sf.l2j.gameserver.model.multisell.ListContainer; @@ -15,7 +18,9 @@ private boolean _finished; - public MultiSellList(ListContainer list, int index) + private Player _player; + + public MultiSellList(ListContainer list, int index, Player player) { _list = list; _index = index; @@ -28,6 +33,8 @@ } else _finished = true; + + _player = player; } @Override @@ -74,7 +81,14 @@ { writeH(ing.getItemId()); writeH(ing.getTemplate() != null ? ing.getTemplate().getType2() : 65535); - writeD(ing.getItemCount()); + + if (_player.isInsideZone(ZoneId.CLAN_HALL) && _player.getClan() != null && _player.getClan().hasClanHall()) + writeD((ing.getItemCount() * (100 - Config.CLAN_BASE_OWNERSHIP_MERCHANT_DISCOUNT) / 100) < 1 ? 1 : ing.getItemCount() * 80 / 100); + else if (_player.isInsideZone(ZoneId.CASTLE) && _player.getClan() != null && _player.getClan().hasCastle()) + writeD((ing.getItemCount() * (100 - Config.CLAN_BASE_OWNERSHIP_MERCHANT_DISCOUNT) / 100) < 1 ? 1 : ing.getItemCount() * 80 / 100); + else + writeD(ing.getItemCount()); + writeH(ing.getEnchantLevel()); writeD(0x00); // TODO: i.getAugmentId() writeD(0x00); // TODO: i.getManaLeft()  
    • DISCORD : utchiha_market telegram : https://t.me/utchiha_market SELLIX STORE : https://utchihamkt.mysellix.io/ Join our server for more products : https://discord.gg/uthciha-services https://campsite.bio/utchihaamkt
    • WTB EXP ETERNAL 10x new dm.
    • This project is based on the latest public aCis sources (revision 401) and supports a multi-client system (C4 & IL), making it suitable for custom usage but not for retail.   You can configure the SelectedClient option in server.properties and loginserver.properties to switch between C4 and IL.  Both clients are fully synchronized, including login, server selection, packets, and geodata.   Notable Features: - Completed the login and server selection phase for both clients. - Synchronized all packets to support both clients (including some specific features). - Reworked the datapack and SQL files (excluding HTML files) to work seamlessly with both clients. - Added geodata support for both clients. - Adapted nearly all AI, scripts, bosses, HTML, and MULTISELL files to match C4 functionality. - Reduced the maximum clan level from 8 to 5 (C4 feature). - Rewrote clan HTML to remove C5-C6 features.   Disabled the following C5 and C6 features: - Divine Inspiration (C6 feature). - Clan skills and clan reputation points (C5 feature). - Pledge class (C5 feature). - Hero skills (C5 feature). - Dueling system (C6 feature). - Augmentations (C6 feature). - Cursed weapons (C5-C6 feature).   General Improvements: - Performed a general HTML cleanup and optimized features based on the client version. - Added an option to display the remaining time of disabled skills. - Skill timestamps now update when using the skill list.   This flexibility allows you to create a unique progression system tailored to your needs. The price for the diff patch, which can be applied to aCis public sources, is €150. For inquiries, please contact me via PM or Discord (ID: @Luminous).
  • Topics

×
×
  • Create New...