Core support for [DP6959].

L2_GameServer/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -80,7 +80,7 @@ public class NpcTable
 								"title", "serverSideTitle", "class", "collision_radius", "collision_height", "level", "sex", "type",
 								"attackrange", "hp", "mp", "hpreg", "mpreg", "str", "con", "dex", "int", "wit", "men", "exp", "sp", "patk",
 								"pdef", "matk", "mdef", "atkspd", "aggro", "matkspd", "rhand", "lhand", "armor", "enchant", "walkspd", "runspd",
-								"faction_id", "faction_range", "isUndead", "absorb_level", "absorb_type", "soulshot_count", "spiritshot_count", "ss_rate", "AI",
+								"faction_id", "faction_range", "isUndead", "absorb_level", "absorb_type", "AI",
 								"drop_herbs" }) + " FROM npc");
 				ResultSet npcdata = statement.executeQuery();
 				
@@ -103,8 +103,8 @@ public class NpcTable
 									"title", "serverSideTitle", "class", "collision_radius", "collision_height", "level", "sex", "type",
 									"attackrange", "hp", "mp", "hpreg", "mpreg", "str", "con", "dex", "int", "wit", "men", "exp", "sp",
 									"patk", "pdef", "matk", "mdef", "atkspd", "aggro", "matkspd", "rhand", "lhand", "armor", "enchant", "walkspd",
-									"runspd", "faction_id", "faction_range", "isUndead", "absorb_level", "absorb_type", "soulshot_count", "spiritshot_count",
-									"ss_rate", "AI", "drop_herbs" }) + " FROM custom_npc");
+									"runspd", "faction_id", "faction_range", "isUndead", "absorb_level", "absorb_type", "AI",
+									"drop_herbs" }) + " FROM custom_npc");
 					ResultSet npcdata = statement.executeQuery();
 					
 					fillNpcTable(npcdata, true);
@@ -443,10 +443,6 @@ public class NpcTable
 			npcDat.set("absorb_level", NpcData.getString("absorb_level"));
 			npcDat.set("absorb_type", NpcData.getString("absorb_type"));
 			
-			npcDat.set("soulshot_count", NpcData.getInt("soulshot_count"));
-			npcDat.set("spiritshot_count", NpcData.getInt("spiritshot_count"));
-			npcDat.set("ssRate", NpcData.getInt("ss_rate"));
-			
 			npcDat.set("AI", NpcData.getString("AI"));
 			
 			npcDat.set("drop_herbs", Boolean.valueOf(NpcData.getString("drop_herbs")));
@@ -502,7 +498,7 @@ public class NpcTable
 							"serverSideTitle", "class", "collision_radius", "collision_height", "level", "sex", "type", "attackrange",
 							"hp", "mp", "hpreg", "mpreg", "str", "con", "dex", "int", "wit", "men", "exp", "sp", "patk", "pdef", "matk",
 							"mdef", "atkspd", "aggro", "matkspd", "rhand", "lhand", "armor", "enchant", "walkspd", "runspd", "faction_id",
-							"faction_range", "isUndead", "absorb_level", "absorb_type", "soulshot_count", "spiritshot_count", "ss_rate", "AI", "drop_herbs" })
+							"faction_range", "isUndead", "absorb_level", "absorb_type", "AI", "drop_herbs" })
 					+ " FROM npc WHERE id=?");
 			st.setInt(1, id);
 			ResultSet rs = st.executeQuery();
@@ -514,7 +510,7 @@ public class NpcTable
 								"title", "serverSideTitle", "class", "collision_radius", "collision_height", "level", "sex", "type",
 								"attackrange", "hp", "mp", "hpreg", "mpreg", "str", "con", "dex", "int", "wit", "men", "exp", "sp", "patk",
 								"pdef", "matk", "mdef", "atkspd", "aggro", "matkspd", "rhand", "lhand", "armor", "enchant", "walkspd", "runspd",
-								"faction_id", "faction_range", "isUndead", "absorb_level", "absorb_type", "soulshot_count", "spiritshot_count", "ss_rate", "AI",
+								"faction_id", "faction_range", "isUndead", "absorb_level", "absorb_type", "AI",
 								"drop_herbs" }) + " FROM custom_npc WHERE id=?");
 				st.setInt(1, id);
 				rs = st.executeQuery();

L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -357,15 +357,15 @@ public abstract class L2Summon extends L2Playable
 
     public short getSoulShotsPerHit()
     {
-    	if (getTemplate().soulShotCount > 0)
-    		return getTemplate().soulShotCount;
+    	if (getTemplate().getAIDataStatic().getSoulShot() > 0)
+    		return (short) getTemplate().getAIDataStatic().getSoulShot();
     	else return 1;
     }
 
     public short getSpiritShotsPerHit()
     {
-    	if (getTemplate().spiritShotCount > 0)
-    		return getTemplate().spiritShotCount;
+    	if (getTemplate().getAIDataStatic().getSpiritShot() > 0)
+    		return (short) getTemplate().getAIDataStatic().getSpiritShot();
     	else return 1;
     }
 

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/ExGetOnAirShip.java

@@ -55,7 +55,7 @@ public class ExGetOnAirShip extends L2GameClientPacket
     @Override
     public String getType()
     {
-        return "[C] 0xD0:0x35 ExGetOnAirShip";
+        return "[C] 0xD0:0x36 ExGetOnAirShip";
     }
 
 }

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java

@@ -31,7 +31,7 @@ import com.l2jserver.util.Rnd;
 
 public class RequestExEnchantItemAttribute extends L2GameClientPacket
 {
-	private static final String D0_38_REQUEST_EX_ENCHANT_ITEM_ATTRIBUTE = "[C] D0 38 RequestExEnchantItemAttribute";
+	private static final String D0_35_REQUEST_EX_ENCHANT_ITEM_ATTRIBUTE = "[C] D0:35 RequestExEnchantItemAttribute";
 
 	private int _objectId;
 
@@ -366,6 +366,6 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return D0_38_REQUEST_EX_ENCHANT_ITEM_ATTRIBUTE;
+		return D0_35_REQUEST_EX_ENCHANT_ITEM_ATTRIBUTE;
 	}
 }

L2_GameServer/java/com/l2jserver/gameserver/templates/chars/L2NpcTemplate.java

@@ -73,9 +73,6 @@ public final class L2NpcTemplate extends L2CharTemplate
 	public final int factionRange;
 	public final int absorbLevel;
 	public final AbsorbCrystalType absorbType;
-	public final short soulShotCount;
-	public final short spiritShotCount;
-	public final short ssRate;
 	public Race race;
 	public final String jClass;
 	public final AIType AI;
@@ -227,9 +224,6 @@ public final class L2NpcTemplate extends L2CharTemplate
 		factionRange = set.getInteger("factionRange");
 		absorbLevel = set.getInteger("absorb_level", 0);
 		absorbType = AbsorbCrystalType.valueOf(set.getString("absorb_type"));
-		soulShotCount = (short) set.getInteger("soulshot_count", 0);
-		spiritShotCount = (short) set.getInteger("spiritshot_count", 0);
-		ssRate = (short) set.getInteger("ssRate", 0);
 		race = null;
 		dropherb = set.getBool("drop_herbs", false);
 		//_npcStatsSet = set;