MELERIX 13 ani în urmă
părinte
comite
ee5f4254e3

+ 13 - 10
L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml

@@ -1474,20 +1474,23 @@
 		</for>
 	</skill>
 	<skill id="4094" levels="12" name="NPC Cancel Magic">
-		<!-- Freya retail confirmed -->
+		<!-- Confirmed CT2.5 -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<set name="magicLvl" val="#magicLvl" />
-		<set name="target" val="TARGET_ONE" />
-		<set name="hitTime" val="6000" />
-		<set name="skillType" val="CANCEL" />
-		<set name="isMagic" val="true" />
-		<set name="power" val="80" />
-		<set name="operateType" val="OP_ACTIVE" />
+		<table name="#mpConsume"> 10 16 21 28 36 44 52 55 58 60 61 62 </table>
+		<table name="#mpInitialConsume"> 3 4 6 7 9 11 13 14 15 15 16 16 </table>
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
-		<set name="maxNegated" val="1" />
-		<table name="#mpConsume"> 13 20 27 35 45 55 65 69 73 75 77 78 </table>
+		<set name="hitTime" val="6000" />
+		<set name="isMagic" val="true" />
+		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
+		<set name="mpInitialConsume" val="#mpInitialConsume" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="DUMMY" />
+		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="CancelAll" val="0" noicon="1" effectType="CANCEL_ALL" />
+		</for>
 	</skill>
 	<skill id="4095" levels="1" name="Damage Shield">
 		<!-- Freya retail confirmed -->

+ 14 - 8
L2J_DataPack_BETA/dist/game/data/stats/skills/04100-04199.xml

@@ -830,8 +830,11 @@
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 </table>
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="OP_ACTIVE" />
-		<set name="skillType" val="CANCEL_ALL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_ONE" />
+		<for>
+			<effect name="CancelAll" val="0" noicon="1" effectType="CANCEL_ALL" />
+		</for>
 	</skill>
 	<skill id="4148" levels="12" name="Poison">
 		<!-- Confirmed CT2.5 -->
@@ -1377,17 +1380,20 @@
 		<set name="mpConsume" val="#mpConsume" />
 	</skill>
 	<skill id="4177" levels="12" name="BOSS Cancel Magic">
-		<!-- Freya retail confirmed -->
+		<!-- Confirmed CT2.5 -->
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
-		<set name="magicLvl" val="#magicLvl" />
-		<set name="target" val="TARGET_AURA" />
-		<set name="skillRadius" val="200" />
+		<table name="#mpConsume"> 15 22 29 39 49 59 68 72 75 76 77 79 </table>
 		<set name="hitTime" val="1500" />
-		<set name="skillType" val="CANCEL_ALL" />
 		<set name="isMagic" val="true" />
-		<set name="operateType" val="OP_ACTIVE" />
-		<table name="#mpConsume"> 15 22 29 39 49 59 68 72 75 76 77 79 </table>
+		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillRadius" val="200" />
+		<set name="skillType" val="DUMMY" />
+		<set name="target" val="TARGET_AURA" />
+		<for>
+			<effect name="CancelAll" val="0" noicon="1" effectType="CANCEL_ALL" />
+		</for>
 	</skill>
 	<skill id="4178" levels="12" name="BOSS Flame Strike">
 		<!-- Freya retail confirmed -->

+ 5 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml

@@ -422,14 +422,17 @@
 		</for>
 	</skill>
 	<skill id="4334" levels="1" name="SSQ Cancel">
-		<!-- Freya retail confirmed -->
+		<!-- Confirmed CT2.5 -->
 		<set name="castRange" val="1000" />
 		<set name="effectRange" val="1500" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillRadius" val="2000" />
-		<set name="skillType" val="CANCEL_ALL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_AREA" />
+		<for>
+			<effect name="CancelAll" val="0" noicon="1" effectType="CANCEL_ALL" />
+		</for>
 	</skill>
 	<skill id="4335" levels="1" name="Sacred Attack">
 		<!-- Freya retail confirmed -->