[Share]SoulShots

[Kup9_RU]

Index: /trunk/datapack_development/data/scripts/handlers/itemhandlers/SoulShots.java
===================================================================
--- /trunk/datapack_development/data/scripts/handlers/itemhandlers/SoulShots.java (revision 714)
+++ /trunk/datapack_development/data/scripts/handlers/itemhandlers/SoulShots.java (revision 819)
@@ -26,4 +26,5 @@
import ru.l2open.gameserver.templates.item.L2Weapon;
import ru.l2open.gameserver.util.Broadcast;
+import ru.l2open.Config;

/**
@@ -110,5 +111,7 @@
			int SSCount = saSSCount == 0 ? weaponItem.getSoulShotCount() : saSSCount;

-			if (!activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), SSCount, null, false))
+			if (Config.CONSUME_SPIRIT_SOUL_SHOTS &&
+					!activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), SSCount, null, false))
+
			{
				if (!activeChar.disableAutoShot(itemId))
Index: /trunk/datapack_development/data/scripts/handlers/itemhandlers/SpiritShot.java
===================================================================
--- /trunk/datapack_development/data/scripts/handlers/itemhandlers/SpiritShot.java (revision 714)
+++ /trunk/datapack_development/data/scripts/handlers/itemhandlers/SpiritShot.java (revision 819)
@@ -25,4 +25,5 @@
import ru.l2open.gameserver.templates.item.L2Weapon;
import ru.l2open.gameserver.util.Broadcast;
+import ru.l2open.Config;

/**
@@ -103,5 +104,7 @@

		// Consume Spirit shot if player has enough of them
-		if (!activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), weaponItem.getSpiritShotCount(), null, false))
+			if (Config.CONSUME_SPIRIT_SOUL_SHOTS &&
+				!activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), weaponItem.getSpiritShotCount(), null, false))
+
		{
			if (!activeChar.disableAutoShot(itemId))
Index: /trunk/datapack_development/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
===================================================================
--- /trunk/datapack_development/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java (revision 714)
+++ /trunk/datapack_development/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java (revision 819)
@@ -25,4 +25,5 @@
import ru.l2open.gameserver.templates.item.L2Weapon;
import ru.l2open.gameserver.util.Broadcast;
+import ru.l2open.Config;

/**
@@ -105,5 +106,7 @@

		// Consume Blessed SpiritShot if player has enough of them
-		if (!activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), weaponItem.getSpiritShotCount(), null, false))
+			if (Config.CONSUME_SPIRIT_SOUL_SHOTS &&
+				!activeChar.destroyItemWithoutTrace("Consume", item.getObjectId(), weaponItem.getSpiritShotCount(), null, false))
+
		{
			if (!activeChar.disableAutoShot(itemId))
Index: /trunk/L2_GameServer/java/config/l2open.properties
===================================================================
--- /trunk/L2_GameServer/java/config/l2open.properties (revision 806)
+++ /trunk/L2_GameServer/java/config/l2open.properties (revision 819)
@@ -38,2 +38,8 @@
# По умолчанию: False
OfflineRestore = False
+
+# Бесконечные соски (Soulshots, Blessed- и Spiritshots)
+# Если False, соски не будут тратиться при атаке или касте.
+# По умолчанию: True (тратятся)
+ConsumeSpiritSoulShots = True
+
Index: /trunk/L2_GameServer/java/ru/l2open/Config.java
===================================================================
--- /trunk/L2_GameServer/java/ru/l2open/Config.java (revision 810)
+++ /trunk/L2_GameServer/java/ru/l2open/Config.java (revision 819)
@@ -82,4 +82,5 @@
	public static int           SPAWN_Z;
	public static boolean OFFLINE_RESTORE;
+	public static boolean CONSUME_SPIRIT_SOUL_SHOTS;

	//--------------------------------------------------
@@ -2504,4 +2505,5 @@
					COUNT_ENCHANT = Integer.parseInt(l2open.getProperty("BreakEnchant", "0"));
					OFFLINE_RESTORE = Boolean.parseBoolean(l2open.getProperty("OfflineRestore", "false"));
+					CONSUME_SPIRIT_SOUL_SHOTS = Boolean.parseBoolean(l2open.getProperty("ConsumeSpiritSoulShots", "true"));

				}

 

Changing imports, fully tested on L2j Epilogue

[Setekh]

please specify whats this supposed to be?

charges never empty?

[xAddytzu]

please specify whats this supposed to be?

charges never empty?

+ConsumeSpiritSoulShots = True

[VelvetValour]

+ConsumeSpiritSoulShots = True

some people wont understand it :P even tho its so obvious.

[Matim]

Something like that was already shared i guess.

[Coyote™]

Something like that was already shared i guess.

 

Yes, and it also was better written.

Locked.