Просмотр исходного кода

BETA: Fix follow skills

  * Challenge for Fate
  * Challenge of Faith
  * Gatekeeper Aura Flare
  
  * skill validator updated.
Zealar 10 лет назад
Родитель
Сommit
d5eea57f57

+ 4 - 6
L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml

@@ -1979,14 +1979,12 @@
 		<for>
 			<effect name="TargetMe" />
 			<effect name="GetAgro" />
-			<effect name="TriggerSkillByDamage">
-				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
-				<param minDamage="100" />
-				<param chance="30" />
+		</for>
+		<selfEffects>
+			<effect name="CallSkill">
 				<param skillId="6913" skillLevel="1" /> <!-- Challenge of Faith -->
-				<param targetType="SELF" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="986" levels="25" name="Deadly Strike">
 		<!-- High Five Skill -->

+ 8 - 4
L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml

@@ -964,14 +964,18 @@
 		<set name="pvpPower" val="#pvpPower" />
 		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="ONE" />
-		<for>
+		<pvpEffects>
+			<effect name="MagicalAttack" />
+			<effect name="Debuff">
+				<mul order="0x30" stat="pvpMagicalDmg" val="0.5" />
+			</effect>
+		</pvpEffects>
+		<pveEffects>
 			<effect name="MagicalAttack" />
-		</for>
-		<selfEffects>
 			<effect name="Debuff">
 				<mul order="0x30" stat="pvpMagicalDmg" val="0.5" />
 			</effect>
-		</selfEffects>
+		</pveEffects>
 	</skill>
 	<skill id="5657" levels="85" name="Gatekeeper Prominence">
 		<table name="#effectPoints"> -92 -97 -101 -106 -111 -116 -121 -126 -132 -138 -143 -149 -156 -162 -168 -175 -182 -189 -196 -204 -211 -219 -227 -235 -243 -251 -259 -268 -277 -285 -294 -303 -313 -322 -331 -341 -350 -360 -369 -379 -389 -399 -408 -418 -428 -438 -448 -457 -467 -477 -486 -495 -505 -514 -523 -532 -541 -549 -558 -566 -574 -582 -590 -597 -604 -611 -617 -624 -630 -635 -641 -646 -650 -655 -659 -662 -666 -669 -673 -676 -679 -681 -684 -687 -689 </table>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/06900-06999.xml

@@ -90,13 +90,13 @@
 	</skill>
 	<skill id="6913" levels="1" name="Challenge of Faith">
 		<!-- High Five Skill -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill0985" />
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="83" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
-		<set name="reuseDelay" val="10000" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A2" />
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="Buff">

+ 49 - 1
L2J_DataPack_BETA/dist/game/data/xsd/skills.xsd

@@ -336,7 +336,7 @@
 																	<xs:attribute type="xs:byte" name="cubicSkillChance" use="optional" />
 																	<xs:attribute type="xs:string" name="cubicPower" use="optional" />
 																	<xs:attribute type="xs:string" name="npcId" use="optional" />
-																	<xs:attribute type="xs:string" name="consumeItemId" use="optional"  />
+																	<xs:attribute type="xs:string" name="consumeItemId" use="optional" />
 																	<xs:attribute type="xs:string" name="consumeItemCount" use="optional" />
 																	<xs:attribute type="xs:string" name="lifeTime" use="optional" />
 																	<xs:attribute type="xs:string" name="dispel" use="optional" />
@@ -1743,6 +1743,54 @@
 									</xs:sequence>
 								</xs:complexType>
 							</xs:element>
+							<xs:element name="pvpEffects">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="effect" maxOccurs="unbounded" minOccurs="0">
+											<xs:complexType mixed="true">
+												<xs:sequence>
+													<xs:element name="mul" minOccurs="0">
+														<xs:complexType>
+															<xs:simpleContent>
+																<xs:extension base="xs:string">
+																	<xs:attribute type="xs:string" name="order" />
+																	<xs:attribute type="xs:string" name="stat" />
+																	<xs:attribute type="xs:float" name="val" />
+																</xs:extension>
+															</xs:simpleContent>
+														</xs:complexType>
+													</xs:element>
+												</xs:sequence>
+												<xs:attribute type="xs:string" name="name" use="optional" />
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="pveEffects">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="effect" maxOccurs="unbounded" minOccurs="0">
+											<xs:complexType mixed="true">
+												<xs:sequence>
+													<xs:element name="mul" minOccurs="0">
+														<xs:complexType>
+															<xs:simpleContent>
+																<xs:extension base="xs:string">
+																	<xs:attribute type="xs:string" name="order" />
+																	<xs:attribute type="xs:string" name="stat" />
+																	<xs:attribute type="xs:float" name="val" />
+																</xs:extension>
+															</xs:simpleContent>
+														</xs:complexType>
+													</xs:element>
+												</xs:sequence>
+												<xs:attribute type="xs:string" name="name" use="optional" />
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
 							<xs:element name="channelingEffects">
 								<xs:complexType>
 									<xs:sequence>