Prechádzať zdrojové kódy

BETA: Some fixes.
* Added formatter settings missing from [9007].
* Minor Fix for XSD from [9006].
* Temp Fix for Skill 2060 "Healing Medicine".
* Minor Fix for [9017] "is_freightable" is false by default.

Patch by:
MELERIX

nonom 12 rokov pred
rodič
commit
d259bc3735

+ 2 - 2
L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs

@@ -124,7 +124,7 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=4
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
@@ -134,7 +134,7 @@ org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=53
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=81
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48

+ 1 - 1
L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs

@@ -52,7 +52,7 @@ cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 cleanup_profile=_L2J Clean Up v0.2
 cleanup_settings_version=2
 eclipse.preferences.version=1
-formatter_profile=_L2J Formatter v0.1
+formatter_profile=_L2J Formatter v0.3
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true

+ 0 - 9
L2J_DataPack_BETA/dist/game/data/stats/items/17200-17299.xml

@@ -283,7 +283,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>
@@ -295,7 +294,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>
@@ -307,7 +305,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>
@@ -319,7 +316,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>
@@ -331,7 +327,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>
@@ -343,7 +338,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>
@@ -355,7 +349,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>
@@ -367,7 +360,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>
@@ -379,7 +371,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
-		<set name="is_freightable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_questitem" val="true" />
 	</item>

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml

@@ -555,6 +555,7 @@
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="negateAbnormals" val="fatal_poison,1" />
+		<set name="negateId" val="4082" /> <!-- TODO: This is a TEMP-FIX (to clean all effects from skill 4082), this should be removed if somebody fix the cancel/negate effect/skill handlers (and when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes) -->
 		<set name="operateType" val="A1" />
 		<set name="target" val="TARGET_SELF" />
 		<for>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/xsd/enchantHPBonus.xsd

@@ -5,8 +5,8 @@
 			<xs:sequence minOccurs="1" maxOccurs="1">
 				<xs:element name="enchantHP" minOccurs="6" maxOccurs="6">
 					<xs:complexType>
-						<xs:sequence minOccurs="1" maxOccurs="20">
-							<xs:element name="bonus" type="xs:int"></xs:element>
+						<xs:sequence minOccurs="1" maxOccurs="1">
+							<xs:element name="bonus" type="xs:integer" minOccurs="1" maxOccurs="20" />
 						</xs:sequence>
 						<xs:attribute name="grade" use="required">
 							<xs:simpleType>